simplified test

readLib/source/testData.cc

@@ -33,124 +33,80 @@ TEST_CASE("Data", "[data]") {
 
 #ifdef TEST_WITH_BOOST
 
-  SECTION("c++, uncompressed") {
+  auto file = GENERATE(fileName, fileNameBZ2);
+  
+  SECTION(std::string("c++,") + file) {
     bool b = CorDataCanDeCompress();
-    CHECK(b == true);
-    cout << "Reading: " << fileName << endl;
-    CorDataOpenFile(fileName);
+    CHECK( b == true);
+    cout << "Reading: " << file << endl;
+    CorDataOpenFile(file);
     std::string str;
     CorDataNextText(str);
-    CHECK(str == "sibyll20");
-    CHECK(CorDataNextNumber() == 0.10000E-02);
-    CHECK(CorDataNextNumber() == 91);
-    CHECK(CorDataNextNumber() == 261);
-    CHECK(CorDataNextNumber() == 5);
-    CHECK(CorDataNextNumber() == 11);
-    CHECK(CorDataNextNumber() == 20);
+    CHECK( str == "sibyll20");
+    CHECK( CorDataNextNumber() == 0.10000E-02);
+    CHECK( CorDataNextNumber() == 91);
+    CHECK( CorDataNextNumber() == 261);
+    CHECK( CorDataNextNumber() == 5);
+    CHECK( CorDataNextNumber() == 11);
+    CHECK( CorDataNextNumber() == 20);
 
     double aData[3 * 9];
     const int length = 3 * 9;
     CorDataFillArray(aData, length);
 
-    for (int i = 0; i < length; ++i) { CHECK(aData[i] == testData[i]); }
+    for (int i = 0; i < length; ++i) { CHECK( aData[i] == testData[i]); }
     CorDataCloseFile();
   }
 
-  SECTION("c++, compressed") {
-    bool b = CorDataCanDeCompress();
-    CHECK(b == true);
-    cout << "Reading: " << fileNameBZ2 << endl;
-    CorDataOpenFile(fileNameBZ2);
-    std::string str;
-    CorDataNextText(str);
-    CHECK(str == "sibyll20");
-    CHECK(CorDataNextNumber() == 0.10000E-02);
-    CHECK(CorDataNextNumber() == 91);
-    CHECK(CorDataNextNumber() == 261);
-    CHECK(CorDataNextNumber() == 5);
-    CHECK(CorDataNextNumber() == 11);
-    CHECK(CorDataNextNumber() == 20);
-
-    double aData[3 * 9];
-    const int length = 3 * 9;
-    CorDataFillArray(aData, length);
-
-    for (int i = 0; i < length; ++i) { CHECK(aData[i] == testData[i]); }
-    CorDataCloseFile();
-  }
-
-  SECTION("fortran, uncompressed") {
+  SECTION(std::string("fortran, ")+file) {
     bool b = cordatacandecompress_();
-    CHECK(b == true);
-    cout << "Reading: " << fileName << endl;
-    cordataopenfile_(fileName.c_str());
+    CHECK( b == true);
+    cout << "Reading: " << file << endl;
+    cordataopenfile_(file.c_str());
     char str[10];
     cordatanexttext_(str, 10);
-    CHECK(std::string(str) == "sibyll20");
-    CHECK(cordatanextnumber_() == 0.10000E-02);
-    CHECK(cordatanextnumber_() == 91);
-    CHECK(cordatanextnumber_() == 261);
-    CHECK(cordatanextnumber_() == 5);
-    CHECK(cordatanextnumber_() == 11);
-    CHECK(cordatanextnumber_() == 20);
+    CHECK( std::string(str) == "sibyll20");
+    CHECK( cordatanextnumber_() == 0.10000E-02);
+    CHECK( cordatanextnumber_() == 91);
+    CHECK( cordatanextnumber_() == 261);
+    CHECK( cordatanextnumber_() == 5);
+    CHECK( cordatanextnumber_() == 11);
+    CHECK( cordatanextnumber_() == 20);
 
     double aData[3 * 9];
     const int length = 3 * 9;
     cordatafillarray_(aData, length);
 
-    for (int i = 0; i < length; ++i) { CHECK(aData[i] == testData[i]); }
+    for (int i = 0; i < length; ++i) { CHECK( aData[i] == testData[i]); }
     cordataclosefile_();
   }
-
-  SECTION("fortran, compressed") {
-    bool b = cordatacandecompress_();
-    CHECK(b == true);
-    cout << "Reading: " << fileNameBZ2 << endl;
-    cordataopenfile_(fileNameBZ2.c_str());
-    char str[10];
-    cordatanexttext_(str, 10);
-    CHECK(std::string(str) == "sibyll20");
-    CHECK(cordatanextnumber_() == 0.10000E-02);
-    CHECK(cordatanextnumber_() == 91);
-    CHECK(cordatanextnumber_() == 261);
-    CHECK(cordatanextnumber_() == 5);
-    CHECK(cordatanextnumber_() == 11);
-    CHECK(cordatanextnumber_() == 20);
-
-    double aData[3 * 9];
-    const int length = 3 * 9;
-    cordatafillarray_(aData, length);
-
-    for (int i = 0; i < length; ++i) { CHECK(aData[i] == testData[i]); }
-    cordataclosefile_();
-  }
-
+  
 #else
 
   SECTION("c++") {
-    CHECK_THROWS(CorDataOpenFile(""));
+    CHECK_THROWS( CorDataOpenFile(""));
     double a[1];
     const int length = 1;
-    CHECK_THROWS(CorDataFillArray(a, length));
-    CHECK_THROWS(CorDataCloseFile());
+    CHECK_THROWS( CorDataFillArray(a, length));
+    CHECK_THROWS( CorDataCloseFile());
     double v = 0;
-    CHECK_THROWS(v = CorDataNextNumber());
+    CHECK_THROWS( v = CorDataNextNumber());
     string data;
-    CHECK_THROWS(CorDataNextText(data));
-    CHECK(CorDataCanDeCompress() == false);
+    CHECK_THROWS( CorDataNextText(data));
+    CHECK(  CorDataCanDeCompress() == false);
   }
 
   SECTION("fortran") {
-    CHECK_THROWS(cordataopenfile_(""));
+    CHECK_THROWS( cordataopenfile_(""));
     double a[1];
     const int length = 1;
-    CHECK_THROWS(cordatafillarray_(a, length));
-    CHECK_THROWS(cordataclosefile_());
+    CHECK_THROWS( cordatafillarray_(a, length));
+    CHECK_THROWS( cordataclosefile_());
     double d = 0;
-    CHECK_THROWS(d = cordatanextnumber_());
+    CHECK_THROWS( d = cordatanextnumber_());
     std::string str(" ");
-    CHECK_THROWS(cordatanexttext_(str.c_str(), 0));
-    CHECK(cordatacandecompress_() == 0);
+    CHECK_THROWS( cordatanexttext_(str.c_str(), 0));
+    CHECK(  cordatacandecompress_() == 0);
   }
 
 #endif