tempo-plotter Changeset - 2a4985e6a454 · protofusion repositories

Changeset - 2a4985e6a454

Parent rev.

Child rev.

[Not reviewed]

stream

0 4 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-04-08 13:10:37
hy@ozderya.net

basic tests for AsciiReader

4 files changed with 78 insertions and 40 deletions:

src/asciireader.cpp

src/asciireader.h

tests/CMakeLists.txt

tests/test_readers.cpp

0 comments (0 inline, 0 general)

src/asciireader.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -21,28 +21,29 @@ @@
 #include "asciireader.h"
 /// If set to this value number of channels is determined from input
 #define NUMOFCHANNELS_AUTO   (0)
 AsciiReader::AsciiReader(QIODevice* device, ChannelManager* channelMan,
                          DataRecorder* recorder, QObject* parent) :
     AbstractReader(device, channelMan, recorder, parent)
 AsciiReader::AsciiReader(QIODevice* device, QObject* parent) :
     AbstractReader(device, parent)
+{
     paused = false;
     discardFirstLine = true;
     _numOfChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);
     _numChannels = _settingsWidget.numOfChannels();
     autoNumOfChannels = (_numChannels == NUMOFCHANNELS_AUTO);
     delimiter = _settingsWidget.delimiter();
     connect(&_settingsWidget, &AsciiReaderSettings::numOfChannelsChanged,
             [this](unsigned value)
+            {
                 _numOfChannels = value;
                 autoNumOfChannels = (_numOfChannels == NUMOFCHANNELS_AUTO);
                 _numChannels = value;
                 updateNumChannels(); // TODO: setting numchannels = 0, should remove all buffers
                                      // do we want this?
                 autoNumOfChannels = (_numChannels == NUMOFCHANNELS_AUTO);
                 if (!autoNumOfChannels)
+                {
                     emit numOfChannelsChanged(value);
+                }
             });
@@ @@ -57,23 +58,17 @@ AsciiReader::AsciiReader(QIODevice* devi @@
 QWidget* AsciiReader::settingsWidget()
+{
     return &_settingsWidget;
+}
-unsigned AsciiReader::numOfChannels()
+unsigned AsciiReader::numChannels() const
+{
     // TODO: an alternative is to never set _numChannels to '0'
     // do not allow '0'
     if (_numOfChannels == 0)
+    {
         return 1;
+    }
     else
+    {
         return _numOfChannels;
+    }
     return _numChannels == 0 ? 1 : _numChannels;
+}
 // TODO: this could be a part of AbstractReader
 void AsciiReader::enable(bool enabled)
+{
     if (enabled)
@@ @@ -82,12 +77,13 @@ void AsciiReader::enable(bool enabled) @@
         QObject::connect(_device, &QIODevice::readyRead,
                          this, &AsciiReader::onDataReady);
+    }
     else
+    {
         QObject::disconnect(_device, 0, this, 0);
         disconnectSinks();
+    }
+}
 void AsciiReader::pause(bool enabled)
+{
     paused = enabled;
@@ @@ -128,53 +124,52 @@ void AsciiReader::onDataReady() @@
         unsigned numReadChannels; // effective number of channels to read
         unsigned numComingChannels = separatedValues.length();
         if (autoNumOfChannels)
+        {
             // did number of channels changed?
-            if (numComingChannels != _numOfChannels)
+            if (numComingChannels != _numChannels)
+            {
                 _numOfChannels = numComingChannels;
                 _numChannels = numComingChannels;
                 updateNumChannels();
                 emit numOfChannelsChanged(numComingChannels);
+            }
             numReadChannels = numComingChannels;
+        }
-        else if (numComingChannels >= _numOfChannels)
+        else if (numComingChannels >= _numChannels)
+        {
-            numReadChannels = _numOfChannels;
+            numReadChannels = _numChannels;
+        }
         else // there is missing channel data
+        {
             numReadChannels = separatedValues.length();
             qWarning() << "Incoming data is missing data for some channels!";
             qWarning() << "Read line: " << line;
+        }
         // parse read line
         unsigned numDataBroken = 0;
-        double* channelSamples = new double[_numOfChannels]();
+        SamplePack samples(1, _numChannels);
         for (unsigned ci = 0; ci < numReadChannels; ci++)
+        {
             bool ok;
-            channelSamples[ci] = separatedValues[ci].toDouble(&ok);
+            samples.data(ci)[0] = separatedValues[ci].toDouble(&ok);
             if (!ok)
+            {
                 qWarning() << "Data parsing error for channel: " << ci;
                 qWarning() << "Read line: " << line;
-                channelSamples[ci] = 0;
+                samples.data(ci)[0] = 0;
                 numDataBroken++;
+            }
+        }
         if (numReadChannels > numDataBroken)
+        {
             // commit data
-            addData(channelSamples, _numOfChannels);
+            feedOut(samples);
+        }
         delete[] channelSamples;
+    }
+}
 void AsciiReader::saveSettings(QSettings* settings)
