From df8e44ec60071089da225e87d000991b2681d411 2017-07-26 08:38:56 From: Alexandre Leroux Date: 2017-07-26 08:38:56 Subject: [PATCH] Units tests on sorting data series --- diff --git a/core/tests/Data/TestDataSeries.cpp b/core/tests/Data/TestDataSeries.cpp new file mode 100644 index 0000000..4be88cc --- /dev/null +++ b/core/tests/Data/TestDataSeries.cpp @@ -0,0 +1,164 @@ +#include "Data/DataSeries.h" +#include "Data/ScalarSeries.h" + +#include +#include + +Q_DECLARE_METATYPE(std::shared_ptr) + +class TestDataSeries : public QObject { + Q_OBJECT +private slots: + /// Input test data + /// @sa testCtor() + void testCtor_data(); + + /// Tests construction of a data series + void testCtor(); + + /// Input test data + /// @sa testMerge() + void testMerge_data(); + + /// Tests merge of two data series + void testMerge(); +}; + +void TestDataSeries::testCtor_data() +{ + // ////////////// // + // Test structure // + // ////////////// // + + // x-axis data + QTest::addColumn >("xAxisData"); + // values data + QTest::addColumn >("valuesData"); + + // expected x-axis data + QTest::addColumn >("expectedXAxisData"); + // expected values data + QTest::addColumn >("expectedValuesData"); + + // ////////// // + // Test cases // + // ////////// // + + QTest::newRow("invalidData (different sizes of vectors)") + << QVector{1., 2., 3., 4., 5.} << QVector{100., 200., 300.} + << QVector{} << QVector{}; + + QTest::newRow("sortedData") << QVector{1., 2., 3., 4., 5.} + << QVector{100., 200., 300., 400., 500.} + << QVector{1., 2., 3., 4., 5.} + << QVector{100., 200., 300., 400., 500.}; + + QTest::newRow("unsortedData") << QVector{5., 4., 3., 2., 1.} + << QVector{100., 200., 300., 400., 500.} + << QVector{1., 2., 3., 4., 5.} + << QVector{500., 400., 300., 200., 100.}; + + QTest::newRow("unsortedData2") + << QVector{1., 4., 3., 5., 2.} << QVector{100., 200., 300., 400., 500.} + << QVector{1., 2., 3., 4., 5.} << QVector{100., 500., 300., 200., 400.}; +} + +void TestDataSeries::testCtor() +{ + // Creates series + QFETCH(QVector, xAxisData); + QFETCH(QVector, valuesData); + + auto series = std::make_shared(std::move(xAxisData), std::move(valuesData), + Unit{}, Unit{}); + + // Validates results : we check that the data series is sorted on its x-axis data + QFETCH(QVector, expectedXAxisData); + QFETCH(QVector, expectedValuesData); + + auto seriesXAxisData = series->xAxisData()->data(); + auto seriesValuesData = series->valuesData()->data(); + + QVERIFY( + std::equal(expectedXAxisData.cbegin(), expectedXAxisData.cend(), seriesXAxisData.cbegin())); + QVERIFY(std::equal(expectedValuesData.cbegin(), expectedValuesData.cend(), + seriesValuesData.cbegin())); +} + +namespace { + +std::shared_ptr createSeries(QVector xAxisData, QVector valuesData) +{ + return std::make_shared(std::move(xAxisData), std::move(valuesData), Unit{}, + Unit{}); +} + +} // namespace + +void TestDataSeries::testMerge_data() +{ + // ////////////// // + // Test structure // + // ////////////// // + + // Data series to merge + QTest::addColumn >("dataSeries"); + QTest::addColumn >("dataSeries2"); + + // Expected values in the first data series after merge + QTest::addColumn >("expectedXAxisData"); + QTest::addColumn >("expectedValuesData"); + + // ////////// // + // Test cases // + // ////////// // + + QTest::newRow("sortedMerge") + << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) + << createSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.}) + << QVector{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.} + << QVector{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.}; + + QTest::newRow("unsortedMerge") + << createSeries({6., 7., 8., 9., 10.}, {600., 700., 800., 900., 1000.}) + << createSeries({1., 2., 3., 4., 5.}, {100., 200., 300., 400., 500.}) + << QVector{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.} + << QVector{100., 200., 300., 400., 500., 600., 700., 800., 900., 1000.}; + + QTest::newRow("unsortedMerge2") + << createSeries({1., 2., 8., 9., 10}, {100., 200., 300., 400., 500.}) + << createSeries({3., 4., 5., 6., 7.}, {600., 700., 800., 900., 1000.}) + << QVector{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.} + << QVector{100., 200., 600., 700., 800., 900., 1000., 300., 400., 500.}; + + QTest::newRow("unsortedMerge3") + << createSeries({3., 5., 8., 7., 2}, {100., 200., 300., 400., 500.}) + << createSeries({6., 4., 9., 10., 1.}, {600., 700., 800., 900., 1000.}) + << QVector{1., 2., 3., 4., 5., 6., 7., 8., 9., 10.} + << QVector{1000., 500., 100., 700., 200., 600., 400., 300., 800., 900.}; +} + +void TestDataSeries::testMerge() +{ + // Merges series + QFETCH(std::shared_ptr, dataSeries); + QFETCH(std::shared_ptr, dataSeries2); + + dataSeries->merge(dataSeries2.get()); + + // Validates results : we check that the merge is valid and the data series is sorted on its + // x-axis data + QFETCH(QVector, expectedXAxisData); + QFETCH(QVector, expectedValuesData); + + auto seriesXAxisData = dataSeries->xAxisData()->data(); + auto seriesValuesData = dataSeries->valuesData()->data(); + + QVERIFY( + std::equal(expectedXAxisData.cbegin(), expectedXAxisData.cend(), seriesXAxisData.cbegin())); + QVERIFY(std::equal(expectedValuesData.cbegin(), expectedValuesData.cend(), + seriesValuesData.cbegin())); +} + +QTEST_MAIN(TestDataSeries) +#include "TestDataSeries.moc"