Skip to content

ENH: Add unit test functions for comparing full datastructure #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmarquisbq wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

ENH: Add unit test functions for comparing full datastructure #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3381a81
Add unit test functions for comparing full datastructure
jmarquisbq Jan 6, 2026
d7753b0
Refactor the Compare Data Structure Function
imikejackson Jan 8, 2026
c02c3c8
Misc code cleanup resulting from cleanup in UnitTestCommon
imikejackson Jan 8, 2026
bc9a981
Apply suggestions from code review
jmarquisbq Jan 27, 2026
acfcfcb
Reverse part of a commit.
imikejackson Jan 27, 2026
86e3db0
Additional testing for BaseGroup types
jmarquisbq Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Plugins/ITKImageProcessing/test/ITKAdaptiveHistogramEqualizationImageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <catch2/catch.hpp>

#include "simplnx/Core/Application.hpp"
#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/BoolParameter.hpp"
#include "simplnx/Parameters/ChoicesParameter.hpp"
#include "simplnx/Parameters/DataGroupCreationParameter.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/OrientationAnalysis/test/ComputeIPFColorsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Compare the data sets. The values should be exactly the same.
#include "OrientationAnalysis/Filters/ComputeIPFColorsFilter.hpp"
#include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp"

#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/VectorParameter.hpp"
#include "simplnx/UnitTest/UnitTestCommon.hpp"
#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/SimplnxCore/test/ApplyTransformationToGeometryTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "SimplnxCore/SimplnxCore_test_dirs.hpp"

#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp"
#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/ArrayCreationParameter.hpp"
#include "simplnx/Parameters/ChoicesParameter.hpp"
#include "simplnx/Parameters/DynamicTableParameter.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/SimplnxCore/test/ExtractPipelineToFileTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "SimplnxCore/SimplnxCore_test_dirs.hpp"

#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp"
#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/FileSystemPathParameter.hpp"
#include "simplnx/UnitTest/UnitTestCommon.hpp"
#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/SimplnxCore/test/PointSampleTriangleGeometryFilterTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "simplnx/DataStructure/DataGroup.hpp"
#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp"
#include "simplnx/DataStructure/Geometry/VertexGeom.hpp"
#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/ArrayCreationParameter.hpp"
#include "simplnx/Parameters/FileSystemPathParameter.hpp"
#include "simplnx/Parameters/MultiArraySelectionParameter.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/SimplnxCore/test/RemoveFlaggedVerticesTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "SimplnxCore/SimplnxCore_test_dirs.hpp"

#include "simplnx/DataStructure/AttributeMatrix.hpp"
#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/UnitTest/UnitTestCommon.hpp"

#include <catch2/catch.hpp>
Expand Down
1 change: 1 addition & 0 deletions src/Plugins/SimplnxCore/test/ScalarSegmentFeaturesTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "SimplnxCore/Filters/ScalarSegmentFeaturesFilter.hpp"
#include "SimplnxCore/SimplnxCore_test_dirs.hpp"

#include "simplnx/DataStructure/IO/HDF5/DataStructureWriter.hpp"
#include "simplnx/Parameters/ArrayCreationParameter.hpp"
#include "simplnx/Parameters/BoolParameter.hpp"
#include "simplnx/Parameters/ChoicesParameter.hpp"
Expand Down
23 changes: 23 additions & 0 deletions test/DataStructTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@

#include <catch2/catch.hpp>

#include <filesystem>
#include <iostream>
#include <memory>
#include <vector>

namespace fs = std::filesystem;
using namespace nx::core;

namespace
Expand Down Expand Up @@ -1618,3 +1620,24 @@ TEST_CASE("NodeBasedGeometryFindElementsTest")
REQUIRE(status == 1);
}
}

TEST_CASE("CompareDataStructures")
{
UnitTest::LoadPlugins();

DataStructure dataStructure0 = createTestDataStructure();
DataStructure dataStructure1 = createTestDataStructure();

UnitTest::CompareDataStructures(dataStructure0, dataStructure1);
}

TEST_CASE("CompareDataStructures-fail", "[SimplnxReview][!mayfail]")
{
UnitTest::LoadPlugins();

DataStructure dataStructure0 = createTestDataStructure();
DataStructure dataStructure1 = createTestDataStructure();
dataStructure1.removeData(DataPath({Constants::k_ImageGeometry}));

UnitTest::CompareDataStructures(dataStructure0, dataStructure1);
}
3 changes: 3 additions & 0 deletions test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#include "UnitTestCommon.hpp"

#include <reproc++/reproc.hpp>
#include <reproc++/run.hpp>

using namespace nx::core::UnitTest;

TestFileSentinel::TestFileSentinel(std::string cmakeExecutable, std::string testFilesDir, std::string inputArchiveName, std::string expectedTopLevelOutput, bool decompressFiles, bool removeTemp)
Expand Down
332 changes: 306 additions & 26 deletions test/UnitTestCommon/include/simplnx/UnitTest/UnitTestCommon.hpp
View file
Open in desktop

Large diffs are not rendered by default.

Loading