more work on getting HighFive unittests to build

mdaus · Feb 17, 2023 · ecc4543 · ecc4543
1 parent bb19478
commit ecc4543
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 4 deletions.
diff --git a/modules/c++/highfive/unittests/tests_high_five_base.cpp b/modules/c++/highfive/unittests/tests_high_five_base.cpp
@@ -2606,3 +2606,50 @@ TEST_CASE("HighFiveEigen") {
 #endif
 }
 #endif
+
+TEST_MAIN(
+    TEST_CHECK(Basic_HighFive_tests);
+    TEST_CHECK(Test_silent_HighFive);
+    TEST_CHECK(Test_file_version_bounds);
+    TEST_CHECK(Test_file_space_strategy);
+    TEST_CHECK(Test_file_space_page_size);
+    TEST_CHECK(Test_page_buffer_size);
+    TEST_CHECK(Test_metadata_block_size_assignment);
+    TEST_CHECK(Test_group_properties);
+    TEST_CHECK(Test_allocation_time);
+    TEST_CHECK(Test_default_constructors);
+    TEST_CHECK(Test_groups_and_datasets);
+    TEST_CHECK(Test_extensible_datasets);
+    TEST_CHECK(Test_reference_count);
+    TEST_CHECK(Test_simple_listings);
+    TEST_CHECK(Simple_test_for_type_equality);
+    TEST_CHECK(DataTypeEqualTakeBack);
+    TEST_CHECK(DataSpaceTest);
+    TEST_CHECK(DataSpaceVectorTest);
+    TEST_CHECK(DataSpaceVariadicTest);
+    TEST_CHECK(ChunkingConstructorsTest);
+    TEST_CHECK(HighFiveReadWriteShortcut);
+    TEST_CHECK(ReadWriteAttributeVectorString);
+    TEST_CHECK(datasetOffset);
+    TEST_CHECK(selectionArraySimpleString);
+    TEST_CHECK(selectionByElementMultiDim);
+    TEST_CHECK(attribute_scalar_rw_string);
+    TEST_CHECK(HighFiveOutofDimension);
+    TEST_CHECK(HighFiveRecursiveGroups);
+    TEST_CHECK(HighFiveInspect);
+    TEST_CHECK(HighFiveGetPath);
+    TEST_CHECK(HighFiveSoftLinks);
+    TEST_CHECK(HighFiveRename);
+    TEST_CHECK(HighFiveRenameRelative);
+    TEST_CHECK(HighFivePropertyObjects);
+    TEST_CHECK(HighFiveCompounds);
+    TEST_CHECK(HighFiveCompoundsNested);
+    TEST_CHECK(HighFiveCompoundsSeveralPadding);
+    TEST_CHECK(HighFiveEnum);
+    TEST_CHECK(HighFiveFixedString);
+    TEST_CHECK(HighFiveFixedLenStringArrayStructure);
+    TEST_CHECK(HighFiveFixedLenStringArrayAttribute);
+    TEST_CHECK(HighFiveReference);
+    TEST_CHECK(HighFiveReadWriteConsts);
+    TEST_CHECK(HighFiveDataTypeClass);
+)
diff --git a/modules/c++/highfive/unittests/tests_high_five_easy.cpp b/modules/c++/highfive/unittests/tests_high_five_easy.cpp
@@ -33,7 +33,7 @@
 #define CHECK_NOTHROW(f) (f); TEST_SUCCESS
 #define REQUIRE(x) TEST_ASSERT_TRUE(x)
 #define CHECK_THAT(x, y) /* TEST_ASSERT(Equals(x, y)) */
-static const std::string testName = "unknown";
+//static const std::string testName = "unknown";
 
 TEST_CASE(H5Easy_Compression) {
     {
@@ -454,4 +454,12 @@ TEST_CASE("H5Easy_OpenCV_Mat_") {
 }
 #endif
 
-TEST_MAIN()
+TEST_MAIN(
+    TEST_CHECK(H5Easy_Compression);
+    TEST_CHECK(H5Easy_scalar);
+    TEST_CHECK(H5Easy_vector1d);
+    TEST_CHECK(H5Easy_vector2d);
+    TEST_CHECK(H5Easy_vector2d_compression);
+    TEST_CHECK(H5Easy_vector3d);
+    TEST_CHECK(H5Easy_Attribute_scalar);
+)
diff --git a/modules/c++/highfive/unittests/tests_high_five_multi_dims.cpp b/modules/c++/highfive/unittests/tests_high_five_multi_dims.cpp
@@ -26,7 +26,7 @@
 #define CHECK_NOTHROW(f) (f); TEST_SUCCESS
 #define REQUIRE(x) TEST_ASSERT_TRUE(x)
 #define CHECK_THAT(x, y) /* TEST_ASSERT(Equals(x, y)) */
-static const std::string testName = "unknown";
+//static const std::string testName = "unknown";
 
 using namespace HighFive;
 
@@ -218,4 +218,11 @@ TEMPLATE_LIST_TEST_CASE("ublas_matrix", "[template]", numerical_test_types) {
 
 #endif
 
-TEST_MAIN()
+TEST_CASE(tests_high_five_multi_dims)
+{
+    TEST_SUCCESS;
+}
+
+TEST_MAIN(
+    TEST_CHECK(tests_high_five_multi_dims);
+)