GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r811:5353ec1e417b

Improve cosinus tests with:...

perrinel -

r811:5353ec1e417b

parent child

Context file:

r811:5353ec1e417b

plugins/mockplugin/include/CosinusProvider.h +5 0

                  void requestDataAborting(QUuid acqIdentifier) override;
+                 /// Provide data
+                 std::shared_ptr<IDataSeries> provideDataSeries(const SqpRange &dataRangeRequested,
+                                                                const QVariantHash &data);
              private:
                  std::shared_ptr<IDataSeries>
                  retrieveData(QUuid acqIdentifier, const SqpRange &dataRangeRequested, const QVariantHash &data);

plugins/mockplugin/src/CosinusProvider.cpp +14 -2

                              progress = currentProgress;
                              emit dataProvidedProgress(acqIdentifier, progress);
-                             qCInfo(LOG_CosinusProvider()) << "TORM: CosinusProvider::retrieveData"
-                                                           << QThread::currentThread()->objectName() << progress;
+                             qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::retrieveData"
+                                                            << QThread::currentThread()->objectName()
+                                                            << progress;
                              // NOTE: Try to use multithread if possible
                          }
                      }
                          << tr("Aborting progression of inexistant identifier detected !!!");
                  }
              }
+             std::shared_ptr<IDataSeries> CosinusProvider::provideDataSeries(const SqpRange &dataRangeRequested,
+                                                                             const QVariantHash &data)
+             {
+                 auto uid = QUuid::createUuid();
+                 m_VariableToEnableProvider[uid] = true;
+                 auto dataSeries = this->retrieveData(uid, dataRangeRequested, data);
+                 m_VariableToEnableProvider.remove(uid);
+                 return dataSeries;
+             }

plugins/mockplugin/tests/TestCosinusAcquisition.cpp +48 -47

              /// Format of dates in data files
              const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss:zzz");
