TEST: fix failing unit tests

Author: imikejackson

Source/Test/CMakeLists.txt

@@ -79,7 +79,7 @@ if(EBSDLIB_DOWNLOAD_TEST_FILES)
   endif()
 
   ebsdlib_download_test_data(EBSDLIB_DATA_DIR ${EBSDLIB_DATA_DIR} ARCHIVE_NAME Laue_Orientation_Clusters_v6.tar.gz SHA512 f327d3d2a86d539b3c1f3fc755d8f5741d8eb68aab45fc1ab54d9e5db48643903f9a37898366203e6eb2e7585ce57c6e186cca2107acb1a53318b813345cb10a)
-  ebsdlib_download_test_data(EBSDLIB_DATA_DIR ${EBSDLIB_DATA_DIR} ARCHIVE_NAME Pole_Figure_Images.tar.gz SHA512 c3111bd3dcb89ec3ddcfcee4792bb7a9a1815475ac3f9a70bd93915c2a6dbbdcc9091dfe5ddb064a655758d77f9718c1661dd2005bcc60502ba336e40eb205a1)
+  ebsdlib_download_test_data(EBSDLIB_DATA_DIR ${EBSDLIB_DATA_DIR} ARCHIVE_NAME Pole_Figure_Images.tar.gz SHA512 fe395dbc05c5408e806b6271873a21a9cef343c940126fed682233b21a793d6e62b3d33a4ac2a77bf5789c514187a595798e823f1f1fd7f71360fdea6e6500e8)
 
 endif()
 

Source/Test/PoleFigureCompositorTest.cpp

@@ -107,6 +107,7 @@ void GeneratePoleFigures(const std::string& phaseName, size_t opsIndex, hid_t ex
   {
     std::string layoutStr = (layoutType == PoleFigureLayoutType::Horizontal) ? "Horz" : (layoutType == PoleFigureLayoutType::Vertical) ? "Vert" : "Sqr";
     hid_t layoutGroupId = H5Support::H5Utilities::createGroup(exemplarFileId, layoutStr);
+    REQUIRE(layoutGroupId > 0);
     H5Support::H5ScopedGroupSentinel layoutGroupSentinel(layoutGroupId, true);
 
     for(size_t sampleId = 0; sampleId < k_NumSamplingGroups; ++sampleId)
@@ -157,22 +158,32 @@ void GeneratePoleFigures(const std::string& phaseName, size_t opsIndex, hid_t ex
       REQUIRE(result.height == metrics.pageHeight);
 
       UInt8ArrayType::Pointer image = result.image;
-      // std::string outputPath = fmt::format("{}/Pole_Figure_Images/Pole_Figure_{}_{}_{}.tif", ebsdlib::unit_test::k_TestFilesDir, layoutStr,op->getRotationPointGroup() , sampleId);
-      // auto writerResult = TiffWriter::WriteColorImage(outputPath, result.width, result.height, 4, result.image->data());
-      // REQUIRE(writerResult.first == 0);
-      //
       std::string datasetName = fmt::format("{}", sampleId);
-      // std::vector<hsize_t> dims = {static_cast<hsize_t>(result.height), static_cast<hsize_t>(result.width), 4ULL};
-      // herr_t err = H5Support::H5Lite::writePointerDataset(layoutGroupId, datasetName, dims.size(), dims.data(), result.image->data());
-      // REQUIRE(err == 0);
+#if WRITE_EXEMPLAR_IMAGES
+      std::string outputPath = fmt::format("{}/Pole_Figure_Images/Pole_Figure_{}_{}_{}.tif", ebsdlib::unit_test::k_TestFilesDir, layoutStr,op->getRotationPointGroup() , sampleId);
+      auto writerResult = TiffWriter::WriteColorImage(outputPath, result.width, result.height, 4, result.image->data());
+      REQUIRE(writerResult.first == 0);
+      //
+
+      std::vector<hsize_t> dims = {static_cast<hsize_t>(result.height), static_cast<hsize_t>(result.width), 4ULL};
+      herr_t err = H5Support::H5Lite::writePointerDataset(layoutGroupId, datasetName, dims.size(), dims.data(), result.image->data());
+      REQUIRE(err == 0);
+#else
+
       std::vector<uint8_t> exemplarData;
       err = H5Support::H5Lite::readVectorDataset(layoutGroupId, datasetName, exemplarData);
       REQUIRE(err == 0);
       REQUIRE(exemplarData.size() == static_cast<size_t>(result.width * result.height * 4));
+      size_t misMatchCount = 0;
       for(size_t i = 0; i < exemplarData.size(); i++)
       {
-        REQUIRE(exemplarData[i] == (*image)[i]);
+        if(exemplarData[i] != (*image)[i])
+        {
+          misMatchCount++;
+        }
       }
+      REQUIRE(misMatchCount == 0);
+#endif
     }
   }
 }