+{
     _settingsWidget.saveSettings(settings);

src/asciireader.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -27,28 +27,27 @@ @@
 class AsciiReader : public AbstractReader
+{
     Q_OBJECT
 public:
     explicit AsciiReader(QIODevice* device, ChannelManager* channelMan,
                          DataRecorder* recorder, QObject *parent = 0);
     explicit AsciiReader(QIODevice* device, QObject *parent = 0);
     QWidget* settingsWidget();
-    unsigned numOfChannels();
+    unsigned numChannels() const;
     void enable(bool enabled = true);
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     void pause(bool);
 private:
     AsciiReaderSettings _settingsWidget;
-    unsigned _numOfChannels;
+    unsigned _numChannels;
     /// number of channels will be determined from incoming data
     unsigned autoNumOfChannels;
     QChar delimiter; ///< selected column delimiter
     bool paused;
     // We may have (usually true) started reading in the middle of a

tests/CMakeLists.txt

➞

Show inline comments

@@ @@ -39,25 +39,28 @@ add_executable(Test EXCLUDE_FROM_ALL @@
+  )
 add_test(NAME test1 COMMAND Test)
 qt5_use_modules(Test Widgets)
 qt5_wrap_ui(UI_FILES_T
   ../src/binarystreamreadersettings.ui
   ../src/asciireadersettings.ui
   ../src/numberformatbox.ui
   ../src/endiannessbox.ui
+  )
 # test for readers
 add_executable(TestReaders EXCLUDE_FROM_ALL
   test_readers.cpp
   ../src/samplepack.cpp
   ../src/sink.cpp
   ../src/source.cpp
   ../src/abstractreader.cpp
   ../src/binarystreamreader.cpp
   ../src/abstractreader.cpp
   ../src/binarystreamreadersettings.cpp
   ../src/asciireader.cpp
   ../src/asciireadersettings.cpp
   ../src/endiannessbox.cpp
   ../src/numberformatbox.cpp
   ../src/numberformat.cpp
   ${UI_FILES_T}
+  )
 qt5_use_modules(TestReaders Widgets Test)

tests/test_readers.cpp

➞

Show inline comments

@@ @@ -21,24 +21,18 @@ @@
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 #include <QSignalSpy>
 #include <QBuffer>
 #include "binarystreamreader.h"
 #include "asciireader.h"
 #include "test_helpers.h"
 static const int READYREAD_TIMEOUT = 10; // milliseconds
 TEST_CASE("creating a BinaryStreamReader", "[reader]")
+{
     QBuffer buffer;
     BinaryStreamReader bs(&buffer);
+}
 TEST_CASE("reading data with BinaryStreamReader", "[reader]")
+{
     QBuffer bufferDev;
     BinaryStreamReader bs(&bufferDev);
     bs.enable(true);
@@ @@ -77,12 +71,59 @@ TEST_CASE("disabled BinaryStreamReader s @@
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     // readyRead isn't signaled because there are no connections to it
     REQUIRE_FALSE(spy.wait(READYREAD_TIMEOUT));
     REQUIRE(sink.totalFed == 0);
+}
 TEST_CASE("reading data with AsciiReader", "[reader, ascii]")
+{
     QBuffer bufferDev;
     AsciiReader reader(&bufferDev);
     reader.enable(true);
     TestSink sink;
     reader.connectSink(&sink);
     REQUIRE(sink._numChannels == 1);
     REQUIRE(sink._hasX == false);
     // inject data to the buffer
     bufferDev.open(QIODevice::ReadWrite);
     bufferDev.write("0,1,3\n0,1,3\n0,1,3\n0,1,3\n");
     bufferDev.seek(0);
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     REQUIRE(spy.wait(READYREAD_TIMEOUT));
     REQUIRE(sink._numChannels == 3);
     REQUIRE(sink._hasX == false);
     REQUIRE(sink.totalFed == 3);
+}
 TEST_CASE("AsciiReader shouldn't read when disabled", "[reader, ascii]")
+{
     QBuffer bufferDev;
     AsciiReader reader(&bufferDev); // disabled by default
     TestSink sink;
     reader.connectSink(&sink);
     REQUIRE(sink._numChannels == 1);
     REQUIRE(sink._hasX == false);
     // inject data to the buffer
     bufferDev.open(QIODevice::ReadWrite);
     bufferDev.write("0,1,3\n0,1,3\n0,1,3\n0,1,3\n");
     bufferDev.seek(0);
     QSignalSpy spy(&bufferDev, SIGNAL(readyRead()));
     REQUIRE_FALSE(spy.wait(READYREAD_TIMEOUT));
     REQUIRE(sink._numChannels == 1);
     REQUIRE(sink._hasX == false);
     REQUIRE(sink.totalFed == 0);
+}
 // Note: this is added because `QApplication` must be created for widgets
 #include <QApplication>
 int main(int argc, char* argv[])
+{
     QApplication a(argc, argv);

0 comments (0 inline, 0 general)