Skip to content

Commit 59f5e57

Browse files
committed
Implement PR suggestions.
Signed-off-by: Joey Kleingers <[email protected]>
1 parent 08016c5 commit 59f5e57

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ TEST_CASE("DREAM3DFileTest:DREAM3D File IO Test")
278278
{
279279
auto fileData = CreateFileData();
280280
Result<HDF5::FileWriter> result = HDF5::FileWriter::CreateFile(GetIODataPath());
281-
REQUIRE(result.valid());
281+
SIMPLNX_RESULT_REQUIRE_VALID(result);
282282

283283
auto writeResult = DREAM3D::WriteFile(result.value(), fileData);
284284
SIMPLNX_RESULT_REQUIRE_VALID(writeResult);

src/simplnx/Parameters/Dream3dImportParameter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ IParameter::AcceptedTypes Dream3dImportParameter::acceptedTypes() const
4343
//------------------------------------------------------------------------------
4444
IParameter::VersionType Dream3dImportParameter::getVersion() const
4545
{
46-
return 1;
46+
return 2;
4747
}
4848

4949
//-----------------------------------------------------------------------------
@@ -130,7 +130,7 @@ Result<std::any> Dream3dImportParameter::fromJsonImpl(const nlohmann::json& json
130130
}
131131

132132
PathImportPolicy pathImportPolicy = PathImportPolicy::All;
133-
if(json.contains(k_PathImportPolicyKey))
133+
if(version == 2)
134134
{
135135
const auto& pathImportPolicyJson = json[k_PathImportPolicyKey];
136136
if(!pathImportPolicyJson.is_number_integer())

0 commit comments

Comments
 (0)