Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -rfb4203c09eced36c5c1f67b877405f66bbadc428 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision fb4203c09eced36c5c1f67b877405f66bbadc428) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -219,7 +219,7 @@ try { GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult); } catch (IllustrationPointConversionException e) Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs (.../CombinationTypeConverter.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/CombinationTypeConverter.cs (.../CombinationTypeConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -38,7 +38,7 @@ /// The . /// Thrown when /// has an invalid value. - public static CombinationType Create(HydraRingCombinationType hydraRingCombinationType) + public static CombinationType Convert(HydraRingCombinationType hydraRingCombinationType) { switch (hydraRingCombinationType) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs (.../FaultTreeIllustrationPointConverter.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/FaultTreeIllustrationPointConverter.cs (.../FaultTreeIllustrationPointConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -47,7 +47,7 @@ /// is null. /// Thrown when the /// cannot be converted to a . - public static FaultTreeIllustrationPoint Create(HydraRingFaultTreeIllustrationPoint hydraRingFaultTreeIllustrationPoint) + public static FaultTreeIllustrationPoint Convert(HydraRingFaultTreeIllustrationPoint hydraRingFaultTreeIllustrationPoint) { if (hydraRingFaultTreeIllustrationPoint == null) { @@ -57,9 +57,9 @@ FaultTreeIllustrationPoint illustrationPoint; try { - CombinationType combinationType = CombinationTypeConverter.Create(hydraRingFaultTreeIllustrationPoint.CombinationType); + CombinationType combinationType = CombinationTypeConverter.Convert(hydraRingFaultTreeIllustrationPoint.CombinationType); IEnumerable stochasts = hydraRingFaultTreeIllustrationPoint - .Stochasts.Select(StochastConverter.CreateStochast); + .Stochasts.Select(StochastConverter.Convert); illustrationPoint = new FaultTreeIllustrationPoint(hydraRingFaultTreeIllustrationPoint.Name, hydraRingFaultTreeIllustrationPoint.Beta, Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs (.../GeneralResultConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -40,7 +40,7 @@ { private static IEnumerable GetStochasts(HydraRingGeneralResult hydraGeneralResult) { - return hydraGeneralResult.Stochasts.Select(StochastConverter.CreateStochast); + return hydraGeneralResult.Stochasts.Select(StochastConverter.Convert); } #region SubMechanismIllustrationPoint @@ -55,15 +55,15 @@ /// Thrown when is null. /// Thrown when the /// cannot be converted to a with top level sub mechanism illustration points. - public static GeneralResult CreateGeneralResultTopLevelSubMechanismIllustrationPoint( + public static GeneralResult ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint( HydraRingGeneralResult hydraRingGeneralResult) { if (hydraRingGeneralResult == null) { throw new ArgumentNullException(nameof(hydraRingGeneralResult)); } - WindDirection governingWindDirection = WindDirectionConverter.Create(hydraRingGeneralResult.GoverningWindDirection); + WindDirection governingWindDirection = WindDirectionConverter.Convert(hydraRingGeneralResult.GoverningWindDirection); IEnumerable stochasts = GetStochasts(hydraRingGeneralResult); IEnumerable windDirectionClosingScenarioIllustrationPoints = GetTopLevelSubMechanismIllustrationPoints(hydraRingGeneralResult.IllustrationPoints); @@ -98,7 +98,7 @@ var subMechanismIllustrationPoint = hydraIllustrationPointData as HydraRingSubMechanismIllustrationPoint; if (subMechanismIllustrationPoint != null) { - topLevelIlustrationPoints.Add(TopLevelSubMechanismIllustrationPointConverter.Create( + topLevelIlustrationPoints.Add(TopLevelSubMechanismIllustrationPointConverter.Convert( hydraWindDirectionClosingSituation, subMechanismIllustrationPoint)); } else @@ -127,15 +127,15 @@ /// is null. /// Thrown when the /// cannot be converted to a with top level fault tree illustration points. - public static GeneralResult CreateGeneralResultTopLevelFaultTreeIllustrationPoint( + public static GeneralResult ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint( HydraRingGeneralResult hydraRingGeneralResult) { if (hydraRingGeneralResult == null) { throw new ArgumentNullException(nameof(hydraRingGeneralResult)); } - WindDirection governingWindDirection = WindDirectionConverter.Create(hydraRingGeneralResult.GoverningWindDirection); + WindDirection governingWindDirection = WindDirectionConverter.Convert(hydraRingGeneralResult.GoverningWindDirection); IEnumerable stochasts = GetStochasts(hydraRingGeneralResult); IEnumerable topLevelIllustrationPoints = GetTopLevelFaultTreeIllustrationPoints(hydraRingGeneralResult.IllustrationPoints); @@ -171,7 +171,7 @@ var faultTreeIllustrationPoint = hydraIllustrationPointData as HydraRingFaultTreeIllustrationPoint; if (faultTreeIllustrationPoint != null) { - topLevelIllustrationPoints.Add(TopLevelFaultTreeIllustrationPointConverter.Create( + topLevelIllustrationPoints.Add(TopLevelFaultTreeIllustrationPointConverter.Convert( hydraWindDirectionClosingSituation, hydraRingIllustrationPointTreeNode)); } else Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs (.../IllustrationPointNodeConverter.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointNodeConverter.cs (.../IllustrationPointNodeConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -49,14 +49,14 @@ /// does not contain 0 or 2 children. /// Thrown when /// cannot be converted to a - public static IllustrationPointNode Create(HydraRingIllustrationPointTreeNode hydraRingIllustrationPointTreeNode) + public static IllustrationPointNode Convert(HydraRingIllustrationPointTreeNode hydraRingIllustrationPointTreeNode) { if (hydraRingIllustrationPointTreeNode == null) { throw new ArgumentNullException(nameof(hydraRingIllustrationPointTreeNode)); } - IllustrationPointBase data = CreateIllustrationPointTreeNodeData(hydraRingIllustrationPointTreeNode.Data); + IllustrationPointBase data = ConvertIllustrationPointTreeNodeData(hydraRingIllustrationPointTreeNode.Data); if (data == null) { @@ -66,19 +66,19 @@ } var illustrationPointNode = new IllustrationPointNode(data); - illustrationPointNode.SetChildren(hydraRingIllustrationPointTreeNode.Children.Select(Create).ToArray()); + illustrationPointNode.SetChildren(hydraRingIllustrationPointTreeNode.Children.Select(Convert).ToArray()); return illustrationPointNode; } - private static IllustrationPointBase CreateIllustrationPointTreeNodeData(IIllustrationPoint data) + private static IllustrationPointBase ConvertIllustrationPointTreeNodeData(IIllustrationPoint data) { var faultTreeIllustrationPoint = data as HydraRingFaultTreeIllustrationPoint; var subMechanismIllustrationPoint = data as HydraRingSubMechanismIllustrationPoint; return faultTreeIllustrationPoint != null - ? (IllustrationPointBase) FaultTreeIllustrationPointConverter.Create(faultTreeIllustrationPoint) + ? (IllustrationPointBase) FaultTreeIllustrationPointConverter.Convert(faultTreeIllustrationPoint) : (subMechanismIllustrationPoint != null - ? SubMechanismIllustrationPointConverter.Create(subMechanismIllustrationPoint) + ? SubMechanismIllustrationPointConverter.Convert(subMechanismIllustrationPoint) : null); } } Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointResultConverter.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointResultConverter.cs (.../IllustrationPointResultConverter.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointResultConverter.cs (.../IllustrationPointResultConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -40,7 +40,7 @@ /// The newly created . /// Thrown when /// is null. - public static IllustrationPointResult Create(HydraRingIllustrationPointResult hydraRingIllustrationPointResult) + public static IllustrationPointResult Convert(HydraRingIllustrationPointResult hydraRingIllustrationPointResult) { if (hydraRingIllustrationPointResult == null) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs =================================================================== diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs (.../StochastConverter.cs) (revision b7988d7a5616c8c305dac4419a15d5eda07e88bc) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs (.../StochastConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -39,7 +39,7 @@ /// The newly created . /// Thrown when /// is null. - public static Stochast CreateStochast(HydraRingStochast hydraRingStochast) + public static Stochast Convert(HydraRingStochast hydraRingStochast) { if (hydraRingStochast == null) { @@ -60,7 +60,7 @@ /// The newly created . /// Thrown when /// is null. - public static SubMechanismIllustrationPointStochast CreateSubMechanismIllustrationStochast( + public static SubMechanismIllustrationPointStochast Convert( HydraRingSubMechanismIllustrationPointStochast hydraRingSubMechanismIllustrationPointStochast) { if (hydraRingSubMechanismIllustrationPointStochast == null) Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs (.../SubMechanismIllustrationPointConverter.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/SubMechanismIllustrationPointConverter.cs (.../SubMechanismIllustrationPointConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -42,17 +42,17 @@ /// The newly created . /// Thrown when /// is null. - public static SubMechanismIllustrationPoint Create(HydraRingSubMechanismIllustrationPoint hydraRingSubMechanismIllustrationPoint) + public static SubMechanismIllustrationPoint Convert(HydraRingSubMechanismIllustrationPoint hydraRingSubMechanismIllustrationPoint) { if (hydraRingSubMechanismIllustrationPoint == null) { throw new ArgumentNullException(nameof(hydraRingSubMechanismIllustrationPoint)); } IEnumerable stochasts = hydraRingSubMechanismIllustrationPoint - .Stochasts.Select(StochastConverter.CreateSubMechanismIllustrationStochast); + .Stochasts.Select(StochastConverter.Convert); IEnumerable illustrationPointResults = hydraRingSubMechanismIllustrationPoint - .Results.Select(IllustrationPointResultConverter.Create); + .Results.Select(IllustrationPointResultConverter.Convert); return new SubMechanismIllustrationPoint(hydraRingSubMechanismIllustrationPoint.Name, hydraRingSubMechanismIllustrationPoint.Beta, Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverter.cs =================================================================== diff -u -ra1d26cb03e95b46fe8600b53a8e91dfde417ca56 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverter.cs (.../TopLevelFaultTreeIllustrationPointConverter.cs) (revision a1d26cb03e95b46fe8600b53a8e91dfde417ca56) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverter.cs (.../TopLevelFaultTreeIllustrationPointConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -47,8 +47,8 @@ /// is null. /// Thrown when /// has tree node elements which do not contain exactly 0 or 2 children. - public static TopLevelFaultTreeIllustrationPoint Create(HydraRingWindDirectionClosingSituation hydraRingWindDirectionClosingSituation, - HydraRingIllustrationPointTreeNode hydraRingIllustrationPointTreeNode) + public static TopLevelFaultTreeIllustrationPoint Convert(HydraRingWindDirectionClosingSituation hydraRingWindDirectionClosingSituation, + HydraRingIllustrationPointTreeNode hydraRingIllustrationPointTreeNode) { if (hydraRingWindDirectionClosingSituation == null) { @@ -59,11 +59,11 @@ throw new ArgumentNullException(nameof(hydraRingIllustrationPointTreeNode)); } - WindDirection windDirection = WindDirectionConverter.Create(hydraRingWindDirectionClosingSituation.WindDirection); - - return new TopLevelFaultTreeIllustrationPoint(windDirection, - hydraRingWindDirectionClosingSituation.ClosingSituation, - IllustrationPointNodeConverter.Create(hydraRingIllustrationPointTreeNode)); + WindDirection windDirection = WindDirectionConverter.Convert(hydraRingWindDirectionClosingSituation.WindDirection); + + return new TopLevelFaultTreeIllustrationPoint(windDirection, + hydraRingWindDirectionClosingSituation.ClosingSituation, + IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode)); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs (.../TopLevelSubMechanismIllustrationPointConverter.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverter.cs (.../TopLevelSubMechanismIllustrationPointConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -44,8 +44,8 @@ /// to base the on. /// A . /// Thrown when any parameter is null. - public static TopLevelSubMechanismIllustrationPoint Create(HydraRingWindDirectionClosingSituation hydraRingWindDirectionClosingSituation, - HydraRingSubMechanismIllustrationPoint hydraRingSubMechanismIllustrationPoint) + public static TopLevelSubMechanismIllustrationPoint Convert(HydraRingWindDirectionClosingSituation hydraRingWindDirectionClosingSituation, + HydraRingSubMechanismIllustrationPoint hydraRingSubMechanismIllustrationPoint) { if (hydraRingWindDirectionClosingSituation == null) { @@ -56,9 +56,9 @@ throw new ArgumentNullException(nameof(hydraRingSubMechanismIllustrationPoint)); } - WindDirection windDirection = WindDirectionConverter.Create(hydraRingWindDirectionClosingSituation.WindDirection); + WindDirection windDirection = WindDirectionConverter.Convert(hydraRingWindDirectionClosingSituation.WindDirection); SubMechanismIllustrationPoint subMechanismIllustrationPoint = - SubMechanismIllustrationPointConverter.Create(hydraRingSubMechanismIllustrationPoint); + SubMechanismIllustrationPointConverter.Convert(hydraRingSubMechanismIllustrationPoint); return new TopLevelSubMechanismIllustrationPoint(windDirection, hydraRingWindDirectionClosingSituation.ClosingSituation, Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionConverter.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionConverter.cs (.../WindDirectionConverter.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/WindDirectionConverter.cs (.../WindDirectionConverter.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -38,7 +38,7 @@ /// The newly created . /// Thrown when /// is null. - public static WindDirection Create(HydraRingWindDirection hydraRingWindDirection) + public static WindDirection Convert(HydraRingWindDirection hydraRingWindDirection) { if (hydraRingWindDirection == null) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs =================================================================== diff -u -r058c36d676ce75456e648d75e460c24f0bc06ae7 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision 058c36d676ce75456e648d75e460c24f0bc06ae7) +++ Ringtoets/Common/src/Ringtoets.Common.Service/Structures/StructuresCalculationServiceBase.cs (.../StructuresCalculationServiceBase.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -302,7 +302,7 @@ try { GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); structuresOutput.SetIllustrationPoints(generalResult); } catch (IllustrationPointConversionException e) Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -rfb4203c09eced36c5c1f67b877405f66bbadc428 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision fb4203c09eced36c5c1f67b877405f66bbadc428) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -220,7 +220,7 @@ try { GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult); } catch (IllustrationPointConversionException e) Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs =================================================================== diff -u -r27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs (.../CombinationTypeConverterTest.cs) (revision 27b56bdb2dc8ec9e4810889b2b57ff394c34ccfe) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CombinationTypeConverterTest.cs (.../CombinationTypeConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -32,10 +32,10 @@ public class CombinationTypeConverterTest { [Test] - public void Create_InvalidEnumValue_ThrowsInvalidEnumArgumentException() + public void Convert_InvalidEnumValue_ThrowsInvalidEnumArgumentException() { // Call - TestDelegate test = () => CombinationTypeConverter.Create((HydraRingCombinationType) 99); + TestDelegate test = () => CombinationTypeConverter.Convert((HydraRingCombinationType) 99); // Assert const string message = "The value of argument 'hydraRingCombinationType' (99) is invalid for Enum type 'CombinationType'."; @@ -45,11 +45,11 @@ [Test] [TestCase(HydraRingCombinationType.And, CombinationType.And)] [TestCase(HydraRingCombinationType.Or, CombinationType.Or)] - public void Create_HydraRingCombinationType_ReturnCombinationType(HydraRingCombinationType hydraRingCombinationType, + public void Convert_HydraRingCombinationType_ReturnCombinationType(HydraRingCombinationType hydraRingCombinationType, CombinationType expectedCombinationType) { // Call - CombinationType combinationType = CombinationTypeConverter.Create(hydraRingCombinationType); + CombinationType combinationType = CombinationTypeConverter.Convert(hydraRingCombinationType); // Assert Assert.AreEqual(expectedCombinationType, combinationType); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs (.../FaultTreeIllustrationPointConverterTest.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/FaultTreeIllustrationPointConverterTest.cs (.../FaultTreeIllustrationPointConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -37,18 +37,18 @@ public class FaultTreeIllustrationPointConverterTest { [Test] - public void CreateIllustrationPoint_HydraRingFaultTreeIllustrationPointNull_ThrowsArgumentNullException() + public void Convert_HydraRingFaultTreeIllustrationPointNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => FaultTreeIllustrationPointConverter.Create(null); + TestDelegate call = () => FaultTreeIllustrationPointConverter.Convert(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingFaultTreeIllustrationPoint", paramName); } [Test] - public void Create_ValidArguments_ExpectedProperties() + public void Convert_ValidArguments_ExpectedProperties() { // Setup var random = new Random(21); @@ -64,7 +64,7 @@ // Call FaultTreeIllustrationPoint faultTreeIllustrationPoint = - FaultTreeIllustrationPointConverter.Create(hydraRingFaultTreeIllustrationPoint); + FaultTreeIllustrationPointConverter.Convert(hydraRingFaultTreeIllustrationPoint); // Assert Assert.AreEqual(hydraRingFaultTreeIllustrationPoint.Beta, faultTreeIllustrationPoint.Beta, @@ -79,7 +79,7 @@ } [Test] - public void Create_InvalidHydraRingCombinationType_ThrowsIllustrationPointConversionException() + public void Convert_InvalidHydraRingCombinationType_ThrowsIllustrationPointConversionException() { // Setup var hydraRingFaultTreeIllustrationPoint = new HydraRingFaultTreeIllustrationPoint( @@ -89,7 +89,7 @@ (HydraRingCombinationType) 999999); // Call - TestDelegate call = () => FaultTreeIllustrationPointConverter.Create(hydraRingFaultTreeIllustrationPoint); + TestDelegate call = () => FaultTreeIllustrationPointConverter.Convert(hydraRingFaultTreeIllustrationPoint); // Assert var exception = Assert.Throws(call); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs (.../GeneralResultConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -45,18 +45,18 @@ public class GeneralResultConverterTest { [Test] - public void CreateGeneralResultTopLevelSubMechanismIllustrationPoint_HydraRingGeneralResultNull_ThrowsArgumentNullException() + public void ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint_HydraRingGeneralResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(null); + TestDelegate call = () => GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingGeneralResult", paramName); } [Test] - public void CreateGeneralResultTopLevelSubMechanismIllustrationPoint_HydraGeneralResultWithoutIllustrationPoints_ExpectedProperties() + public void ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint_HydraGeneralResultWithoutIllustrationPoints_ExpectedProperties() { // Setup var random = new Random(21); @@ -72,7 +72,7 @@ // Call GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); // Assert AssertWindDirection(hydraGoverningWindDirection, generalResult.GoverningWindDirection); @@ -81,7 +81,7 @@ } [Test] - public void CreateGeneralResultTopLevelSubMechanismIllustrationPoint_HydraGeneralResultWithSubMechanismIllustrationPointsOnly_ExpectedProperties() + public void ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint_HydraGeneralResultWithSubMechanismIllustrationPointsOnly_ExpectedProperties() { // Setup const string closingSituation = "Closing situation"; @@ -112,7 +112,7 @@ // Call GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraGeneralResult); // Assert WindDirection generalResultGoverningWindDirection = generalResult.GoverningWindDirection; @@ -132,7 +132,7 @@ } [Test] - public void CreateGeneralResultTopLevelSubMechanismIllustrationPoint_HydraRingGeneralResultWithFaultTreeIllustrationPointsOnly_ThrowsIllustrationPointConversionException() + public void ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint_HydraRingGeneralResultWithFaultTreeIllustrationPointsOnly_ThrowsIllustrationPointConversionException() { // Setup var random = new Random(21); @@ -163,7 +163,7 @@ }); // Call - TestDelegate call = () => GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); + TestDelegate call = () => GeneralResultConverter.ConvertToGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult); // Assert var exception = Assert.Throws(call); @@ -173,18 +173,18 @@ } [Test] - public void CreateGeneralResultTopLevelFaultTreeIllustrationPoint_HydraRingGeneralResultNull_ThrowsArgumentNullException() + public void ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint_HydraRingGeneralResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(null); + TestDelegate call = () => GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingGeneralResult", paramName); } [Test] - public void CreateGeneralResultTopLevelFaultTreeIllustrationPoint_HydraGeneralResultWithoutIllustrationPoints_ExpectedProperties() + public void ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint_HydraGeneralResultWithoutIllustrationPoints_ExpectedProperties() { // Setup var random = new Random(21); @@ -200,7 +200,7 @@ // Call GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); // Assert AssertWindDirection(hydraGoverningWindDirection, generalResult.GoverningWindDirection); @@ -209,7 +209,7 @@ } [Test] - public void CreateGeneralResultTopLevelFaultTreeIllustrationPoint_HydraGeneralResultWithSubMechanismIllustrationPointsOnly_ThrowsIllustrationPointConversionException() + public void ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint_HydraGeneralResultWithSubMechanismIllustrationPointsOnly_ThrowsIllustrationPointConversionException() { // Setup const string closingSituation = "Closing situation"; @@ -240,7 +240,7 @@ }); // Call - TestDelegate call = () => GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(hydraGeneralResult); + TestDelegate call = () => GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(hydraGeneralResult); // Assert var exception = Assert.Throws(call); @@ -249,7 +249,7 @@ } [Test] - public void CreateGeneralResultTopLevelFaultTreeIllustrationPoint_HydraRingGeneralResultWithFaultTreeIllustrationPointsOnly_ExpectedProperties() + public void ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint_HydraRingGeneralResultWithFaultTreeIllustrationPointsOnly_ExpectedProperties() { // Setup var random = new Random(21); @@ -281,7 +281,7 @@ // Call GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); + GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(hydraRingGeneralResult); // Assert WindDirection generalResultGoverningWindDirection = Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs (.../IllustrationPointNodeConverterTest.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointNodeConverterTest.cs (.../IllustrationPointNodeConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -49,18 +49,18 @@ public class IllustrationPointNodeConverterTest { [Test] - public void Create_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException() + public void Convert_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => IllustrationPointNodeConverter.Create(null); + TestDelegate test = () => IllustrationPointNodeConverter.Convert(null); // Assert var exception = Assert.Throws(test); Assert.AreEqual("hydraRingIllustrationPointTreeNode", exception.ParamName); } [Test] - public void Create_TreeNodeWithoutChildrenAndFaultTreeIllustrationPointData_ReturnIllustrationPointNode() + public void Convert_TreeNodeWithoutChildrenAndFaultTreeIllustrationPointData_ReturnIllustrationPointNode() { // Setup var hydraRingStochast = new HydraRingStochast("stochast", 1, 2); @@ -71,7 +71,7 @@ var hydraRingIllustrationPointTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingFaultTreeIllustrationPoint); // Call - IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Create(hydraRingIllustrationPointTreeNode); + IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode); // Assert CollectionAssert.IsEmpty(illustrationPointNode.Children); @@ -89,7 +89,7 @@ } [Test] - public void Create_TreeNodeWithoutChildrenAndSubMechanismIllustrationPointData_ReturnIllustrationPointNode() + public void Convert_TreeNodeWithoutChildrenAndSubMechanismIllustrationPointData_ReturnIllustrationPointNode() { // Setup var hydraRingStochast = new HydraRingSubMechanismIllustrationPointStochast("stochast", 1, 2, 3); @@ -106,7 +106,7 @@ var hydraRingIllustrationPointTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingSubMechanismIllustrationPoint); // Call - IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Create(hydraRingIllustrationPointTreeNode); + IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode); // Assert CollectionAssert.IsEmpty(illustrationPointNode.Children); @@ -130,7 +130,7 @@ } [Test] - public void Create_TreeNodeWithChildren_ReturnIllustrationPointNode() + public void Convert_TreeNodeWithChildren_ReturnIllustrationPointNode() { // Setup var nestedHydraRingIllustrationPointTreeNodes = new HydraRingIllustrationPointTreeNode(new TestHydraRingFaultTreeIllustrationPoint()); @@ -148,7 +148,7 @@ }); // Call - IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Create(hydraRingIllustrationPointRootTreeNode); + IllustrationPointNode illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointRootTreeNode); // Assert IllustrationPointNode[] children = illustrationPointNode.Children.ToArray(); @@ -160,14 +160,14 @@ } [Test] - public void Create_UnsupportedTreeNodeDataWithoutChildren_ThrowsIllustrationPointConversionException() + public void Convert_UnsupportedTreeNodeDataWithoutChildren_ThrowsIllustrationPointConversionException() { // Setup var hydraRingIllustrationPointData = new TestHydraRingIllustrationPointData(); var hydraRingIllustrationPointTreeNode = new HydraRingIllustrationPointTreeNode(hydraRingIllustrationPointData); // Call - TestDelegate call = () => IllustrationPointNodeConverter.Create(hydraRingIllustrationPointTreeNode); + TestDelegate call = () => IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode); // Assert var exception = Assert.Throws(call); @@ -176,7 +176,7 @@ } [Test] - public void Create_ValidTreeNodeRootWithUnsupportedTreeNodeDataChildren_ThrowsIllustrationPointConversionException() + public void Convert_ValidTreeNodeRootWithUnsupportedTreeNodeDataChildren_ThrowsIllustrationPointConversionException() { // Setup var hydraRingFaultTreeIllustrationPoint = new TestHydraRingFaultTreeIllustrationPoint(); @@ -193,7 +193,7 @@ IllustrationPointNode illustrationPointNode = null; // Call - TestDelegate call = () => illustrationPointNode = IllustrationPointNodeConverter.Create(hydraRingIllustrationPointTreeNode); + TestDelegate call = () => illustrationPointNode = IllustrationPointNodeConverter.Convert(hydraRingIllustrationPointTreeNode); // Assert Assert.IsNull(illustrationPointNode); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointResultConverterTest.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointResultConverterTest.cs (.../IllustrationPointResultConverterTest.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointResultConverterTest.cs (.../IllustrationPointResultConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -32,26 +32,26 @@ public class IllustrationPointResultConverterTest { [Test] - public void Create_HydraRingIllustrationPointResultNull_ThrowsArgumentNullException() + public void Convert_HydraRingIllustrationPointResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => IllustrationPointResultConverter.Create(null); + TestDelegate call = () => IllustrationPointResultConverter.Convert(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingIllustrationPointResult", paramName); } [Test] - public void Create_ValidArguments_ExpectedProperties() + public void Convert_ValidArgument_ExpectedProperties() { // Setup var random = new Random(21); var hydraRingIllustrationPointResult = new HydraRingIllustrationPointResult("Description", random.NextDouble()); // Call - IllustrationPointResult illustrationPointResult = IllustrationPointResultConverter.Create(hydraRingIllustrationPointResult); + IllustrationPointResult illustrationPointResult = IllustrationPointResultConverter.Convert(hydraRingIllustrationPointResult); // Assert Assert.AreEqual(illustrationPointResult.Description, illustrationPointResult.Description); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs =================================================================== diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision b7988d7a5616c8c305dac4419a15d5eda07e88bc) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -33,18 +33,18 @@ public class StochastConverterTest { [Test] - public void CreateStochast_HydraRingStochastNull_ThrowsArgumentNullException() + public void Convert_HydraRingStochastNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => StochastConverter.CreateStochast(null); + TestDelegate call = () => StochastConverter.Convert((HydraRingStochast) null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingStochast", paramName); } [Test] - public void CreateStochast_ValidArguments_ExpectedProperties() + public void Convert_ValidHydraRingStochastArgument_ExpectedProperties() { // Setup const string name = "name"; @@ -55,7 +55,7 @@ var hydraRingStochast = new HydraRingStochast(name, duration, alpha); // Call - Stochast stochast = StochastConverter.CreateStochast(hydraRingStochast); + Stochast stochast = StochastConverter.Convert(hydraRingStochast); // Assert Assert.AreEqual(hydraRingStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); @@ -64,18 +64,18 @@ } [Test] - public void CreateSubMechanismIllustrationStochast_HydraRingSubMechanismIllustrationPointStochastNull_ThrowsArgumentNullException() + public void Convert_HydraRingSubMechanismIllustrationPointStochastNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => StochastConverter.CreateSubMechanismIllustrationStochast(null); + TestDelegate call = () => StochastConverter.Convert(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingSubMechanismIllustrationPointStochast", paramName); } [Test] - public void CreateSubMechanismIllustrationStochast_ValidArguments_ExpectedProperties() + public void Convert_ValidHydraRingSubMechanismIllustrationPointStochast_ExpectedProperties() { // Setup const string name = "name"; @@ -88,7 +88,7 @@ var hydraRingStochast = new HydraRingSubMechanismIllustrationPointStochast(name, duration, alpha, realization); // Call - SubMechanismIllustrationPointStochast stochast = StochastConverter.CreateSubMechanismIllustrationStochast(hydraRingStochast); + SubMechanismIllustrationPointStochast stochast = StochastConverter.Convert(hydraRingStochast); // Assert Assert.AreEqual(hydraRingStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs =================================================================== diff -u -rc883bd5e03754a2a020f36683abb0e4c9d324d2d -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs (.../SubMechanismIllustrationPointConverterTest.cs) (revision c883bd5e03754a2a020f36683abb0e4c9d324d2d) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/SubMechanismIllustrationPointConverterTest.cs (.../SubMechanismIllustrationPointConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -35,18 +35,18 @@ public class SubMechanismIllustrationPointConverterTest { [Test] - public void Create_HydraRingSubMechanismIllustrationPointNull_ThrowsArgumentNullException() + public void Convert_HydraRingSubMechanismIllustrationPointNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => SubMechanismIllustrationPointConverter.Create(null); + TestDelegate call = () => SubMechanismIllustrationPointConverter.Convert(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingSubMechanismIllustrationPoint", paramName); } [Test] - public void Create_ValidArguments_ExpectedProperties() + public void Convert_ValidArguments_ExpectedProperties() { // Setup var random = new Random(21); @@ -71,7 +71,7 @@ // Call SubMechanismIllustrationPoint subMechanismIllustrationPoint = - SubMechanismIllustrationPointConverter.Create(hydraSubMechanismIllustrationPoint); + SubMechanismIllustrationPointConverter.Convert(hydraSubMechanismIllustrationPoint); // Assert Assert.AreEqual(subMechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta, subMechanismIllustrationPoint.Beta.GetAccuracy()); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs =================================================================== diff -u -r0ca56b44f3e067763dbc0b76ea7f8f533fee7900 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs (.../TopLevelFaultTreeIllustrationPointConverterTest.cs) (revision 0ca56b44f3e067763dbc0b76ea7f8f533fee7900) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelFaultTreeIllustrationPointConverterTest.cs (.../TopLevelFaultTreeIllustrationPointConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -42,7 +42,7 @@ public class TopLevelFaultTreeIllustrationPointConverterTest { [Test] - public void Create_HydraRingWindDirectionClosingSituationNull_ThrowsArgumentNullException() + public void Convert_HydraRingWindDirectionClosingSituationNull_ThrowsArgumentNullException() { // Setup var hydraRingFaultTreeIllustrationPoint = new HydraRingFaultTreeIllustrationPoint("fault tree", @@ -53,30 +53,30 @@ var treeNode = new HydraRingIllustrationPointTreeNode(hydraRingFaultTreeIllustrationPoint); // Call - TestDelegate call = () => TopLevelFaultTreeIllustrationPointConverter.Create(null, treeNode); + TestDelegate call = () => TopLevelFaultTreeIllustrationPointConverter.Convert(null, treeNode); // Assert var exception = Assert.Throws(call); Assert.AreEqual("hydraRingWindDirectionClosingSituation", exception.ParamName); } [Test] - public void Create_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException() + public void Convert_HydraRingIllustrationPointTreeNodeNull_ThrowsArgumentNullException() { // Setup var hydraRingWindDirectionClosingSituation = new HydraRingWindDirectionClosingSituation(new HydraRingTestWindDirection(), "random closing situation"); // Call - TestDelegate call = () => TopLevelFaultTreeIllustrationPointConverter.Create(hydraRingWindDirectionClosingSituation, null); + TestDelegate call = () => TopLevelFaultTreeIllustrationPointConverter.Convert(hydraRingWindDirectionClosingSituation, null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("hydraRingIllustrationPointTreeNode", exception.ParamName); } [Test] - public void Create_ValidHydraRingFaultTreeIllustrationPointWithoutChildren_ExpectedProperties() + public void Convert_ValidHydraRingFaultTreeIllustrationPointWithoutChildren_ExpectedProperties() { // Setup var random = new Random(21); @@ -99,7 +99,7 @@ // Call TopLevelFaultTreeIllustrationPoint topLevelIllustrationPoint = - TopLevelFaultTreeIllustrationPointConverter.Create(hydraRingWindDirectionClosingSituation, treeNode); + TopLevelFaultTreeIllustrationPointConverter.Convert(hydraRingWindDirectionClosingSituation, treeNode); // Assert WindDirection windDirection = topLevelIllustrationPoint.WindDirection; @@ -122,7 +122,7 @@ } [Test] - public void Create_ValidHydraRingFaultTreeIllustrationPointWithChildren_ExpectedProperties() + public void Convert_ValidHydraRingFaultTreeIllustrationPointWithChildren_ExpectedProperties() { // Setup var random = new Random(21); @@ -160,7 +160,7 @@ // Call TopLevelFaultTreeIllustrationPoint topLevelIllustrationPoint = - TopLevelFaultTreeIllustrationPointConverter.Create(hydraRingWindDirectionClosingSituation, treeNodeRoot); + TopLevelFaultTreeIllustrationPointConverter.Convert(hydraRingWindDirectionClosingSituation, treeNodeRoot); // Assert WindDirection windDirection = topLevelIllustrationPoint.WindDirection; Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs =================================================================== diff -u -ra1d26cb03e95b46fe8600b53a8e91dfde417ca56 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs (.../TopLevelSubMechanismIllustrationPointConverterTest.cs) (revision a1d26cb03e95b46fe8600b53a8e91dfde417ca56) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointConverterTest.cs (.../TopLevelSubMechanismIllustrationPointConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -38,7 +38,7 @@ public class TopLevelSubMechanismIllustrationPointConverterTest { [Test] - public void Create_HydraWindDirectionNull_ThrowsArgumentNullException() + public void Convert_HydraWindDirectionNull_ThrowsArgumentNullException() { // Setup var hydraRingSubMechanismIllustrationPoint = @@ -49,7 +49,7 @@ // Call TestDelegate call = () => - TopLevelSubMechanismIllustrationPointConverter.Create( + TopLevelSubMechanismIllustrationPointConverter.Convert( null, hydraRingSubMechanismIllustrationPoint); // Assert @@ -58,14 +58,14 @@ } [Test] - public void Create_SubMechanismIllustrationPointNull_ThrowsArgumentNullException() + public void Convert_SubMechanismIllustrationPointNull_ThrowsArgumentNullException() { // Setup var hydraRingWindDirection = new HydraRingTestWindDirection(); // Call TestDelegate call = () => - TopLevelSubMechanismIllustrationPointConverter.Create( + TopLevelSubMechanismIllustrationPointConverter.Convert( new HydraRingWindDirectionClosingSituation(hydraRingWindDirection, string.Empty), null); @@ -75,7 +75,7 @@ } [Test] - public void Create_ValidArguments_ExpectedProperties() + public void Convert_ValidArguments_ExpectedProperties() { // Setup var random = new Random(21); @@ -103,7 +103,7 @@ // Call TopLevelSubMechanismIllustrationPoint combination = - TopLevelSubMechanismIllustrationPointConverter.Create( + TopLevelSubMechanismIllustrationPointConverter.Convert( hydraRingWindDirectionClosingSituation, hydraRingSubMechanismIllustrationPoint); // Assert Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs =================================================================== diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs (.../WindDirectionConverterTest.cs) (revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionConverterTest.cs (.../WindDirectionConverterTest.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -32,25 +32,25 @@ public class WindDirectionConverterTest { [Test] - public void Create_HydraRingWindDirectionNull_ThrowsArgumentNullException() + public void Convert_HydraRingWindDirectionNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => WindDirectionConverter.Create(null); + TestDelegate call = () => WindDirectionConverter.Convert(null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("hydraRingWindDirection", paramName); } [Test] - public void Create_ValidArguments_ExpectedProperties() + public void Convert_ValidArguments_ExpectedProperties() { // Setup var random = new Random(21); var hydraRingWindDirection = new HydraRingWindDirection("name", random.NextDouble()); // Call - WindDirection windDirection = WindDirectionConverter.Create(hydraRingWindDirection); + WindDirection windDirection = WindDirectionConverter.Convert(hydraRingWindDirection); // Assert Assert.AreEqual(hydraRingWindDirection.Angle, windDirection.Angle, windDirection.Angle.GetAccuracy()); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r75c87ba087fcb4bf89090d844455b215b25b4a75 -rc77ccbb8b26516270f36ef53110be573839f3470 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 75c87ba087fcb4bf89090d844455b215b25b4a75) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision c77ccbb8b26516270f36ef53110be573839f3470) @@ -739,7 +739,7 @@ try { GeneralResult generalResult = - GeneralResultConverter.CreateGeneralResultTopLevelFaultTreeIllustrationPoint(result); + GeneralResultConverter.ConvertToGeneralResultTopLevelFaultTreeIllustrationPoint(result); return generalResult; } catch (IllustrationPointConversionException e)