From a79e8a415173b6736549d8596e9bed44357dc044 Mon Sep 17 00:00:00 2001 From: Jessica Marquis Date: Mon, 3 Jun 2024 09:29:46 -0400 Subject: [PATCH] Fix unit test bugs --- .../SimplnxCore/Filters/CreateAMScanPathsFilter.cpp | 4 ---- .../Filters/SliceTriangleGeometryFilter.cpp | 1 - src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp | 10 +++++----- .../SimplnxCore/test/SliceTriangleGeometryTest.cpp | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp index b2f9cf7ecc..a6b0656f56 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAMScanPathsFilter.cpp @@ -89,10 +89,6 @@ IFilter::UniquePointer CreateAMScanPathsFilter::clone() const IFilter::PreflightResult CreateAMScanPathsFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pStripeWidthValue = filterArgs.value(k_StripeWidth_Key); - auto pHatchSpacingValue = filterArgs.value(k_HatchSpacing_Key); - auto pPowerValue = filterArgs.value(k_Power_Key); - auto pSpeedValue = filterArgs.value(k_Speed_Key); auto pCADSliceDataContainerNameValue = filterArgs.value(k_CADSliceDataContainerPath_Key); auto pCADSliceIdsArrayPathValue = filterArgs.value(k_CADSliceIdsArrayPath_Key); auto pCADRegionIdsArrayPathValue = filterArgs.value(k_CADRegionIdsArrayPath_Key); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp index 7f14029189..58a7ba4cb2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SliceTriangleGeometryFilter.cpp @@ -109,7 +109,6 @@ IFilter::PreflightResult SliceTriangleGeometryFilter::preflightImpl(const DataSt auto pSliceRangeValue = filterArgs.value(k_SliceRange_Key); auto pZStartValue = filterArgs.value(k_Zstart_Key); auto pZEndValue = filterArgs.value(k_Zend_Key); - auto pSliceResolutionValue = filterArgs.value(k_SliceResolution_Key); auto pHaveRegionIdsValue = filterArgs.value(k_HaveRegionIds_Key); auto pCADDataContainerNameValue = filterArgs.value(k_TriangleGeometryDataPath_Key); auto pRegionIdArrayPathValue = filterArgs.value(k_RegionIdArrayPath_Key); diff --git a/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp b/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp index f516ba2aab..ae7e321d96 100644 --- a/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp +++ b/src/Plugins/SimplnxCore/test/CreateAMScanPathsTest.cpp @@ -50,11 +50,11 @@ TEST_CASE("SimplnxCore::CreateAMScanPathsFilter: Valid Filter Execution", "[Simp args.insertOrAssign(CreateAMScanPathsFilter::k_CADSliceIdsArrayPath_Key, std::make_any(k_SliceIdsPath)); args.insertOrAssign(CreateAMScanPathsFilter::k_CADRegionIdsArrayPath_Key, std::make_any(k_RegionIdsPath)); args.insertOrAssign(CreateAMScanPathsFilter::k_HatchDataContainerPath_Key, std::make_any(k_ComputedScanVectorsPath)); - args.insertOrAssign(CreateAMScanPathsFilter::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexData)); - args.insertOrAssign(CreateAMScanPathsFilter::k_HatchAttributeMatrixName_Key, std::make_any(k_EdgeData)); - args.insertOrAssign(CreateAMScanPathsFilter::k_TimeArrayName_Key, std::make_any(k_Times)); - args.insertOrAssign(CreateAMScanPathsFilter::k_RegionIdsArrayName_Key, std::make_any(k_RegionIdsName)); - args.insertOrAssign(CreateAMScanPathsFilter::k_PowersArrayName_Key, std::make_any(k_Powers)); + args.insertOrAssign(CreateAMScanPathsFilter::k_VertexAttributeMatrixName_Key, std::make_any(k_VertexData)); + args.insertOrAssign(CreateAMScanPathsFilter::k_HatchAttributeMatrixName_Key, std::make_any(k_EdgeData)); + args.insertOrAssign(CreateAMScanPathsFilter::k_TimeArrayName_Key, std::make_any(k_Times)); + args.insertOrAssign(CreateAMScanPathsFilter::k_RegionIdsArrayName_Key, std::make_any(k_RegionIdsName)); + args.insertOrAssign(CreateAMScanPathsFilter::k_PowersArrayName_Key, std::make_any(k_Powers)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp b/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp index d16fad2055..634f70e474 100644 --- a/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp +++ b/src/Plugins/SimplnxCore/test/SliceTriangleGeometryTest.cpp @@ -47,7 +47,7 @@ TEST_CASE("SimplnxCore::SliceTriangleGeometryFilter: Valid Filter Execution", "[ args.insertOrAssign(SliceTriangleGeometryFilter::k_TriangleGeometryDataPath_Key, std::make_any(k_InputTriangleGeometryPath)); args.insertOrAssign(SliceTriangleGeometryFilter::k_RegionIdArrayPath_Key, std::make_any(k_RegionIdsPath)); - args.insertOrAssign(SliceTriangleGeometryFilter::k_OutputEdgeGeometryPath_Key, std::make_any(k_ComputedEdgeGeometryPath)); + args.insertOrAssign(SliceTriangleGeometryFilter::k_OutputEdgeGeometryPath_Key, std::make_any(k_ComputedEdgeGeometryPath)); args.insertOrAssign(SliceTriangleGeometryFilter::k_EdgeAttributeMatrixName_Key, std::make_any(k_EdgeData)); args.insertOrAssign(SliceTriangleGeometryFilter::k_SliceIdArrayName_Key, std::make_any(k_SliceIds)); args.insertOrAssign(SliceTriangleGeometryFilter::k_SliceAttributeMatrixName_Key, std::make_any(k_SliceData));