diff --git a/Modules/Core/test/mitkPropertyPersistenceTest.cpp b/Modules/Core/test/mitkPropertyPersistenceTest.cpp index f74104bcc7..6bbe9daba8 100644 --- a/Modules/Core/test/mitkPropertyPersistenceTest.cpp +++ b/Modules/Core/test/mitkPropertyPersistenceTest.cpp @@ -1,236 +1,236 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkPropertyPersistence.h" #include "mitkTestFixture.h" #include "mitkTestingMacros.h" #include "mitkStringProperty.h" #include "mitkIOMimeTypes.h" #include #include #include #include class mitkPropertyPersistenceTestSuite : public mitk::TestFixture { CPPUNIT_TEST_SUITE(mitkPropertyPersistenceTestSuite); MITK_TEST(AddInfo); MITK_TEST(GetInfos); MITK_TEST(GetInfo); MITK_TEST(GetInfosByKey); MITK_TEST(HasInfos); MITK_TEST(RemoveAllInfos); MITK_TEST(RemoveInfos); MITK_TEST(RemoveInfos_withMime); CPPUNIT_TEST_SUITE_END(); private: mitk::PropertyPersistenceInfo::Pointer info1; mitk::PropertyPersistenceInfo::Pointer info2; mitk::PropertyPersistenceInfo::Pointer info3; mitk::PropertyPersistenceInfo::Pointer info4; mitk::PropertyPersistenceInfo::Pointer info5; mitk::PropertyPersistenceInfo::Pointer info6; std::string prop1; std::string prop2; std::string prop3; std::string prop4; std::string prop5; std::string prop6; mitk::IPropertyPersistence* service; static bool checkExistance(const mitk::PropertyPersistence::InfoMapType& infos, const std::string& name, const mitk::PropertyPersistenceInfo* info) { auto infoRange = infos.equal_range(name); auto predicate = [info](const std::pair& x){return infosAreEqual(info, x.second); }; auto finding = std::find_if(infoRange.first, infoRange.second, predicate); bool result = finding != infoRange.second; return result; } static bool infosAreEqual(const mitk::PropertyPersistenceInfo* ref, const mitk::PropertyPersistenceInfo* info) { bool result = true; if (!info || !ref) { return false; } result = result && ref->GetKey() == info->GetKey(); result = result && ref->GetMimeTypeName() == info->GetMimeTypeName(); return result; } public: void setUp() override { service = mitk::CreateTestInstancePropertyPersistence(); info1 = mitk::PropertyPersistenceInfo::New("key1"); info2 = mitk::PropertyPersistenceInfo::New("key2", "mime2"); info3 = mitk::PropertyPersistenceInfo::New("key3", "mime3"); info4 = mitk::PropertyPersistenceInfo::New("key2", "mime2"); info5 = mitk::PropertyPersistenceInfo::New("key5", "mime5"); prop1 = "prop1"; prop2 = "prop1"; prop3 = "prop1"; prop4 = "prop4"; prop5 = "prop5"; service->AddInfo(prop1, info1, false); service->AddInfo(prop2, info2, false); service->AddInfo(prop3, info3, false); service->AddInfo(prop4, info4, false); service->AddInfo(prop5, info5, false); } void tearDown() override { delete service; } void AddInfo() { mitk::PropertyPersistenceInfo::Pointer info2_new = mitk::PropertyPersistenceInfo::New("newKey", "otherMime"); mitk::PropertyPersistenceInfo::Pointer info2_otherKey = mitk::PropertyPersistenceInfo::New("otherKey", "mime2"); - MITK_TEST_CONDITION_REQUIRED(!service->AddInfo(prop2, info2_otherKey, false), "Testing addinfo of already existing info (no overwrite) -> no adding"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop2, "mime2", false)->GetKey() == "key2", "Testing addinfo of already existing info (no overwrite) -> no adding -> key should not be changed."); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of already existing info (no overwrite) -> no adding", !service->AddInfo(prop2, info2_otherKey, false)); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of already existing info (no overwrite) -> no adding -> key should not be changed.", service->GetInfo(prop2, "mime2", false)->GetKey() == "key2"); - MITK_TEST_CONDITION_REQUIRED(service->AddInfo(prop2, info2_otherKey, true), "Testing addinfo of already existing info (overwrite) -> adding"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop2, "mime2", false)->GetKey() == "otherKey", "Testing addinfo of already existing info (no overwrite) -> adding -> key should be changed."); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of already existing info (overwrite) -> adding", service->AddInfo(prop2, info2_otherKey, true)); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of already existing info (no overwrite) -> adding -> key should be changed.", service->GetInfo(prop2, "mime2", false)->GetKey() == "otherKey"); - MITK_TEST_CONDITION_REQUIRED(service->AddInfo(prop2, info2_new, false), "Testing addinfo of info (other mime type; no overwrite) -> adding"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop2, "otherMime", false).IsNotNull(), "Testing addinfo of info (other mime type; no overwrite) -> adding -> info exists."); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of info (other mime type; no overwrite) -> adding", service->AddInfo(prop2, info2_new, false)); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of info (other mime type; no overwrite) -> adding -> info exists.", service->GetInfo(prop2, "otherMime", false).IsNotNull()); - MITK_TEST_CONDITION_REQUIRED(service->AddInfo("newProp", info2_new, false), "Testing addinfo of info (new prop name; no overwrite) -> adding"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo("newProp", "otherMime", false).IsNotNull(), "Testing addinfo of info (new prop name; no overwrite) -> adding ->info exists."); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of info (new prop name; no overwrite) -> adding", service->AddInfo("newProp", info2_new, false)); + CPPUNIT_ASSERT_MESSAGE("Testing addinfo of info (new prop name; no overwrite) -> adding ->info exists.", service->GetInfo("newProp", "otherMime", false).IsNotNull()); } void GetInfos() { mitk::PropertyPersistence::InfoMapType infos = service->GetInfos(prop1); - MITK_TEST_EQUAL(infos.size(), 3, "Check size of result for Prop1"); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop1, info1), "Check expected element 1."); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop2, info2), "Check expected element 2."); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop3, info3), "Check expected element 3."); + CPPUNIT_ASSERT(infos.size() == 3); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop1, info1)); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop2, info2)); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop3, info3)); infos = service->GetInfos(prop4); - MITK_TEST_EQUAL(infos.size(), 1, "Check size of result for Prop1"); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop4, info4), "Check expected element 1."); + CPPUNIT_ASSERT(infos.size() == 1); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop4, info4)); infos = service->GetInfos("unkown"); - MITK_TEST_CONDITION_REQUIRED(infos.empty(), "Check size of result for unkown prop."); + CPPUNIT_ASSERT_MESSAGE("Check size of result for unkown prop.", infos.empty()); } void GetInfosByKey() { mitk::PropertyPersistence::InfoMapType infos = service->GetInfosByKey("key2"); - MITK_TEST_EQUAL(infos.size(), 2, "Check size of result for key2"); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop2, info2), "Check expected element 1."); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop4, info4), "Check expected element 2."); + CPPUNIT_ASSERT(infos.size() == 2); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop2, info2)); + CPPUNIT_ASSERT_MESSAGE("Check expected element 2.", checkExistance(infos, prop4, info4)); infos = service->GetInfosByKey("key5"); - MITK_TEST_EQUAL(infos.size(), 1, "Check size of result for Prop1"); - MITK_TEST_CONDITION_REQUIRED(checkExistance(infos, prop5, info5), "Check expected element 1."); + CPPUNIT_ASSERT(infos.size() == 1); + CPPUNIT_ASSERT_MESSAGE("Check expected element 1.", checkExistance(infos, prop5, info5)); infos = service->GetInfosByKey("unkownkey"); - MITK_TEST_CONDITION_REQUIRED(infos.empty(), "Check size of result for unkown key."); + CPPUNIT_ASSERT_MESSAGE("Check size of result for unkown key.", infos.empty()); } void GetInfo() { mitk::PropertyPersistenceInfo::Pointer foundInfo = service->GetInfo(prop1, "mime2", false); - MITK_TEST_CONDITION_REQUIRED(infosAreEqual(info2, foundInfo), "Check GetInfo (existing element, no wildcard allowed, wildcard exists)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (existing element, no wildcard allowed, wildcard exists).", infosAreEqual(info2, foundInfo)); foundInfo = service->GetInfo(prop1, "mime2", true); - MITK_TEST_CONDITION_REQUIRED(infosAreEqual(info2, foundInfo), "Check GetInfo (existing element, wildcard allowed, wildcard exists)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (existing element, wildcard allowed, wildcard exists).", infosAreEqual(info2, foundInfo)); foundInfo = service->GetInfo(prop1, "unknownmime", false); - MITK_TEST_CONDITION_REQUIRED(foundInfo.IsNull(), "Check GetInfo (inexisting element, no wildcard allowed, wildcard exists)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (inexisting element, no wildcard allowed, wildcard exists).", foundInfo.IsNull()); foundInfo = service->GetInfo(prop1, "unknownmime", true); - MITK_TEST_CONDITION_REQUIRED(infosAreEqual(info1, foundInfo), "Check GetInfo (inexisting element, wildcard allowed, wildcard exists)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (inexisting element, wildcard allowed, wildcard exists).", infosAreEqual(info1, foundInfo)); foundInfo = service->GetInfo(prop4, "unknownmime", false); - MITK_TEST_CONDITION_REQUIRED(foundInfo.IsNull(), "Check GetInfo (inexisting element, no wildcard allowed)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (inexisting element, no wildcard allowed).", foundInfo.IsNull()); foundInfo = service->GetInfo(prop4, "unknownmime", true); - MITK_TEST_CONDITION_REQUIRED(foundInfo.IsNull(), "Check GetInfo (inexisting element, wildcard allowed)."); + CPPUNIT_ASSERT_MESSAGE("Check GetInfo (inexisting element, wildcard allowed).", foundInfo.IsNull()); } void HasInfos() { - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop1), "Check HasInfos (prop1)"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop4), "Check HasInfos (prop4)"); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos("unkownProp"), "Check HasInfos (unkown prop)"); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop1)", service->HasInfos(prop1)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop4)", service->HasInfos(prop4)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (unkown prop)", !service->HasInfos("unkownProp")); } void RemoveAllInfos() { - service->RemoveAllInfos(); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop1), "Check HasInfos (prop1)"); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop4), "Check HasInfos (prop4)"); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop5), "Check HasInfos (prop5)"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveAllInfos()); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop1)", !service->HasInfos(prop1)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop4)", !service->HasInfos(prop4)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop5)", !service->HasInfos(prop5)); } void RemoveInfos() { - service->RemoveInfos(prop1); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop1), "Check HasInfos (prop1)"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop4), "Check HasInfos (prop4)"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop5), "Check HasInfos (prop5)"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop1)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop1)", !service->HasInfos(prop1)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop4)", service->HasInfos(prop4)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop5)", service->HasInfos(prop5)); - service->RemoveInfos(prop4); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop4), "Check HasInfos (prop4)"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop5), "Check HasInfos (prop5)"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop4)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop4)", !service->HasInfos(prop4)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop5)", service->HasInfos(prop5)); - service->RemoveInfos(prop5); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop5), "Check HasInfos (prop5)"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop5)); + CPPUNIT_ASSERT_MESSAGE("Check HasInfos (prop5)", !service->HasInfos(prop5)); - service->RemoveInfos("unknown_prop"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos("unknown_prop")); } void RemoveInfos_withMime() { - service->RemoveInfos(prop1, "mime2"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop1,"mime2",false).IsNull(), "Check RemoveInfos if info was removed"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop1, "mime3", false).IsNotNull(), "Check RemoveInfos, if other info of same property name still exists"); - MITK_TEST_CONDITION_REQUIRED(service->GetInfo(prop4, "mime2", false).IsNotNull(), "Check RemoveInfos, if other info of other property name but same mime still exists"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop1, "mime2")); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos if info was removed",service->GetInfo(prop1, "mime2", false).IsNull()); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos, if other info of same property name still exists", service->GetInfo(prop1, "mime3", false).IsNotNull()); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos, if other info of other property name but same mime still exists", service->GetInfo(prop4, "mime2", false).IsNotNull()); - service->RemoveInfos(prop5, "wrongMime"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop5), "Check RemoveInfos on prop 5 with wrong mime"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop5, "wrongMime")); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos on prop 5 with wrong mime", service->HasInfos(prop5)); - service->RemoveInfos(prop5, "mime5"); - MITK_TEST_CONDITION_REQUIRED(!service->HasInfos(prop5), "Check RemoveInfos on prop 5"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos(prop5, "mime5")); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos on prop 5", !service->HasInfos(prop5)); - service->RemoveInfos("unkown_prop", "mime2"); - MITK_TEST_CONDITION_REQUIRED(service->HasInfos(prop4), "Check RemoveInfos, if unkown property name but exting mime was used"); + CPPUNIT_ASSERT_NO_THROW(service->RemoveInfos("unkown_prop", "mime2")); + CPPUNIT_ASSERT_MESSAGE("Check RemoveInfos, if unkown property name but exting mime was used", service->HasInfos(prop4)); } }; MITK_TEST_SUITE_REGISTRATION(mitkPropertyPersistence) diff --git a/Modules/Core/test/mitkTemporoSpatialStringPropertyTest.cpp b/Modules/Core/test/mitkTemporoSpatialStringPropertyTest.cpp index d73d47d644..13927ac077 100644 --- a/Modules/Core/test/mitkTemporoSpatialStringPropertyTest.cpp +++ b/Modules/Core/test/mitkTemporoSpatialStringPropertyTest.cpp @@ -1,76 +1,146 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "mitkTemporoSpatialStringProperty.h" #include "mitkTestFixture.h" #include "mitkTestingMacros.h" #include class mitkTemporoSpatialStringPropertyTestSuite : public mitk::TestFixture { CPPUNIT_TEST_SUITE(mitkTemporoSpatialStringPropertyTestSuite); + MITK_TEST(GetValue); + MITK_TEST(HasValue); + MITK_TEST(SetValue); + MITK_TEST(serializeTemporoSpatialStringPropertyToJSON); MITK_TEST(deserializeJSONToTemporoSpatialStringProperty); CPPUNIT_TEST_SUITE_END(); private: std::string refJSON; mitk::TemporoSpatialStringProperty::Pointer refProp; public: void setUp() override { refJSON = "{\"values\":[{\"t\":0, \"z\":0, \"value\":\"v_0_0\"}, {\"t\":3, \"z\":0, \"value\":\"v_3_0\"}, {\"t\":3, \"z\":2, \"value\":\"v_3_2\"}, {\"t\":6, \"z\":1, \"value\":\"v_6_1\"}]}"; refProp = mitk::TemporoSpatialStringProperty::New(); refProp->SetValue(0, 0, "v_0_0"); refProp->SetValue(3, 0, "v_3_0"); refProp->SetValue(3, 2, "v_3_2"); refProp->SetValue(6, 1, "v_6_1"); } void tearDown() override { } + void GetValue() + { + CPPUNIT_ASSERT(refProp->GetValue() == "v_0_0"); + + CPPUNIT_ASSERT(refProp->GetValue(3,0) == "v_3_0"); + CPPUNIT_ASSERT(refProp->GetValue(3,2) == "v_3_2"); + CPPUNIT_ASSERT(refProp->GetValue(3,1,false,true) == "v_3_0"); + CPPUNIT_ASSERT(refProp->GetValue(3,5, false, true) == "v_3_2"); + + CPPUNIT_ASSERT(refProp->GetValueBySlice(0) == "v_0_0"); + CPPUNIT_ASSERT(refProp->GetValueBySlice(4, true) == "v_0_0"); + + CPPUNIT_ASSERT(refProp->GetValueByTimeStep(3) == "v_3_0"); + CPPUNIT_ASSERT(refProp->GetValueByTimeStep(6) == "v_6_1"); + CPPUNIT_ASSERT(refProp->GetValueByTimeStep(5, true) == "v_3_0"); + + CPPUNIT_ASSERT(refProp->GetValueAsString() == "v_0_0"); + + CPPUNIT_ASSERT(refProp->GetAvailableTimeSteps().size() == 3); + CPPUNIT_ASSERT(refProp->GetAvailableTimeSteps()[0] == 0); + CPPUNIT_ASSERT(refProp->GetAvailableTimeSteps()[1] == 3); + CPPUNIT_ASSERT(refProp->GetAvailableTimeSteps()[2] == 6); + + CPPUNIT_ASSERT(refProp->GetAvailableSlices(0).size() == 1); + CPPUNIT_ASSERT(refProp->GetAvailableSlices(0)[0] == 0); + CPPUNIT_ASSERT(refProp->GetAvailableSlices(3).size() == 2); + CPPUNIT_ASSERT(refProp->GetAvailableSlices(3)[0] == 0); + CPPUNIT_ASSERT(refProp->GetAvailableSlices(3)[1] == 2); + + CPPUNIT_ASSERT(refProp->GetAvailableSlices(2).size() == 0); + } + + void HasValue() + { + CPPUNIT_ASSERT(refProp->HasValue()); + + CPPUNIT_ASSERT(refProp->HasValue(3, 0)); + CPPUNIT_ASSERT(refProp->HasValue(3, 2)); + CPPUNIT_ASSERT(refProp->HasValue(3, 1, false, true)); + CPPUNIT_ASSERT(refProp->HasValue(3, 5, false, true)); + CPPUNIT_ASSERT(!refProp->HasValue(3, 1)); + CPPUNIT_ASSERT(!refProp->HasValue(3, 5)); + CPPUNIT_ASSERT(refProp->HasValue(4, 2, true, true)); + CPPUNIT_ASSERT(refProp->HasValue(4, 2, true, false)); + CPPUNIT_ASSERT(!refProp->HasValue(4, 2, false, true)); + + CPPUNIT_ASSERT(refProp->HasValueBySlice(0)); + CPPUNIT_ASSERT(refProp->HasValueBySlice(4, true)); + CPPUNIT_ASSERT(!refProp->HasValueBySlice(4)); + + CPPUNIT_ASSERT(refProp->HasValueByTimeStep(3)); + CPPUNIT_ASSERT(refProp->HasValueByTimeStep(6)); + CPPUNIT_ASSERT(refProp->HasValueByTimeStep(5, true)); + CPPUNIT_ASSERT(!refProp->HasValueByTimeStep(5)); + } + + void SetValue() + { + CPPUNIT_ASSERT_NO_THROW(refProp->SetValue(8, 9, "v_8_9")); + CPPUNIT_ASSERT(refProp->GetValue(8,9) == "v_8_9"); + + CPPUNIT_ASSERT_NO_THROW(refProp->SetValue("newValue")); + CPPUNIT_ASSERT(refProp->GetValue(0, 0) == "newValue"); + CPPUNIT_ASSERT(refProp->GetAvailableTimeSteps().size()==1); + CPPUNIT_ASSERT(refProp->GetAvailableSlices(0).size() == 1); + } void serializeTemporoSpatialStringPropertyToJSON() { std::string data = mitk::PropertyPersistenceSerialization::serializeTemporoSpatialStringPropertyToJSON(refProp); - MITK_TEST_CONDITION_REQUIRED(refJSON == data, "Testing serializeTemporoSpatialStringPropertyToJSON() producing correct string."); + CPPUNIT_ASSERT(refJSON == data); //"Testing serializeTemporoSpatialStringPropertyToJSON() producing correct string."); } void deserializeJSONToTemporoSpatialStringProperty() { mitk::BaseProperty::Pointer prop = mitk::PropertyPersistenceDeserialization::deserializeJSONToTemporoSpatialStringProperty(refJSON); mitk::TemporoSpatialStringProperty* tsProp = dynamic_cast(prop.GetPointer()); - MITK_TEST_CONDITION_REQUIRED(tsProp->GetValue(0,0) == "v_0_0", "Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 1"); - MITK_TEST_CONDITION_REQUIRED(tsProp->GetValue(3, 0) == "v_3_0", "Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 2"); - MITK_TEST_CONDITION_REQUIRED(tsProp->GetValue(3, 2) == "v_3_2", "Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 3"); - MITK_TEST_CONDITION_REQUIRED(tsProp->GetValue(6, 1) == "v_6_1", "Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 4"); - MITK_TEST_CONDITION_REQUIRED(*tsProp == *refProp, "Testing deserializeJSONToTemporoSpatialStringProperty()"); + CPPUNIT_ASSERT(tsProp->GetValue(0, 0) == "v_0_0"); //"Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 1"); + CPPUNIT_ASSERT(tsProp->GetValue(3, 0) == "v_3_0"); //"Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 2"); + CPPUNIT_ASSERT(tsProp->GetValue(3, 2) == "v_3_2"); //"Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 3"); + CPPUNIT_ASSERT(tsProp->GetValue(6, 1) == "v_6_1"); //"Testing deserializeJSONToTemporoSpatialStringProperty() producing property with correct value 4"); + CPPUNIT_ASSERT(*tsProp == *refProp); //"Testing deserializeJSONToTemporoSpatialStringProperty()"); } }; MITK_TEST_SUITE_REGISTRATION(mitkTemporoSpatialStringProperty)