tempo-plotter Changeset - 4d01ee44e4e5 · protofusion repositories

Changeset - 4d01ee44e4e5

Parent rev.

Child rev.

[Not reviewed]

stream

0 3 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-12-03 14:58:04
hy@ozderya.net

added simple tests for Source class and minor improvements

3 files changed with 68 insertions and 5 deletions:

src/source.cpp

src/source.h

tests/test.cpp

0 comments (0 inline, 0 general)

src/source.cpp

➞

Show inline comments

@@ @@ -17,36 +17,37 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QtGlobal>
 #include "source.h"
 void Source::connect(Sink* sink)
+{
     Q_ASSERT(!sinks.contains(sink));
     sinks.append(sink);
     sink->setNumChannels(numChannels(), hasX());
+}
 void Source::disconnect(Sink* sink)
+{
     Q_ASSERT(sinks.contains(sink));
     sinks.removeOne(sink);
+}
 void Source::feedOut(const SamplePack& data) const
+{
     for (auto sink : sinks)
+    {
         sink->feedIn(data);
+    }
+}
-void Source::feedNumChannels(unsigned nc, bool x) const
+void Source::updateNumChannels() const
+{
     for (auto sink : sinks)
+    {
-        sink->setNumChannels(nc, x);
+        sink->setNumChannels(numChannels(), hasX());
+    }
+}

src/source.h

➞

Show inline comments

@@ @@ -32,20 +32,21 @@ public: @@
     virtual unsigned numChannels() const = 0;
     /// Connects a sink to this source. Trying to connect an already
     /// connected sink is an error.
     void connect(Sink* sink);
     /// Disconnects an already connected sink. Trying to disconnect an
     /// unconnected sink is an error.
     void disconnect(Sink* sink);
 protected:
     /// Feeds "in" given data to connected sinks
     void feedOut(const SamplePack& data) const;
     /// Updates "number of channels" of connected sinks
     void feedNumChannels(unsigned nc, bool x = false) const;
     /// Updates "number of channels" of connected sinks. Must be
     /// called when num. channels or hasX changes.
     void updateNumChannels() const;
 private:
     QList<Sink*> sinks;
 };
 #endif // SOURCE_H

tests/test.cpp

➞

Show inline comments

@@ @@ -54,25 +54,24 @@ class TestSink : public Sink @@
 public:
     int totalFed;
     int _numChannels;
     bool _hasX;
     TestSink()
+        {
             totalFed = 0;
             _numChannels = 0;
             _hasX = false;
         };
 public:
     void feedIn(const SamplePack& data)
+        {
             REQUIRE(data.numChannels() == numChannels());
             totalFed += data.numSamples();
             Sink::feedIn(data);
         };
     void setNumChannels(unsigned nc, bool x)
+        {
             _numChannels = nc;
@@ @@ -110,12 +109,74 @@ TEST_CASE("sink", "[memory, stream]") @@
     sink.connectFollower(&follower);
     REQUIRE(follower.numChannels() == 3);
     REQUIRE(follower.hasX() == false);
     sink.feedIn(pack);
     REQUIRE(sink.totalFed == 300);
     REQUIRE(follower.totalFed == 100);
     sink.setNumChannels(2, true);
     REQUIRE(follower.numChannels() == 2);
     REQUIRE(follower.hasX() == true);
+}
 class TestSource : public Source
+{
 public:
     int _numChannels;
     bool _hasX;
     TestSource(unsigned nc, bool x)
+        {
             _numChannels = nc;
             _hasX = x;
         };
     virtual unsigned numChannels() const
+        {
             return _numChannels;
         };
     virtual bool hasX() const
+        {
             return _hasX;
         };
     void _feed(const SamplePack& data) const
+        {
             feedOut(data);
         };
     void _setNumChannels(unsigned nc, bool x)
+        {
             _numChannels = nc;
             _hasX = x;
             updateNumChannels();
         };
 };
 TEST_CASE("source", "[memory, stream]")
+{
     TestSink sink;
     TestSource source(3, false);
     REQUIRE(source.numChannels() == 3);
     REQUIRE(source.hasX() == false);
     source.connect(&sink);
     REQUIRE(sink.numChannels() == 3);
     REQUIRE(sink.hasX() == false);
     source._setNumChannels(5, true);
     REQUIRE(sink.numChannels() == 5);
     REQUIRE(sink.hasX() == true);
     SamplePack pack(100, 5, true);
     source._feed(pack);
     REQUIRE(sink.totalFed == 100);
     source.disconnect(&sink);
     source._feed(pack);
     REQUIRE(sink.totalFed == 100);
+}

0 comments (0 inline, 0 general)