comparison data/fileio/test/CSVReaderTest.h @ 1875:f49afb5b9eac

Fix comparisons that fail to link with older Qt libraries

     void modelType1DSamples() {
         Model *model = nullptr;
         loadFrom("model-type-1d-samples.csv", model);
         auto actual = qobject_cast<SparseOneDimensionalModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         vector<sv_frame_t> expected { 45678, 123239, 320130, 452103, 620301 };
         for (int i = 0; in_range_for(expected, i); ++i) {
             QCOMPARE(actual->getAllEvents()[i], Event(expected[i]));
         }
         delete model;

     void modelType1DSamplesWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-1d-samples-header.csv", model);
         auto actual = qobject_cast<SparseOneDimensionalModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         vector<sv_frame_t> expected { 45678, 123239, 320130, 452103, 620301 };
         for (int i = 0; in_range_for(expected, i); ++i) {
             QCOMPARE(actual->getAllEvents()[i], Event(expected[i]));
         }
         delete model;

     void modelType1DSeconds() {
         Model *model = nullptr;
         loadFrom("model-type-1d-seconds.csv", model);
         auto actual = qobject_cast<SparseOneDimensionalModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
 
     void modelType1DSecondsWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-1d-seconds-header.csv", model);
         auto actual = qobject_cast<SparseOneDimensionalModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
 
     void modelType2DDurationSamples() {
         Model *model = nullptr;
         loadFrom("model-type-2d-duration-samples.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE((actual->getAllEvents().size()), 5);
         delete model;
     }
 
     void modelType2DDurationSamplesWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-duration-samples-header.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DDurationSeconds() {
         Model *model = nullptr;
         loadFrom("model-type-2d-duration-seconds.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DDurationSecondsWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-duration-seconds-header.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void badNegativeDuration() {
         Model *model = nullptr;
         loadFrom("bad-negative-duration.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
         //!!! + check duration has been corrected
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DEndTimeSamples() {
         Model *model = nullptr;
         loadFrom("model-type-2d-endtime-samples.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DEndTimeSamplesWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-endtime-samples-header.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DEndTimeSeconds() {
         Model *model = nullptr;
         loadFrom("model-type-2d-endtime-seconds.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DEndTimeSecondsWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-endtime-seconds-header.csv", model);
         auto actual = qobject_cast<RegionModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DImplicit() {
         Model *model = nullptr;
         loadFrom("model-type-2d-implicit.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         vector<sv_frame_t> expectedFrames { 0, 1024, 2048, 3072, 4096 };
         vector<float> expectedValues { 4.f, 4.2f, 0.4f, 3.8f, -2.3f };
         vector<QString> expectedLabels { {}, {}, "A label", {}, {} };
         for (int i = 0; in_range_for(expectedFrames, i); ++i) {
             QCOMPARE(actual->getAllEvents()[i],

     void modelType2DImplicitWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-implicit-header.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         vector<sv_frame_t> expectedFrames { 0, 1024, 2048, 3072, 4096 };
         vector<float> expectedValues { 4.f, 4.2f, 0.4f, 3.8f, -2.3f };
         vector<QString> expectedLabels { {}, {}, "A label", {}, {} };
         for (int i = 0; in_range_for(expectedFrames, i); ++i) {
             QCOMPARE(actual->getAllEvents()[i],

     void modelType2DSamples() {
         Model *model = nullptr;
         loadFrom("model-type-2d-samples.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DSamplesWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-samples-header.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DSeconds() {
         Model *model = nullptr;
         loadFrom("model-type-2d-seconds.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType2DSecondsWithHeader() {
         Model *model = nullptr;
         loadFrom("model-type-2d-seconds-header.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void modelType3DImplicit() {
         Model *model = nullptr;

     void withBlankLines1D() {
         Model *model = nullptr;
         loadFrom("with-blank-lines-1d.csv", model);
         auto actual = qobject_cast<SparseOneDimensionalModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void withBlankLines2D() {
         Model *model = nullptr;
         loadFrom("with-blank-lines-2d.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
     
     void withBlankLines3D() {
         Model *model = nullptr;

     void quoting() {
         Model *model = nullptr;
         loadFrom("quoting.csv", model);
         auto actual = qobject_cast<SparseTimeValueModel *>(model);
         QVERIFY(actual);
-        QCOMPARE(actual->getAllEvents().size(), 5);
+        QCOMPARE(int(actual->getAllEvents().size()), 5);
         delete model;
     }
 };
 
 #endif