Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r4562 -r4624 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4562) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4624) @@ -39,15 +39,15 @@ [TestCase(InputDamProjectType.Operational, DamProjectType.Operational)] public void CanConvertToDamProjectType(InputDamProjectType inputDamProjectType, DamProjectType damProjectType) { - Assert.AreEqual(damProjectType, ConversionHelper.ConvertToDamProjectType(inputDamProjectType)); + Assert.That(ConversionHelper.ConvertToDamProjectType(inputDamProjectType), Is.EqualTo(damProjectType)); } [Test] [TestCase(DamProjectType.Design, InputDamProjectType.Design)] [TestCase(DamProjectType.Operational, InputDamProjectType.Operational)] public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType) { - Assert.AreEqual(inputDamProjectType, ConversionHelper.ConvertToInputDamProjectType(damProjectType)); + Assert.That(ConversionHelper.ConvertToInputDamProjectType(damProjectType), Is.EqualTo(inputDamProjectType)); } [Test] @@ -58,7 +58,7 @@ [TestCase(PlLineCreationMethod.Sensors, LocationWaternetOptionsPhreaticLineCreationMethod.Sensors)] public void CanConvertToPlLineCreationMethod(PlLineCreationMethod plLineCreationMethod, LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod) { - Assert.AreEqual(inputPhreaticLineCreationMethod, ConversionHelper.ConvertToInputPhreaticLineCreationMethod(plLineCreationMethod)); + Assert.That(ConversionHelper.ConvertToInputPhreaticLineCreationMethod(plLineCreationMethod), Is.EqualTo(inputPhreaticLineCreationMethod)); } [Test] @@ -69,7 +69,7 @@ [TestCase(LocationWaternetOptionsPhreaticLineCreationMethod.Sensors, PlLineCreationMethod.Sensors)] public void CanConvertToInputPlLineCreationMethod(LocationWaternetOptionsPhreaticLineCreationMethod inputPhreaticLineCreationMethod, PlLineCreationMethod plLineCreationMethod) { - Assert.AreEqual(plLineCreationMethod, ConversionHelper.ConvertToPhreaticLineCreationMethod(inputPhreaticLineCreationMethod)); + Assert.That(ConversionHelper.ConvertToPhreaticLineCreationMethod(inputPhreaticLineCreationMethod), Is.EqualTo(plLineCreationMethod)); } [Test] @@ -80,7 +80,7 @@ [TestCase(LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard, IntrusionVerticalWaterPressureType.Standard)] public void CanConvertToIntrusionVerticalWaterPressureType(LocationWaternetOptionsIntrusionVerticalWaterPressure inputIntrusionVerticalWaterPressureType, IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureType) { - Assert.AreEqual(intrusionVerticalWaterPressureType, ConversionHelper.ConvertToIntrusionVerticalWaterPressure(inputIntrusionVerticalWaterPressureType)); + Assert.That(ConversionHelper.ConvertToIntrusionVerticalWaterPressure(inputIntrusionVerticalWaterPressureType), Is.EqualTo(intrusionVerticalWaterPressureType)); } [Test] @@ -91,7 +91,7 @@ [TestCase(IntrusionVerticalWaterPressureType.Standard, LocationWaternetOptionsIntrusionVerticalWaterPressure.Standard)] public void CanConvertToInputIntrusionVerticalWaterPressureType(IntrusionVerticalWaterPressureType intrusionVerticalWaterPressureType, LocationWaternetOptionsIntrusionVerticalWaterPressure inputIntrusionVerticalWaterPressureType) { - Assert.AreEqual(inputIntrusionVerticalWaterPressureType, ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(intrusionVerticalWaterPressureType)); + Assert.That(ConversionHelper.ConvertToInputIntrusionVerticalWaterPressure(intrusionVerticalWaterPressureType), Is.EqualTo(inputIntrusionVerticalWaterPressureType)); } [Test] @@ -106,7 +106,7 @@ [TestCase(8, CalculationResult.UnexpectedError)] public void CanConvertToOutputCalculationResult(int result, CalculationResult calculationResult) { - Assert.AreEqual(result, ConversionHelper.ConvertToOutputCalculationResult(calculationResult)); + Assert.That(ConversionHelper.ConvertToOutputCalculationResult(calculationResult), Is.EqualTo(result)); } [Test] @@ -121,7 +121,7 @@ [TestCase(CalculationResult.UnexpectedError, 8)] public void CanConvertToCalculationResult(CalculationResult result, int calculationResult) { - Assert.AreEqual(result, ConversionHelper.ConvertToCalculationResult(calculationResult)); + Assert.That(ConversionHelper.ConvertToCalculationResult(calculationResult), Is.EqualTo(result)); } [Test] @@ -145,7 +145,7 @@ [TestCase(ConversionHelper.CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside)] public void CanConvertToCharacteristicPointType(int inputPointType, CharacteristicPointType characteristicPointType) { - Assert.AreEqual(characteristicPointType, ConversionHelper.ConvertToDamPointType(inputPointType)); + Assert.That(ConversionHelper.ConvertToDamPointType(inputPointType), Is.EqualTo(characteristicPointType)); } [Test] @@ -169,15 +169,15 @@ [TestCase(CharacteristicPointType.SurfaceLevelInside, ConversionHelper.CpSurfaceLevelInside)] public void CanConvertToInputPointType(CharacteristicPointType characteristicPointType, int inputPointType) { - Assert.AreEqual(inputPointType, ConversionHelper.ConvertToInputPointType(characteristicPointType)); + Assert.That(ConversionHelper.ConvertToInputPointType(characteristicPointType), Is.EqualTo(inputPointType)); } [Test] [TestCase(0, WaterpressureInterpolationModel.Automatic)] [TestCase(1, WaterpressureInterpolationModel.Hydrostatic)] public void CanConvertToWaterpressureInterpolationModel(int inputInterpolationModel, WaterpressureInterpolationModel interpolationModel) { - Assert.AreEqual(interpolationModel, ConversionHelper.ConvertToWaterpressureInterpolationModel(inputInterpolationModel)); + Assert.That(ConversionHelper.ConvertToWaterpressureInterpolationModel(inputInterpolationModel), Is.EqualTo(interpolationModel)); } [Test] @@ -186,7 +186,7 @@ [TestCase(SoilProfileType.ProfileTypeStiFile, 2)] public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { - Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType)); + Assert.That(ConversionHelper.ConvertToInputSoilGeometryType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); } [Test] @@ -195,7 +195,7 @@ [TestCase(2, SoilProfileType.ProfileTypeStiFile)] public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { - Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType)); + Assert.That(ConversionHelper.ConvertToSoilGeometryType(inputSoilGeometryType), Is.EqualTo(soilProfileType)); } [Test] @@ -204,7 +204,7 @@ [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputFailureMechanismPiping)] public void CanConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { - Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToInputFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] @@ -213,7 +213,7 @@ [TestCase(ConversionHelper.InputFailureMechanismPiping, FailureMechanismSystemType.Piping)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { - Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] @@ -223,7 +223,7 @@ [TestCase(SegmentFailureMechanismType.Liquefaction, ConversionHelper.InputSegmentFailureMechanismLiquefaction)] public void CanConvertToInputFailureMechanismSystemType(SegmentFailureMechanismType failureMechanismSystemType, int inputFailureMechanismSystemType) { - Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismSystemType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] @@ -233,7 +233,7 @@ [TestCase(ConversionHelper.InputSegmentFailureMechanismLiquefaction, SegmentFailureMechanismType.Liquefaction)] public void CanConvertToFailureMechanismSystemType(int inputFailureMechanismSystemType, SegmentFailureMechanismType failureMechanismSystemType) { - Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismSystemType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] @@ -243,7 +243,7 @@ [TestCase(MStabModelType.UpliftVan, InputStabilityModelType.UpliftVan)] public void CanConvertToInputStabilityModelType(MStabModelType mStabModelType, InputStabilityModelType inputStabilityModelType) { - Assert.AreEqual(inputStabilityModelType, ConversionHelper.ConvertToInputStabilityModelType(mStabModelType)); + Assert.That(ConversionHelper.ConvertToInputStabilityModelType(mStabModelType), Is.EqualTo(inputStabilityModelType)); } [Test] @@ -253,31 +253,31 @@ [TestCase(InputStabilityModelType.UpliftVan, MStabModelType.UpliftVan)] public void CanConvertToMStabModelType(InputStabilityModelType inputStabilityModelType, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(inputStabilityModelType), Is.EqualTo(mStabModelType)); } [Test] [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)] [TestCase(AnalysisType.NoAdaption, InputAnalysisType.NoAdaption)] public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType) { - Assert.AreEqual(inputAnalysisType, ConversionHelper.ConvertToInputAnalysisType(analysisType)); + Assert.That(ConversionHelper.ConvertToInputAnalysisType(analysisType), Is.EqualTo(inputAnalysisType)); } [Test] [TestCase(InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry)] [TestCase(InputAnalysisType.NoAdaption, AnalysisType.NoAdaption)] public void CanConvertToAnalysisType(InputAnalysisType inputAnalysisType, AnalysisType analysisType) { - Assert.AreEqual(analysisType, ConversionHelper.ConvertToAnalysisType(inputAnalysisType)); + Assert.That(ConversionHelper.ConvertToAnalysisType(inputAnalysisType), Is.EqualTo(analysisType)); } [Test] [TestCase(MStabZonesType.NoZones, ConversionHelper.InputZoneTypeNoZones)] [TestCase(MStabZonesType.ForbiddenZone, ConversionHelper.InputZoneTypesForbiddenZones)] public void CanConvertToInputZoneType(MStabZonesType zoneType, int inputZoneType) { - Assert.AreEqual(inputZoneType, ConversionHelper.ConvertToInputZoneType(zoneType)); + Assert.That(ConversionHelper.ConvertToInputZoneType(zoneType), Is.EqualTo(inputZoneType)); } [Test] @@ -286,7 +286,7 @@ [TestCase(ConversionHelper.InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone)] public void CanConvertToZoneType(int inputZoneType, MStabZonesType zoneType) { - Assert.AreEqual(zoneType, ConversionHelper.ConvertToZoneType(inputZoneType)); + Assert.That(ConversionHelper.ConvertToZoneType(inputZoneType), Is.EqualTo(zoneType)); } [Test] @@ -295,7 +295,7 @@ [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) { - Assert.AreEqual(inputSearchMethod, ConversionHelper.ConvertToInputSearchMethod(searchMethod)); + Assert.That(ConversionHelper.ConvertToInputSearchMethod(searchMethod), Is.EqualTo(inputSearchMethod)); } [Test] @@ -304,7 +304,7 @@ [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) { - Assert.AreEqual(searchMethod, ConversionHelper.ConvertToSearchMethod(inputSearchMethod)); + Assert.That(ConversionHelper.ConvertToSearchMethod(inputSearchMethod), Is.EqualTo(searchMethod)); } [Test] @@ -316,7 +316,7 @@ [TestCase(LogMessageType.Warning, MessageMessageType.Warning)] public void CanConvertToInputMessageType(LogMessageType logMessageType, MessageMessageType messageType) { - Assert.AreEqual(messageType, ConversionHelper.ConvertToInputMessageType(logMessageType)); + Assert.That(ConversionHelper.ConvertToInputMessageType(logMessageType), Is.EqualTo(messageType)); } [Test] @@ -325,7 +325,7 @@ [TestCase(MessageMessageType.Warning, LogMessageType.Warning)] public void CanConvertToMessageType(MessageMessageType messageType, LogMessageType logMessageType) { - Assert.AreEqual(logMessageType, ConversionHelper.ConvertToLogMessageType(messageType)); + Assert.That(ConversionHelper.ConvertToLogMessageType(messageType), Is.EqualTo(logMessageType)); } [Test] @@ -334,23 +334,23 @@ [TestCase(ShearStrengthModel.SigmaTauCurve, SoilShearStrengthModel.SigmaTauCurve)] public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel) { - Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel)); + Assert.That(ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel), Is.EqualTo(soilShearStrengthModel)); } [Test] [TestCase(GridSizeDetermination.Automatic, ConversionHelper.InputGridTypeAutomatic)] [TestCase(GridSizeDetermination.Specified, ConversionHelper.InputGridTypeSpecified)] public void CanConvertToInputGridSizeDetermination(GridSizeDetermination gridDetermination, int inputGridDetermination) { - Assert.AreEqual(inputGridDetermination, ConversionHelper.ConvertToInputGridDetermination(gridDetermination)); + Assert.That(ConversionHelper.ConvertToInputGridDetermination(gridDetermination), Is.EqualTo(inputGridDetermination)); } [Test] [TestCase(ConversionHelper.InputGridTypeAutomatic, GridSizeDetermination.Automatic)] [TestCase(ConversionHelper.InputGridTypeSpecified, GridSizeDetermination.Specified)] public void CanConvertToGridSizeDetermination(int inputGridDetermination, GridSizeDetermination gridDetermination) { - Assert.AreEqual(gridDetermination, ConversionHelper.ConvertToGridDetermination(inputGridDetermination)); + Assert.That(ConversionHelper.ConvertToGridDetermination(inputGridDetermination), Is.EqualTo(gridDetermination)); } [Test] @@ -359,23 +359,23 @@ [TestCase(SoilShearStrengthModel.SigmaTauCurve, ShearStrengthModel.SigmaTauCurve)] public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel) { - Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel)); + Assert.That(ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel), Is.EqualTo(shearStrengthModel)); } [Test] [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesSpecified)] [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesOnBoundaryLines)] public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) { - Assert.AreEqual(inputTangentLineType, ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType)); + Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); } [Test] [TestCase(ConversionHelper.InputGridTypeSpecified, TangentLinesDefinition.OnBoundaryLines)] [TestCase(ConversionHelper.InputGridTypeAutomatic, TangentLinesDefinition.Specified)] public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) { - Assert.AreEqual(tangentLineType, ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType)); + Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); } [Test] @@ -384,7 +384,7 @@ [TestCase(DilatancyType.MinusPhi, SoilDilatancyType.MinusPhi)] public void CanConvertToSoilDilatancyType(DilatancyType dilatancyType, SoilDilatancyType soilDilatancyType) { - Assert.AreEqual(soilDilatancyType, ConversionHelper.ConvertToSoilDilatancyType(dilatancyType)); + Assert.That(ConversionHelper.ConvertToSoilDilatancyType(dilatancyType), Is.EqualTo(soilDilatancyType)); } [Test] @@ -393,23 +393,23 @@ [TestCase(SoilDilatancyType.MinusPhi, DilatancyType.MinusPhi)] public void CanConvertToDilatancyType(SoilDilatancyType soilDilatancyType, DilatancyType dilatancyType) { - Assert.AreEqual(dilatancyType, ConversionHelper.ConvertToDilatancyType(soilDilatancyType)); + Assert.That(ConversionHelper.ConvertToDilatancyType(soilDilatancyType), Is.EqualTo(dilatancyType)); } [Test] [TestCase(LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)] [TestCase(LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)] public void CanConvertToInputStabilityDesignMethod(LocationDesignOptionsStabilityDesignMethod inputStabilityDesignMethod, StabilityDesignMethod stabilityDesignMethod) { - Assert.AreEqual(stabilityDesignMethod, ConversionHelper.ConvertToDamStabilityDesignMethod(inputStabilityDesignMethod)); + Assert.That(ConversionHelper.ConvertToDamStabilityDesignMethod(inputStabilityDesignMethod), Is.EqualTo(stabilityDesignMethod)); } [Test] [TestCase(StabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.SlopeAdaptionBeforeShoulderAdaption)] [TestCase(StabilityDesignMethod.OptimizedSlopeAndShoulderAdaption, LocationDesignOptionsStabilityDesignMethod.OptimizedSlopeAndShoulderAdaption)] public void CanConvertToDamStabilityDesignMethod(StabilityDesignMethod stabilityDesignMethod, LocationDesignOptionsStabilityDesignMethod inputStabilityDesignMethod) { - Assert.AreEqual(inputStabilityDesignMethod, ConversionHelper.ConvertToInputStabilityDesignMethod(stabilityDesignMethod)); + Assert.That(ConversionHelper.ConvertToInputStabilityDesignMethod(stabilityDesignMethod), Is.EqualTo(inputStabilityDesignMethod)); } [Test] @@ -426,7 +426,7 @@ [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { - Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); + Assert.That(ConversionHelper.ConvertToOutputMStabModelType(mStabModelType), Is.EqualTo(outputMStabModelType)); } [Test] @@ -442,23 +442,23 @@ [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); + Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); } [Test] [TestCase(PipingModelType.Bligh, InputPipingModelType.Bligh)] [TestCase(PipingModelType.Wti2017, InputPipingModelType.WtiSellmeijerRevised)] public void CanConvertToInputPipingModelType(PipingModelType pipingModelType, InputPipingModelType inputPipingModelType) { - Assert.AreEqual(inputPipingModelType, ConversionHelper.ConvertToInputPipingModelType(pipingModelType)); + Assert.That(ConversionHelper.ConvertToInputPipingModelType(pipingModelType), Is.EqualTo(inputPipingModelType)); } [Test] [TestCase(InputPipingModelType.Bligh, PipingModelType.Bligh)] [TestCase(InputPipingModelType.WtiSellmeijerRevised, PipingModelType.Wti2017)] public void CanConvertToPipingModelType(InputPipingModelType inputPipingModelType, PipingModelType pipingModelType) { - Assert.AreEqual(pipingModelType, ConversionHelper.ConvertToPipingModelType(inputPipingModelType)); + Assert.That(ConversionHelper.ConvertToPipingModelType(inputPipingModelType), Is.EqualTo(pipingModelType)); } [Test] @@ -469,7 +469,7 @@ public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, MStabModelType stabilityModelType) { - Assert.AreEqual(outputStabilityModelType, ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType)); + Assert.That(ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType), Is.EqualTo(outputStabilityModelType)); } [Test] @@ -480,7 +480,7 @@ public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { - Assert.AreEqual(stabilityModelType, ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType)); } [Test] @@ -494,7 +494,7 @@ [TestCase(ConversionHelper.TimeStepUnitNonequidistant, TimeStepUnit.Nonequidistant)] public void CanConvertToTimeStepUnit(uint inputTimeStepUnit, TimeStepUnit timeStepUnit) { - Assert.AreEqual(timeStepUnit, ConversionHelper.ConvertToTimeStepUnit(inputTimeStepUnit)); + Assert.That(ConversionHelper.ConvertToTimeStepUnit(inputTimeStepUnit), Is.EqualTo(timeStepUnit)); } [Test] @@ -508,7 +508,7 @@ [TestCase(TimeStepUnit.Nonequidistant, ConversionHelper.TimeStepUnitNonequidistant)] public void CanConvertToInputTimeStepUnit(TimeStepUnit timeStepUnit, uint inputTimeStepUnit) { - Assert.AreEqual(inputTimeStepUnit, ConversionHelper.ConvertToInputTimeStepUnit(timeStepUnit)); + Assert.That(ConversionHelper.ConvertToInputTimeStepUnit(timeStepUnit), Is.EqualTo(inputTimeStepUnit)); } [TestCase(ConversionHelper.PlLineTypePl1, PlLineType.Pl1)] @@ -517,7 +517,7 @@ [TestCase(ConversionHelper.PlLineTypePl4, PlLineType.Pl4)] public void CanConvertToPlLineType(uint inputPlLineType, PlLineType plLineType) { - Assert.AreEqual(plLineType, ConversionHelper.ConvertToPlLineType(inputPlLineType)); + Assert.That(ConversionHelper.ConvertToPlLineType(inputPlLineType), Is.EqualTo(plLineType)); } [TestCase(PlLineType.Pl1, ConversionHelper.PlLineTypePl1)] @@ -526,39 +526,39 @@ [TestCase(PlLineType.Pl4, ConversionHelper.PlLineTypePl4)] public void CanConvertToInputPlLineType(PlLineType plLineType, uint inputPlLineType) { - Assert.AreEqual(inputPlLineType, ConversionHelper.ConvertToInputPlLineType(plLineType)); + Assert.That(ConversionHelper.ConvertToInputPlLineType(plLineType), Is.EqualTo(inputPlLineType)); } [TestCase(ConversionHelper.SensorTypePiezometricHead, SensorType.PiezometricHead)] [TestCase(ConversionHelper.SensorTypeWaterLevel, SensorType.WaterLevel)] [TestCase(ConversionHelper.SensorTypePolderLevel, SensorType.PolderLevel)] public void CanConvertToSensorType(uint inputSensorType, SensorType sensorType) { - Assert.AreEqual(sensorType, ConversionHelper.ConvertToSensorType(inputSensorType)); + Assert.That(ConversionHelper.ConvertToSensorType(inputSensorType), Is.EqualTo(sensorType)); } [TestCase(SensorType.PiezometricHead, ConversionHelper.SensorTypePiezometricHead)] [TestCase(SensorType.WaterLevel, ConversionHelper.SensorTypeWaterLevel)] [TestCase(SensorType.PolderLevel, ConversionHelper.SensorTypePolderLevel)] public void CanConvertToInputSensorType(SensorType sensorType, uint inputSensorType) { - Assert.AreEqual(inputSensorType, ConversionHelper.ConvertToInputSensorType(sensorType)); + Assert.That(ConversionHelper.ConvertToInputSensorType(sensorType), Is.EqualTo(inputSensorType)); } [TestCase(ConversionHelper.DataSourceTypeSensorsIgnore, DataSourceTypeSensors.Ignore)] [TestCase(ConversionHelper.DataSourceTypeSensorsLocationData, DataSourceTypeSensors.LocationData)] [TestCase(ConversionHelper.DataSourceTypeSensorsSensor, DataSourceTypeSensors.Sensor)] public void CanConvertToSensorType(uint inputdataSourceTypeSensors, DataSourceTypeSensors dataSourceTypeSensors) { - Assert.AreEqual(dataSourceTypeSensors, ConversionHelper.ConvertToDataSourceTypeSensors(inputdataSourceTypeSensors)); + Assert.That(ConversionHelper.ConvertToDataSourceTypeSensors(inputdataSourceTypeSensors), Is.EqualTo(dataSourceTypeSensors)); } [TestCase(DataSourceTypeSensors.Ignore, ConversionHelper.DataSourceTypeSensorsIgnore)] [TestCase(DataSourceTypeSensors.LocationData, ConversionHelper.DataSourceTypeSensorsLocationData)] [TestCase(DataSourceTypeSensors.Sensor, ConversionHelper.DataSourceTypeSensorsSensor)] public void CanConvertToInputSensorType(DataSourceTypeSensors dataSourceTypeSensors, uint inputdataSourceTypeSensors) { - Assert.AreEqual(inputdataSourceTypeSensors, ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors)); + Assert.That(ConversionHelper.ConvertToInputDataSourceTypeSensors(dataSourceTypeSensors), Is.EqualTo(inputdataSourceTypeSensors)); } [TestCase(LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay, DikeSoilScenario.ClayDikeOnClay)] @@ -567,7 +567,7 @@ [TestCase(LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] public void CanConvertToDikeSoilScenarioType(LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario, DikeSoilScenario dikeSoilScenario) { - Assert.AreEqual(dikeSoilScenario, ConversionHelper.ConvertToDikeSoilScenario(locationWaternetOptionsDikeSoilScenario)); + Assert.That(ConversionHelper.ConvertToDikeSoilScenario(locationWaternetOptionsDikeSoilScenario), Is.EqualTo(dikeSoilScenario)); } [TestCase(DikeSoilScenario.ClayDikeOnClay, LocationWaternetOptionsDikeSoilScenario.ClayDikeOnClay)] @@ -576,6 +576,6 @@ [TestCase(DikeSoilScenario.SandDikeOnSand, LocationWaternetOptionsDikeSoilScenario.SandDikeOnSand)] public void CanConvertToInputDikeSoilScenarioType(DikeSoilScenario dikeSoilScenario, LocationWaternetOptionsDikeSoilScenario locationWaternetOptionsDikeSoilScenario) { - Assert.AreEqual(locationWaternetOptionsDikeSoilScenario, ConversionHelper.ConvertToInputDikeSoilScenario(dikeSoilScenario)); + Assert.That(ConversionHelper.ConvertToInputDikeSoilScenario(dikeSoilScenario), Is.EqualTo(locationWaternetOptionsDikeSoilScenario)); } } \ No newline at end of file