-             /// Delay after each operation on the variable before validating it (in ms)
-             const auto OPERATION_DELAY = 250;
              /**
               * Verifies that the data in the candidate series are identical to the data in the reference series
               * in a specific range
                  auto referenceIt = reference->xAxisRange(range.m_TStart, range.m_TEnd);
+                 qInfo() << "candidateSize" << std::distance(candidate->cbegin(), candidate->cend());
+                 qInfo() << "refSize" << std::distance(referenceIt.first, referenceIt.second);
                  return std::equal(candidate->cbegin(), candidate->cend(), referenceIt.first, referenceIt.second,
                                    [](const auto &it1, const auto &it2) {
                                        // - milliseconds precision for time
                                    });
              }
-             /// Generates the data series from the reading of a data stream
-             std::shared_ptr<IDataSeries> readDataStream(QTextStream &stream)
+             {
-                 std::vector<double> xAxisData, valuesData;
-                 QString line{};
-                 while (stream.readLineInto(&line)) {
-                     // Separates date (x-axis data) to value data
-                     auto splitLine = line.split('\t');
-                     if (splitLine.size() == 2) {
-                         // Converts datetime to double
-                         auto dateTime = QDateTime::fromString(splitLine[0], DATETIME_FORMAT);
-                         dateTime.setTimeSpec(Qt::UTC);
-                         xAxisData.push_back(DateUtils::secondsSinceEpoch(dateTime));
-                         valuesData.push_back(splitLine[1].toDouble());
+                     }
+                 }
-                 return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
-                                                       Unit{{}, true}, Unit{});
+             }
              } // namespace
              /**
                  // Test structure //
                  // ////////////// //
-                 QTest::addColumn<QString>("dataFilename");  // File containing expected data of acquisitions
+                 QTest::addColumn<SqpRange>("referenceRange");           // Range for generating reference series
                  QTest::addColumn<SqpRange>("initialRange"); // First acquisition
+                 QTest::addColumn<int>("operationDelay");                // Acquisitions to make
                  QTest::addColumn<std::vector<SqpRange> >("operations"); // Acquisitions to make
                  // ////////// //
                  };
                  QTest::newRow("cosinus")
-                     << "Cosinus_100Hz_20170101_1200_20170101_1300.txt"
-                     << SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 1, 12, 35, 1)}
+                     << SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)}
+                     << SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 1, 12, 35, 1)} << 250
                      << std::vector<SqpRange>{
                             // Pan (jump) left
                             SqpRange{dateTime(2017, 1, 1, 12, 45, 0), dateTime(2017, 1, 1, 12, 50, 0)},
                             SqpRange{dateTime(2017, 1, 1, 12, 17, 30), dateTime(2017, 1, 1, 12, 19, 30)},
                             // Zoom out
                             SqpRange{dateTime(2017, 1, 1, 12, 12, 30), dateTime(2017, 1, 1, 12, 24, 30)}};
+                 QTest::newRow("cosinus_big")
+                     << SqpRange{dateTime(2017, 1, 1, 1, 0, 0), dateTime(2017, 1, 5, 13, 0, 0)}
+                     << SqpRange{dateTime(2017, 1, 2, 6, 30, 0), dateTime(2017, 1, 2, 18, 30, 0)} << 5000
+                     << std::vector<SqpRange>{
+                            // Pan (jump) left
+                            SqpRange{dateTime(2017, 1, 1, 13, 30, 0), dateTime(2017, 1, 1, 18, 30, 0)},
+                            // Pan (jump) right
+                            SqpRange{dateTime(2017, 1, 3, 4, 30, 0), dateTime(2017, 1, 3, 10, 30, 0)},
+                            // Pan (overlay) right
+                            SqpRange{dateTime(2017, 1, 3, 8, 30, 0), dateTime(2017, 1, 3, 12, 30, 0)},
+                            // Pan (overlay) left
+                            SqpRange{dateTime(2017, 1, 2, 8, 30, 0), dateTime(2017, 1, 3, 10, 30, 0)},
+                            // Pan (overlay) left
+                            SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 3, 5, 30, 0)},
+                            // Zoom in
+                            SqpRange{dateTime(2017, 1, 2, 2, 30, 0), dateTime(2017, 1, 2, 8, 30, 0)},
+                            // Zoom out
+                            SqpRange{dateTime(2017, 1, 1, 14, 30, 0), dateTime(2017, 1, 3, 12, 30, 0)}};
              }
              void TestCosinusAcquisition::testAcquisition()
              {
-                 // Retrieves data file
-                 QFETCH(QString, dataFilename);
-                 auto dataFilePath = QFileInfo{TESTS_RESOURCES_PATH, dataFilename}.absoluteFilePath();
-                 QFile dataFile{dataFilePath};
+                 // Retrieves reference range
+                 QFETCH(SqpRange, referenceRange);
+                 CosinusProvider referenceProvider{};
+                 auto dataSeries = referenceProvider.provideDataSeries(
+                     referenceRange, {{COSINUS_TYPE_KEY, "scalar"}, {COSINUS_FREQUENCY_KEY, 100.}});
-                 if (dataFile.open(QFile::ReadOnly)) {
-                     // Generates data series to compare with
-                     QTextStream dataStream{&dataFile};
-                     auto dataSeries = readDataStream(dataStream);
+                 auto end = dataSeries->cend() - 1;
+                 qInfo() << dataSeries->nbPoints() << dataSeries->cbegin()->x() << end->x();
-                     /// Lambda used to validate a variable at each step
-                     auto validateVariable = [dataSeries](std::shared_ptr<Variable> variable,
-                                                          const SqpRange &range) {
+                 auto validateVariable
+                     = [dataSeries](std::shared_ptr<Variable> variable, const SqpRange &range) {
                          // Checks that the variable's range has changed
                          QCOMPARE(variable->range(), range);
-                     auto variable = sqpApp->variableController().createVariable(
-                         "MMS", {{COSINUS_TYPE_KEY, "scalar"}, {COSINUS_FREQUENCY_KEY, 100.}}, provider);
-                     QTest::qWait(OPERATION_DELAY);
+                 QFETCH(int, operationDelay);
+                 QTest::qWait(operationDelay);
-                     validateVariable(variable, initialRange);
-                     // Makes operations on the variable
-                     QFETCH(std::vector<SqpRange>, operations);
-                     for (const auto &operation : operations) {
-                         // Asks request on the variable and waits during its execution
-                         sqpApp->variableController().onRequestDataLoading({variable}, operation,
-                                                                           variable->range(), true);
+                     sqpApp->variableController().onRequestDataLoading({variable}, operation, variable->range(),
+                                                                       true);
-                         QTest::qWait(OPERATION_DELAY);
+                     QTest::qWait(operationDelay);
-                         validateVariable(variable, operation);
-                     }
+                 for (const auto &operation : operations) {
+                     // Asks request on the variable and waits during its execution
+                     sqpApp->variableController().onRequestDataLoading({variable}, operation, variable->range(),
+                                                                       true);
                  }
-                 else {
-                     QFAIL("Can't read input data file");
+                 }
+                 QTest::qWait(operationDelay);
+                 validateVariable(variable, operations.back());
              }
              int main(int argc, char *argv[])

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages