Fix failing unit tests. Update to EbsdLib 1.0.28

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · May 24, 2024 · 9c7fbdd · 9c7fbdd
1 parent a203d39
commit 9c7fbdd
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/...ionAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeSlipTransmissionMetrics.cpp b/...ionAnalysis/src/OrientationAnalysis/Filters/Algorithms/ComputeSlipTransmissionMetrics.cpp
@@ -4,6 +4,7 @@
 #include "simplnx/DataStructure/NeighborList.hpp"
 
 #include "EbsdLib/Core/Quaternion.hpp"
+#include "EbsdLib/EbsdLibVersion.h"
 #include "EbsdLib/LaueOps/LaueOps.h"
 
 using namespace nx::core;

diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt
@@ -132,7 +132,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME bad_data_neighbor_orientation_check.tar.gz SHA512 6452cfb1f2394c10050082256f60a2068cfad78ef742e9e35b1d6e63b3fb7c35c9fe7bbe093bed4dbb4e758c49ec6da7b1f7e2473838a0421f39fbdd9f4a2f76)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME neighbor_orientation_correlation.tar.gz SHA512 122367452174ade2f24dde7a4610bddc4f147a223722d9b30c1df9eaa2cd2bf25e1c7957aba83f3f9de79b4eadd79339b848f9530d1ebf44c69244ea5442cf85)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME so3_cubic_high_ipf_001.tar.gz SHA512 dfe4598cd4406e8b83f244302dc4fe0d4367527835c5ddd6567fe8d8ab3484d5b10ba24a8bb31db269256ec0b5272daa4340eedb5a8b397755541b32dd616b85)
-  download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME feature_boundary_neighbor_slip_transmission.tar.gz SHA512 fb4a92bdfcff1f2b167cdce2126087e76c9022deb0f0bd8a658482f88f8593bacc0e23b8056d56390f767bc1dd21912fb01a976e3cb670738f1a39d46ad9ef28)
+  download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME feature_boundary_neighbor_slip_transmission_1.tar.gz SHA512 5b81c1e42dfd88f1a629ba1d7b378391ed74895dcb21ee69e65de879e9c40f98dfba2959d6d0d491508dbcce0b1e6ee480f7ad9e9ed570a7419eab83113acef3)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ang_data.tar.gz SHA512 1777431a1623e2fffdc2daad9be51a72c3bdf6a83a33893827892c98a811991e21f1cf636e036604d0bbc523d8ca0b9d655c28be3d0e89ccafc1486dfa0bd0c7)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_read_ctf_data_2.tar.gz SHA512 f397fa3bf457615a90a4b48eaafded2aa4952b41ccb28d9da6a83adc38aea9c22f2bb5a955f251edeca9ef8265b6bf1d74e829b1340f45cf52620a237aad1707)
   download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME write_stats_gen_odf_angle_file.tar.gz SHA512 be3f663aae1f78e5b789200421534ed9fe293187ec3514796ac8177128b34ded18bb9a98b8e838bb283f9818ac30dc4b19ec379bdd581b1a98eb36d967cdd319)

diff --git a/src/Plugins/OrientationAnalysis/test/ComputeBoundaryStrengthsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeBoundaryStrengthsTest.cpp
@@ -8,6 +8,7 @@
 #include "simplnx/UnitTest/UnitTestCommon.hpp"
 
 using namespace nx::core;
+using namespace nx::core::UnitTest;
 
 namespace
 {
@@ -17,21 +18,21 @@ DataPath avgQuatsPath = DataPath({Constants::k_SmallIN100, Constants::k_Grain_Da
 DataPath featurePhasesPath = DataPath({Constants::k_SmallIN100, Constants::k_Grain_Data, Constants::k_Phases});
 DataPath crystalStructuresPath = DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, Constants::k_CrystalStructures});
 
-const std::string k_f1s = "SurfaceMeshF1s";
-const std::string k_f1spts = "SurfaceMeshF1spts";
-const std::string k_f7s = "SurfaceMeshF7s";
-const std::string k_mPrimes = "SurfaceMeshmPrimes";
+const std::string k_f1s = "F1List_COMPUTED";
+const std::string k_f1spts = "F1sptList_COMPUTED";
+const std::string k_f7s = "F7List_COMPUTED";
+const std::string k_mPrimes = "mPrimeList_COMPUTED";
 } // namespace
 
 TEST_CASE("OrientationAnalysis::ComputeBoundaryStrengthsFilter: Valid Filter Execution", "[OrientationAnalysis][ComputeBoundaryStrengthsFilter]")
 {
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
 
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz",
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission_1.tar.gz",
                                                               "feature_boundary_neighbor_slip_transmission");
 
   DataStructure dataStructure =
-      UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir)));
+      UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission_1/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir)));
   {
     // Instantiate the filter, a DataStructure object and an Arguments Object
     ComputeBoundaryStrengthsFilter filter;
@@ -57,6 +58,10 @@ TEST_CASE("OrientationAnalysis::ComputeBoundaryStrengthsFilter: Valid Filter Exe
     REQUIRE(executeResult.result.valid());
   }
 
+  // #ifdef SIMPLNX_WRITE_TEST_OUTPUT
+  WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_ComputeBoundaryStrengthsFilter.dream3d", unit_test::k_BinaryTestOutputDir)));
+  // #endif
+
   UnitTest::CompareArrays<float32>(dataStructure, faceDataPath.createChildPath("F1s"), faceDataPath.createChildPath(k_f1s));
   UnitTest::CompareArrays<float32>(dataStructure, faceDataPath.createChildPath("F1spts"), faceDataPath.createChildPath(k_f1spts));
   UnitTest::CompareArrays<float32>(dataStructure, faceDataPath.createChildPath("F7s"), faceDataPath.createChildPath(k_f7s));

diff --git a/src/Plugins/OrientationAnalysis/test/ComputeSlipTransmissionMetricsTest.cpp b/src/Plugins/OrientationAnalysis/test/ComputeSlipTransmissionMetricsTest.cpp
@@ -6,6 +6,7 @@
 #include "simplnx/UnitTest/UnitTestCommon.hpp"
 
 using namespace nx::core;
+using namespace nx::core::UnitTest;
 
 namespace
 {
@@ -15,21 +16,21 @@ DataPath avgQuatsPath = DataPath({Constants::k_SmallIN100, Constants::k_Grain_Da
 DataPath featurePhasesPath = DataPath({Constants::k_SmallIN100, Constants::k_Grain_Data, Constants::k_Phases});
 DataPath crystalStructuresPath = DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, Constants::k_CrystalStructures});
 
-const std::string k_f1s = "SurfaceMeshF1s";
-const std::string k_f1spts = "SurfaceMeshF1spts";
-const std::string k_f7s = "SurfaceMeshF7s";
-const std::string k_mPrimes = "SurfaceMeshmPrimes";
+const std::string k_f1s = "F1List_COMPUTED";
+const std::string k_f1spts = "F1sptList_COMPUTED";
+const std::string k_f7s = "F7List_COMPUTED";
+const std::string k_mPrimes = "mPrimeList_COMPUTED";
 } // namespace
 
 TEST_CASE("OrientationAnalysis::ComputeSlipTransmissionMetricsFilter: Valid Filter Execution", "[OrientationAnalysis][ComputeSlipTransmissionMetricsFilter]")
 {
   Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true);
 
-  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission.tar.gz",
-                                                              "feature_boundary_neighbor_slip_transmission");
+  const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "feature_boundary_neighbor_slip_transmission_1.tar.gz",
+                                                              "feature_boundary_neighbor_slip_transmission_1");
 
   DataStructure dataStructure =
-      UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir)));
+      UnitTest::LoadDataStructure(fs::path(fmt::format("{}/feature_boundary_neighbor_slip_transmission_1/6_6_feature_boundary_neighbor_slip_transmission.dream3d", unit_test::k_TestFilesDir)));
   {
     // Instantiate the filter, a DataStructure object and an Arguments Object
     ComputeSlipTransmissionMetricsFilter filter;
@@ -40,6 +41,7 @@ TEST_CASE("OrientationAnalysis::ComputeSlipTransmissionMetricsFilter: Valid Filt
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_AvgQuatsArrayPath_Key, std::make_any<DataPath>(avgQuatsPath));
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_FeaturePhasesArrayPath_Key, std::make_any<DataPath>(featurePhasesPath));
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_CrystalStructuresArrayPath_Key, std::make_any<DataPath>(crystalStructuresPath));
+
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_F1ListArrayName_Key, std::make_any<std::string>(k_f1s));
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_F1sptListArrayName_Key, std::make_any<std::string>(k_f1spts));
     args.insertOrAssign(ComputeSlipTransmissionMetricsFilter::k_F7ListArrayName_Key, std::make_any<std::string>(k_f7s));
@@ -54,6 +56,10 @@ TEST_CASE("OrientationAnalysis::ComputeSlipTransmissionMetricsFilter: Valid Filt
     REQUIRE(executeResult.result.valid());
   }
 
+  // #ifdef SIMPLNX_WRITE_TEST_OUTPUT
+  WriteTestDataStructure(dataStructure, fs::path(fmt::format("{}/7_0_ComputeSlipTransmissionMetricsFilter.dream3d", unit_test::k_BinaryTestOutputDir)));
+  // #endif
+
   UnitTest::CompareNeighborLists<float32>(dataStructure, grainDataPath.createChildPath("F1List"), grainDataPath.createChildPath(k_f1s));
   UnitTest::CompareNeighborLists<float32>(dataStructure, grainDataPath.createChildPath("F1sptList"), grainDataPath.createChildPath(k_f1spts));
   UnitTest::CompareNeighborLists<float32>(dataStructure, grainDataPath.createChildPath("F7List"), grainDataPath.createChildPath(k_f7s));

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -7,7 +7,7 @@
   "registries": [
     {
       "kind": "git",
-      "repository": "https://github.com/bluequartzsoftware/simplnx-registry",
+      "repository": "https://github.com/imikejackson/simplnx-registry",
       "packages": [
         "blosc",
         "boost-mp11",
@@ -32,7 +32,7 @@
         "zlib",
         "zstd"
       ],
-      "baseline": "13dcb0971a538726d6c5cd0ccea1b8ab536a81af"
+      "baseline": "57c2026a1066543570e3a7cf0b85d716828861a4"
     }
   ]
 }