@@ -181,19 +192,29 @@ void GeneratePoleFigures(const std::string& phaseName, size_t opsIndex, hid_t ex
 TEST_CASE("ebsdlib::PoleFigureCompositorTest::All_Laue_Classes", "[EbsdLib][PoleFigureCompositorTest]")
 {
   const ebsdlib::unit_test::TestFileSentinel testDataSentinel(ebsdlib::unit_test::k_TestFilesDir, "Laue_Orientation_Clusters_v6.tar.gz", "Laue_Orientation_Clusters_v6", true, true);
-  const ebsdlib::unit_test::TestFileSentinel testDataSentinel1(ebsdlib::unit_test::k_TestFilesDir, "Pole_Figure_Images.tar.gz", "Pole_Figure_Images", true, true);
+  const ebsdlib::unit_test::TestFileSentinel testDataSentinel1(ebsdlib::unit_test::k_TestFilesDir, "Pole_Figure_Images.tar.gz", "Pole_Figure_Images"
+#if WRITE_EXEMPLAR_IMAGES
+    , false, false
+#endif
+    );
 
   const std::string hdfInputFile = fmt::format("{}/Pole_Figure_Images/Exemplar_Data.h5", ebsdlib::unit_test::k_TestFilesDir);
   hid_t fileId = -1;
-  // if(!std::filesystem::exists(hdfInputFile))
-  // {
-  //   fileId = H5Support::H5Utilities::createFile(hdfInputFile);
-  // }
-  // else
+#if WRITE_EXEMPLAR_IMAGES
+  if(!std::filesystem::exists(hdfInputFile))
+  {
+    std::cout << "Creating " << hdfInputFile << std::endl;
+    fileId = H5Support::H5Utilities::createFile(hdfInputFile);
+  }
+  else
+#else
   {
+    std::cout << "Opening " << hdfInputFile << std::endl;
     fileId = H5Support::H5Utilities::openFile(hdfInputFile, true);
   }
-  H5Support::H5ScopedFileSentinel fileSentinel(fileId, true);
+#endif
+  REQUIRE(fileId > 0);
+  H5Support::H5ScopedFileSentinel fileSentinel(fileId, false);
 
   std::vector<LaueOps::Pointer> ops = LaueOps::GetAllOrientationOps();
 
@@ -210,10 +231,13 @@ TEST_CASE("ebsdlib::PoleFigureCompositorTest::All_Laue_Classes", "[EbsdLib][Pole
     tested.insert(rpg);
 
     hid_t layoutGroupId = H5Support::H5Utilities::createGroup(fileId, rpg);
-    H5Support::H5ScopedGroupSentinel layoutGroupSentinel(layoutGroupId, true);
+    REQUIRE(layoutGroupId > 0);
+    H5Support::H5ScopedGroupSentinel layoutGroupSentinel(layoutGroupId, false);
 
     const std::string phaseName = fmt::format("Laue_{}", rpg);
+#if !WRITE_EXEMPLAR_IMAGES
     SECTION(phaseName + " VMF")
+#endif
     {
       GeneratePoleFigures(phaseName, opsIdx, layoutGroupId);
     }