diff --git a/readLib/CMakeLists.txt b/readLib/CMakeLists.txt index 1f2c852a92c9b244f3e8e5d3cabf94bbd40a02ed..260a9a1b0b7b7f504778615041fe51b47d5638e6 100644 --- a/readLib/CMakeLists.txt +++ b/readLib/CMakeLists.txt @@ -44,7 +44,7 @@ install ( # add unit test, if run inside CORSIKA if (COMMAND CORSIKA_ADD_TEST) - CORSIKA_ADD_TEST (testData) + CORSIKA_ADD_TEST (testData SOURCES source/testData.cc) set (TEST_WITH_BOOST "") if (Boost_iostreams_FOUND) set (TEST_WITH_BOOST "TEST_WITH_BOOST") diff --git a/readLib/testData.cc b/readLib/source/testData.cc similarity index 90% rename from readLib/testData.cc rename to readLib/source/testData.cc index f0b9810d295bf979ab48ad831994b6ccc8c64c65..07c219261eae9bc921ff7bf05410f416687c4b6e 100644 --- a/readLib/testData.cc +++ b/readLib/source/testData.cc @@ -139,28 +139,28 @@ TEST_CASE ("Data", "[data]") { #else SECTION ("c++") { - REQUIRE_THROW( CorDataOpenFile("") ); + CHECK_THROWS( CorDataOpenFile("") ); double a[1]; const int length = 1; - REQUIRE_THROW( CorDataFillArray(a, length) ); - REQUIRE_THROW( CorDataCloseFile() ); + CHECK_THROWS( CorDataFillArray(a, length) ); + CHECK_THROWS( CorDataCloseFile() ); double v = 0; - REQUIRE_THROW( v = CorDataNextNumber() ); + CHECK_THROWS( v = CorDataNextNumber() ); string data; - REQUIRE_THROW( CorDataNextText(data) ); + CHECK_THROWS( CorDataNextText(data) ); CHECK( CorDataCanDeCompress() == false ); } SECTION ("fortran") { - REQUIRE_THROW( cordataopenfile_("") ); + CHECK_THROWS( cordataopenfile_("") ); double a[1]; const int length = 1; - REQUIRE_THROW( cordatafillarray_(a, length) ); - REQUIRE_THROW( cordataclosefile_() ); + CHECK_THROWS( cordatafillarray_(a, length) ); + REQUIRE_THROWS( cordataclosefile_() ); double d = 0; - REQUIRE_THROW( d = cordatanextnumber_() ); + CHECK_THROWS( d = cordatanextnumber_() ); char* str = ""; - REQUIRE_THROW( cordatanexttext_(str, 0) ); + CHECK_THROWS( cordatanexttext_(str, 0) ); CHECK( cordatacandecompress_() == 0 ); }