Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs =================================================================== diff -u -rb1b71a40d77daee847b347b731a8442d666b9e0e -r27d9e2e0aefb9b6c8f3bda50bfa40586efddd230 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision b1b71a40d77daee847b347b731a8442d666b9e0e) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision 27d9e2e0aefb9b6c8f3bda50bfa40586efddd230) @@ -65,29 +65,29 @@ Assert.AreEqual(hydraulicBoundaryLocation.Name, mapFeature.MetaData["Naam"]); Assert.AreEqual(hydraulicBoundaryLocation.Location, mapFeature.MapGeometries.First().PointCollections.First().First()); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation), mapFeature, "h(A+->A)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm, hydraulicBoundaryLocation), mapFeature, "h(A->B)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h(B->C)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h(C->D)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation), mapFeature, "Hs(A+->A)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForSignalingNorm, hydraulicBoundaryLocation), mapFeature, "Hs(A->B)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "Hs(B->C)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "Hs(C->D)"); } Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs =================================================================== diff -u -rb1b71a40d77daee847b347b731a8442d666b9e0e -r27d9e2e0aefb9b6c8f3bda50bfa40586efddd230 --- Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs (.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs) (revision b1b71a40d77daee847b347b731a8442d666b9e0e) +++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs (.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs) (revision 27d9e2e0aefb9b6c8f3bda50bfa40586efddd230) @@ -50,29 +50,29 @@ MapFeature feature = HydraulicBoundaryLocationMapDataFeaturesFactory.CreateHydraulicBoundaryLocationFeature(location); // Assert - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForFactorizedSignalingNorm.ToString(), feature, "h(A+->A)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForSignalingNorm.ToString(), feature, "h(A->B)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForLowerLimitNorm.ToString(), feature, "h(B->C)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForFactorizedLowerLimitNorm.ToString(), feature, "h(C->D)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForFactorizedSignalingNorm.ToString(), feature, "Hs(A+->A)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForSignalingNorm.ToString(), feature, "Hs(A->B)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForLowerLimitNorm.ToString(), feature, "Hs(B->C)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForFactorizedLowerLimitNorm.ToString(), feature, "Hs(C->D)"); } Index: Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs =================================================================== diff -u -rbaff54aab6b353ca6b99cf65d3a0d334a7f49319 -r27d9e2e0aefb9b6c8f3bda50bfa40586efddd230 --- Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs (.../MapFeaturesMetaDataTestHelper.cs) (revision baff54aab6b353ca6b99cf65d3a0d334a7f49319) +++ Ringtoets/Common/test/Ringtoets.Common.Util.TestUtil/MapFeaturesMetaDataTestHelper.cs (.../MapFeaturesMetaDataTestHelper.cs) (revision 27d9e2e0aefb9b6c8f3bda50bfa40586efddd230) @@ -39,9 +39,9 @@ /// Thrown when the value and the respective meta data value associated /// with are not equal. /// - public static void AssertHydraulicBoundaryLocationOutputMetaData(string expectedValue, - MapFeature feature, - string key) + public static void AssertMetaData(string expectedValue, + MapFeature feature, + string key) { Assert.AreEqual(expectedValue, feature.MetaData[key]); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs =================================================================== diff -u -rb1b71a40d77daee847b347b731a8442d666b9e0e -r27d9e2e0aefb9b6c8f3bda50bfa40586efddd230 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs (.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs) (revision b1b71a40d77daee847b347b731a8442d666b9e0e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs (.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs) (revision 27d9e2e0aefb9b6c8f3bda50bfa40586efddd230) @@ -70,35 +70,35 @@ Assert.AreEqual(hydraulicBoundaryLocation.Name, mapFeature.MetaData["Naam"]); Assert.AreEqual(hydraulicBoundaryLocation.Location, mapFeature.MapGeometries.First().PointCollections.First().First()); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation), mapFeature, "h(Iv->IIv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation), mapFeature, "h(IIv->IIIv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h(IIIv->IVv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h(IVv->Vv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h(Vv->VIv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, hydraulicBoundaryLocation), mapFeature, "hs(Iv->IIv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, hydraulicBoundaryLocation), mapFeature, "hs(IIv->IIIv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "hs(IIIv->IVv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "hs(IVv->Vv)"); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "hs(Vv->VIv)"); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs =================================================================== diff -u -rb1b71a40d77daee847b347b731a8442d666b9e0e -r27d9e2e0aefb9b6c8f3bda50bfa40586efddd230 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs) (revision b1b71a40d77daee847b347b731a8442d666b9e0e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs) (revision 27d9e2e0aefb9b6c8f3bda50bfa40586efddd230) @@ -114,34 +114,34 @@ }, feature.MapGeometries.First().PointCollections.First()); Assert.AreEqual(location.Id, feature.MetaData["ID"]); Assert.AreEqual(location.Name, feature.MetaData["Naam"]); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm.ToString(), feature, waterLevelCalculationForMechanismSpecificFactorizedSignalingNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForMechanismSpecificSignalingNorm.ToString(), feature, waterLevelCalculationForMechanismSpecificSignalingNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForMechanismSpecificLowerLimitNorm.ToString(), feature, waterLevelCalculationForMechanismSpecificLowerLimitNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForLowerLimitNorm.ToString(), feature, waterLevelCalculationForLowerLimitNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaterLevelCalculationForFactorizedLowerLimitNorm.ToString(), feature, waterLevelCalculationForFactorizedLowerLimitNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForMechanismSpecificFactorizedSignalingNorm.ToString(), feature, waveHeightCalculationForMechanismSpecificFactorizedSignalingNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForMechanismSpecificSignalingNorm.ToString(), feature, waveHeightCalculationForMechanismSpecificSignalingNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForMechanismSpecificLowerLimitNorm.ToString(), feature, waveHeightCalculationForMechanismSpecificLowerLimitNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForLowerLimitNorm.ToString(), feature, waveHeightCalculationForLowerLimitNormAttributeName); - MapFeaturesMetaDataTestHelper.AssertHydraulicBoundaryLocationOutputMetaData( + MapFeaturesMetaDataTestHelper.AssertMetaData( location.WaveHeightCalculationForFactorizedLowerLimitNorm.ToString(), feature, waveHeightCalculationForFactorizedLowerLimitNormAttributeName); mocks.VerifyAll();