Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CoordinateSystemConverterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CoordinateSystemConverterTest.cs (.../CoordinateSystemConverterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CoordinateSystemConverterTest.cs (.../CoordinateSystemConverterTest.cs) (revision 4625) @@ -69,7 +69,7 @@ { coordinateSystemConverter.DefineGlobalXYZBasedOnLine(surfaceline.Geometry); - Assert.AreEqual(2.0, coordinateSystemConverter.SinAlpha / coordinateSystemConverter.CosAlpha, cTolerance); + Assert.That(coordinateSystemConverter.SinAlpha / coordinateSystemConverter.CosAlpha, Is.EqualTo(2.0).Within(cTolerance)); } } @@ -81,7 +81,7 @@ using (SurfaceLine2 localSurfaceLine = CreateGlobalSurfaceLineWithAlpha0Degrees()) { coordinateSystemConverter.ConvertGlobalXYZToLocalXZ(localSurfaceLine.Geometry); - Assert.AreEqual(surfaceline.Name, localSurfaceLine.Name); + Assert.That(localSurfaceLine.Name, Is.EqualTo(surfaceline.Name)); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/DamProjectVersionXmlHandlerTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/DamProjectVersionXmlHandlerTests.cs (.../DamProjectVersionXmlHandlerTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/DamProjectVersionXmlHandlerTests.cs (.../DamProjectVersionXmlHandlerTests.cs) (revision 4625) @@ -121,7 +121,7 @@ target.SetVersion(version); string resultVersion = target.GetDamProjectVersion(); // assert - Assert.AreEqual(version, resultVersion); + Assert.That(resultVersion, Is.EqualTo(version)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4625) @@ -174,7 +174,7 @@ // Assert that the "NotCalculated" calculations are not selected to verify that these: // - Locations and segments do not end up in the input // - Do not generate an error message in case something goes wrong. - CollectionAssert.AreEquivalent(selectedLocations, projectData.SelectedLocationJobs.Select(job => job.Name)); + Assert.That(projectData.SelectedLocationJobs.Select(job => job.Name), Is.EquivalentTo(selectedLocations)); // When Input input = FillXmlInputFromDamUi.CreateInput(projectData); @@ -184,28 +184,28 @@ // work in this context, as there is NO field within DAMProject to contain the SoilProfile2D // The only way to assert that the selected locations, segments and their profiles are present, // is to verify the XMLInput objects that are generated by the CreateInput() call. - CollectionAssert.AreEquivalent(selectedLocations, input.Locations.Select(loc => loc.Name)); - CollectionAssert.AreEquivalent(new[] + Assert.That(input.Locations.Select(loc => loc.Name), Is.EquivalentTo(selectedLocations)); + Assert.That(input.Segments.Select(segment => segment.Name), Is.EquivalentTo(new[] { selectedSegmentOneName, selectedSegmentTwoName - }, input.Segments.Select(segment => segment.Name)); + })); DamEngine.Io.XmlInput.Segment segmentWith1DProfile = input.Segments.Single(s => string.Equals(s.Name, selectedSegmentOneName)); Assert.IsTrue(segmentWith1DProfile.SoilGeometryProbability.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile1D))); DamEngine.Io.XmlInput.Segment segmentWith2DProfile = input.Segments.Single(s => string.Equals(s.Name, selectedSegmentTwoName)); Assert.IsTrue(segmentWith2DProfile.SoilGeometryProbability.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile2D))); - CollectionAssert.AreEquivalent(new[] + Assert.That(input.SoilProfiles1D.Select(profile => profile.Name), Is.EquivalentTo(new[] { firstSoilProfile1DName, secondSoilProfile1DName - }, input.SoilProfiles1D.Select(profile => profile.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.SoilProfiles2D.Select(profile => profile.Name), Is.EquivalentTo(new[] { profile2DName - }, input.SoilProfiles2D.Select(profile => profile.Name)); + })); } [Test] @@ -271,7 +271,7 @@ // Assert that the "NotCalculated" calculations are not selected to verify that these: // - Locations and segments do not end up in the input // - Do not generate an error message in case something goes wrong. - CollectionAssert.AreEquivalent(selectedLocations, projectData.SelectedLocationJobs.Select(job => job.Name)); + Assert.That(projectData.SelectedLocationJobs.Select(job => job.Name), Is.EquivalentTo(selectedLocations)); // When Input input = FillXmlInputFromDamUi.CreateInput(projectData); @@ -281,22 +281,22 @@ // work in this context, as there is NO field within DAMProject to contain the SoilProfile2D // The only way to assert that the selected locations, segments and their profiles are present, // is to verify the XMLInput objects that are generated by the CreateInput() call. - CollectionAssert.AreEquivalent(selectedLocations, input.Locations.Select(loc => loc.Name)); - CollectionAssert.AreEquivalent(new[] + Assert.That(input.Locations.Select(loc => loc.Name), Is.EquivalentTo(selectedLocations)); + Assert.That(input.Segments.Select(segment => segment.Name), Is.EquivalentTo(new[] { selectedSegmentOneName, selectedSegmentTwoName - }, input.Segments.Select(segment => segment.Name)); + })); IEnumerable segmentWith2DProfile = input.Segments.Where(s => string.Equals(s.Name, selectedSegmentOneName) || string.Equals(s.Name, selectedSegmentTwoName)); IEnumerable probabilities = segmentWith2DProfile.SelectMany(p => p.SoilGeometryProbability); Assert.IsTrue(probabilities.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile2D))); - CollectionAssert.AreEquivalent(new[] + Assert.That(input.SoilProfiles2D.Select(profile => profile.Name), Is.EquivalentTo(new[] { segmentOneSoilProfileName, segmentTwoSoilProfileName - }, input.SoilProfiles2D.Select(profile => profile.Name)); + })); } [Test] @@ -354,25 +354,25 @@ // work in this context, as there is NO field within DAMProject to contain the SoilProfile2D // The only way to assert that the selected locations, segments and their profiles are present, // is to verify the XMLInput objects that are generated by the CreateInput() call. - CollectionAssert.AreEquivalent(new[] + Assert.That(input.Locations.Select(loc => loc.Name), Is.EquivalentTo(new[] { selectedLocationOneName, selectedLocationTwoName - }, input.Locations.Select(loc => loc.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.Segments.Select(segment => segment.Name), Is.EquivalentTo(new[] { selectedSegmentOneName, selectedSegmentTwoName - }, input.Segments.Select(segment => segment.Name)); + })); IEnumerable segmentWith2DProfile = input.Segments.Where(s => string.Equals(s.Name, selectedSegmentOneName) || string.Equals(s.Name, selectedSegmentTwoName)); IEnumerable probabilities = segmentWith2DProfile.SelectMany(p => p.SoilGeometryProbability); Assert.IsTrue(probabilities.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile2D))); - CollectionAssert.AreEquivalent(new[] + Assert.That(input.SoilProfiles2D.Select(profile => profile.Name), Is.EquivalentTo(new[] { soilProfileName - }, input.SoilProfiles2D.Select(profile => profile.Name)); + })); } [Test] @@ -439,7 +439,7 @@ // Assert that only the selected calculations are present to verify that the unselected jobs: // - Locations and segments do not end up in the input // - Do not generate an error message in case something goes wrong. - CollectionAssert.AreEquivalent(selectedLocations, projectData.SelectedLocationJobs.Select(job => job.Name)); + Assert.That(projectData.SelectedLocationJobs.Select(job => job.Name), Is.EquivalentTo(selectedLocations)); // When Input input = FillXmlInputFromDamUi.CreateInput(projectData); @@ -449,18 +449,18 @@ // work in this context, as there is NO field within DAMProject to contain the SoilProfile2D // The only way to assert that the selected locations, segments and their profiles are present, // is to verify the XMLInput objects that are generated by the CreateInput() call. - CollectionAssert.AreEquivalent(new[] + Assert.That(input.Locations.Select(loc => loc.Name), Is.EquivalentTo(new[] { selectedLocationOneName - }, input.Locations.Select(loc => loc.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.Segments.Select(segment => segment.Name), Is.EquivalentTo(new[] { selectedSegmentOneName - }, input.Segments.Select(segment => segment.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.SoilProfiles2D.Select(profile => profile.Name), Is.EquivalentTo(new[] { segmentOneSoilProfileName - }, input.SoilProfiles2D.Select(profile => profile.Name)); + })); DamEngine.Io.XmlInput.Segment segmentWith2DProfile = input.Segments.Single(s => string.Equals(s.Name, selectedSegmentOneName)); Assert.IsTrue(segmentWith2DProfile.SoilGeometryProbability.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile2D))); @@ -542,18 +542,18 @@ // work in this context, as there is NO field within DAMProject to contain the SoilProfile2D // The only way to assert that the selected locations, segments and their profiles are present, // is to verify the XMLInput objects that are generated by the CreateInput() call. - CollectionAssert.AreEquivalent(new[] + Assert.That(input.Locations.Select(loc => loc.Name), Is.EquivalentTo(new[] { selectedLocationOneName - }, input.Locations.Select(loc => loc.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.Segments.Select(segment => segment.Name), Is.EquivalentTo(new[] { selectedSegmentOneName - }, input.Segments.Select(segment => segment.Name)); - CollectionAssert.AreEquivalent(new[] + })); + Assert.That(input.SoilProfiles2D.Select(profile => profile.Name), Is.EquivalentTo(new[] { segmentOneSoilProfileName - }, input.SoilProfiles2D.Select(profile => profile.Name)); + })); DamEngine.Io.XmlInput.Segment segmentWith2DProfile = input.Segments.Single(s => string.Equals(s.Name, selectedSegmentOneName)); Assert.IsTrue(segmentWith2DProfile.SoilGeometryProbability.All(prob => prob.SoilProfileType == ConversionHelper.ConvertToInputSoilProfileType(SoilProfileType.SoilProfile2D))); @@ -723,7 +723,7 @@ } }; ComparisonResult result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Input object:" + result.DifferencesString); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4625) @@ -81,8 +81,8 @@ const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\V 1.3.3.1\HHNK\TPL_Hempolder.damx"; using (DamProjectData projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk)) { - Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.DamProjectType, Is.EqualTo(DamProjectType.AssessOld)); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } } @@ -100,9 +100,9 @@ { // surfaceline2 present with characteristic points ? Assert.NotNull(location.SurfaceLine2); - Assert.AreEqual(location.Name, location.SurfaceLine2.Name); - Assert.AreEqual(true, location.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint); - Assert.AreEqual(true, location.SurfaceLine2.HasDike()); + Assert.That(location.SurfaceLine2.Name, Is.EqualTo(location.Name)); + Assert.That(location.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint, Is.EqualTo(true)); + Assert.That(location.SurfaceLine2.HasDike(), Is.EqualTo(true)); } } } @@ -114,8 +114,8 @@ const string fullProjectFilename = @"..\..\..\..\..\data\Dam\V 1.5.2.1\HHNK\TPL_Hempolder.damx"; using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.DamProjectType, Is.EqualTo(DamProjectType.AssessOld)); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } } @@ -131,7 +131,7 @@ { if (projectData.DamProjectType == DamProjectType.AssessOld) { - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } else { @@ -142,7 +142,7 @@ Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); CompareSegments(expectedLocation, actualLocation); ComparisonResult result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); CheckHempolderSurfaceline(actualLocation); } @@ -162,7 +162,7 @@ { if (projectData.DamProjectType == DamProjectType.AssessOld) { - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } else { @@ -173,7 +173,7 @@ Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); CompareSegments(expectedLocation, actualLocation); ComparisonResult result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); CheckHempolderSurfaceline(actualLocation); } @@ -204,7 +204,7 @@ { if (projectData.DamProjectType == DamProjectType.AssessOld) { - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } else { @@ -214,10 +214,10 @@ Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); CompareSegments(expectedLocation, actualLocation); ComparisonResult result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); result = compare.Compare(expectedLocation.Scenarios[0], actualLocation.Scenarios[0]); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); CheckHempolderSurfaceline(actualLocation); } @@ -247,7 +247,7 @@ { if (projectData.DamProjectType == DamProjectType.AssessOld) { - Assert.AreEqual(0, projectData.Locations.Count); + Assert.That(projectData.Locations.Count, Is.EqualTo(0)); } else { @@ -257,10 +257,10 @@ Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); CompareSegments(expectedLocation, actualLocation); ComparisonResult result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); result = compare.Compare(expectedLocation.Scenarios[0], actualLocation.Scenarios[0]); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); CheckHempolderSurfaceline(actualLocation); } @@ -281,7 +281,7 @@ string fullProjectFilename = Path.Combine(dataFolder, projectFilename); using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - Assert.AreEqual(0, projectData.DesignCalculations.Count); + Assert.That(projectData.DesignCalculations.Count, Is.EqualTo(0)); } } @@ -314,7 +314,7 @@ expectedLocation.SoildatabaseName = @".\TPL_HempolderCurrent0.soilmaterials.mdb"; Location actualLocation = currentProjectData.Locations.Single(s => s.Name == "TPL_Hempolder_0100"); ComparisonResult result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.That(result.Differences.Count, Is.EqualTo(0), result.DifferencesString); } } } @@ -599,12 +599,12 @@ { int expectedLayerCount = expectedSoilProfile1D.Layers.Count; int actualLayerCount = expectedSoilProfile1D.Layers.Count; - Assert.AreEqual(expectedLayerCount, actualLayerCount); + Assert.That(actualLayerCount, Is.EqualTo(expectedLayerCount)); for (var layerIndex = 0; layerIndex < expectedLayerCount; layerIndex++) { - Assert.AreEqual(expectedSoilProfile1D.Layers[layerIndex].Soil.Name, actualSoilProfile1D.Layers[layerIndex].Soil.Name, String.Format("Non-matching name in layer {0}", layerIndex)); - Assert.AreEqual(expectedSoilProfile1D.Layers[layerIndex].IsAquifer, actualSoilProfile1D.Layers[layerIndex].IsAquifer, String.Format("Non-matching isAquifer in layer {0}", layerIndex)); + Assert.That(actualSoilProfile1D.Layers[layerIndex].Soil.Name, Is.EqualTo(expectedSoilProfile1D.Layers[layerIndex].Soil.Name), String.Format("Non-matching name in layer {0}", layerIndex)); + Assert.That(actualSoilProfile1D.Layers[layerIndex].IsAquifer, Is.EqualTo(expectedSoilProfile1D.Layers[layerIndex].IsAquifer), String.Format("Non-matching isAquifer in layer {0}", layerIndex)); } } @@ -613,13 +613,13 @@ const double accuracy = 0.01; // quick check for surfaceline2 conversion Assert.NotNull(actualLocation.SurfaceLine2); - Assert.AreEqual("TPL_Hempolder_0100", actualLocation.SurfaceLine2.Name); - Assert.AreEqual(true, actualLocation.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint); - Assert.AreEqual(true, actualLocation.SurfaceLine2.HasDike()); + Assert.That(actualLocation.SurfaceLine2.Name, Is.EqualTo("TPL_Hempolder_0100")); + Assert.That(actualLocation.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint, Is.EqualTo(true)); + Assert.That(actualLocation.SurfaceLine2.HasDike(), Is.EqualTo(true)); CharacteristicPoint dikeToeAtRiver = actualLocation.SurfaceLine2.CharacteristicPoints.FirstOrDefault(p => p.CharacteristicPointType == CharacteristicPointType.DikeToeAtRiver); Assert.NotNull(dikeToeAtRiver); - Assert.AreEqual(111222.28, dikeToeAtRiver.X, accuracy); - Assert.AreEqual(507206.24, dikeToeAtRiver.Y, accuracy); + Assert.That(dikeToeAtRiver.X, Is.EqualTo(111222.28).Within(accuracy)); + Assert.That(dikeToeAtRiver.Y, Is.EqualTo(507206.24).Within(accuracy)); } /// Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs =================================================================== diff -u -r4618 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4618) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTestsNew.cs (.../CsvImporterTestsNew.cs) (revision 4625) @@ -83,18 +83,18 @@ var csvImporterSegments = new CsvImporterSegments(testFilePath); IList segmentRecords = csvImporterSegments.ImportedItems; - Assert.AreEqual("1", segmentRecords[0].SegmentId); - Assert.AreEqual("1DP1", segmentRecords[0].SoilProfileId); - Assert.AreEqual(80, segmentRecords[0].Probability); - Assert.AreEqual(FailureMechanismSystemType.StabilityInside, segmentRecords[0].SegmentFailureMechanismType); + Assert.That(segmentRecords[0].SegmentId, Is.EqualTo("1")); + Assert.That(segmentRecords[0].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(segmentRecords[0].Probability, Is.EqualTo(80)); + Assert.That(segmentRecords[0].SegmentFailureMechanismType, Is.EqualTo(FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual("1", segmentRecords[1].SegmentId); - Assert.AreEqual("1", segmentRecords[2].SegmentId); - Assert.AreEqual("2", segmentRecords[3].SegmentId); - Assert.AreEqual("2", segmentRecords[4].SegmentId); - Assert.AreEqual("1DP1", segmentRecords[4].SoilProfileId); - Assert.AreEqual(100, segmentRecords[4].Probability); - Assert.AreEqual(FailureMechanismSystemType.Piping, segmentRecords[4].SegmentFailureMechanismType); + Assert.That(segmentRecords[1].SegmentId, Is.EqualTo("1")); + Assert.That(segmentRecords[2].SegmentId, Is.EqualTo("1")); + Assert.That(segmentRecords[3].SegmentId, Is.EqualTo("2")); + Assert.That(segmentRecords[4].SegmentId, Is.EqualTo("2")); + Assert.That(segmentRecords[4].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(segmentRecords[4].Probability, Is.EqualTo(100)); + Assert.That(segmentRecords[4].SegmentFailureMechanismType, Is.EqualTo(FailureMechanismSystemType.Piping)); } [Test] @@ -111,15 +111,15 @@ var csvImporterSegments = new CsvImporterSegments(testFilePath); IList segmentRecords = csvImporterSegments.ImportedItems; - Assert.AreEqual("1", segmentRecords[0].SegmentId); - Assert.AreEqual("GeomA", segmentRecords[0].SoilGeometry2DName); - Assert.AreEqual(80, segmentRecords[0].Probability); - Assert.AreEqual(FailureMechanismSystemType.StabilityInside, segmentRecords[0].SegmentFailureMechanismType); + Assert.That(segmentRecords[0].SegmentId, Is.EqualTo("1")); + Assert.That(segmentRecords[0].SoilGeometry2DName, Is.EqualTo("GeomA")); + Assert.That(segmentRecords[0].Probability, Is.EqualTo(80)); + Assert.That(segmentRecords[0].SegmentFailureMechanismType, Is.EqualTo(FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual("2", segmentRecords[1].SegmentId); - Assert.AreEqual("GeomB", segmentRecords[1].SoilGeometry2DName); - Assert.AreEqual(20, segmentRecords[1].Probability); - Assert.AreEqual(FailureMechanismSystemType.Piping, segmentRecords[1].SegmentFailureMechanismType); + Assert.That(segmentRecords[1].SegmentId, Is.EqualTo("2")); + Assert.That(segmentRecords[1].SoilGeometry2DName, Is.EqualTo("GeomB")); + Assert.That(segmentRecords[1].Probability, Is.EqualTo(20)); + Assert.That(segmentRecords[1].SegmentFailureMechanismType, Is.EqualTo(FailureMechanismSystemType.Piping)); } [Test] @@ -150,17 +150,17 @@ var csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath); IList soilProfileRecords = csvImporterSoilProfiles.ImportedItems; - Assert.AreEqual("1DP1", soilProfileRecords[0].SoilProfileId); - Assert.AreEqual(10, soilProfileRecords[0].TopLevel); - Assert.AreEqual("HW-OBO", soilProfileRecords[0].SoilName); + Assert.That(soilProfileRecords[0].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(soilProfileRecords[0].TopLevel, Is.EqualTo(10)); + Assert.That(soilProfileRecords[0].SoilName, Is.EqualTo("HW-OBO")); - Assert.AreEqual("1DP1", soilProfileRecords[1].SoilProfileId); - Assert.AreEqual(-0.6, soilProfileRecords[1].TopLevel); - Assert.AreEqual("HW-DUN", soilProfileRecords[1].SoilName); + Assert.That(soilProfileRecords[1].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(soilProfileRecords[1].TopLevel, Is.EqualTo(-0.6)); + Assert.That(soilProfileRecords[1].SoilName, Is.EqualTo("HW-DUN")); - Assert.AreEqual("1DP2", soilProfileRecords[11].SoilProfileId); - Assert.AreEqual(-5.3, soilProfileRecords[11].TopLevel); - Assert.AreEqual("Alg-zand (0-30)", soilProfileRecords[11].SoilName); + Assert.That(soilProfileRecords[11].SoilProfileId, Is.EqualTo("1DP2")); + Assert.That(soilProfileRecords[11].TopLevel, Is.EqualTo(-5.3)); + Assert.That(soilProfileRecords[11].SoilName, Is.EqualTo("Alg-zand (0-30)")); } [Test] @@ -177,19 +177,19 @@ var csvImporterSoilProfiles = new CsvImporterSoilProfiles(testFilePath); IList soilProfileRecords = csvImporterSoilProfiles.ImportedItems; - Assert.AreEqual("1DP1", soilProfileRecords[0].SoilProfileId); - Assert.AreEqual(10, soilProfileRecords[0].TopLevel); - Assert.AreEqual("HW-OBO", soilProfileRecords[0].SoilName); + Assert.That(soilProfileRecords[0].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(soilProfileRecords[0].TopLevel, Is.EqualTo(10)); + Assert.That(soilProfileRecords[0].SoilName, Is.EqualTo("HW-OBO")); Assert.That(soilProfileRecords[0].IsAquifer, Is.False); - Assert.AreEqual("1DP1", soilProfileRecords[1].SoilProfileId); - Assert.AreEqual(-0.6, soilProfileRecords[1].TopLevel); - Assert.AreEqual("HW-DUN", soilProfileRecords[1].SoilName); + Assert.That(soilProfileRecords[1].SoilProfileId, Is.EqualTo("1DP1")); + Assert.That(soilProfileRecords[1].TopLevel, Is.EqualTo(-0.6)); + Assert.That(soilProfileRecords[1].SoilName, Is.EqualTo("HW-DUN")); Assert.That(soilProfileRecords[1].IsAquifer, Is.False); - Assert.AreEqual("1DP2", soilProfileRecords[11].SoilProfileId); - Assert.AreEqual(-5.3, soilProfileRecords[11].TopLevel); - Assert.AreEqual("Alg-zand (0-30)", soilProfileRecords[11].SoilName); + Assert.That(soilProfileRecords[11].SoilProfileId, Is.EqualTo("1DP2")); + Assert.That(soilProfileRecords[11].TopLevel, Is.EqualTo(-5.3)); + Assert.That(soilProfileRecords[11].SoilName, Is.EqualTo("Alg-zand (0-30)")); Assert.That(soilProfileRecords[11].IsAquifer, Is.True); } @@ -327,7 +327,7 @@ CreateSurfaceLinesFileWithIllegalValues(testFilePath); var csvImporterSurfaceLines = new CsvImporterSurfaceLines(testFilePath); - Assert.AreEqual(1, csvImporterSurfaceLines.ErrorMessages.Count); + Assert.That(csvImporterSurfaceLines.ErrorMessages.Count, Is.EqualTo(1)); } [Test] @@ -460,27 +460,27 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel); - Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow); - Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); - Assert.AreEqual(31.600, scenarioRecords[0].RequiredSafetyFactorPiping); - Assert.AreEqual(0.0, scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(1.300, scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping); - Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].RiverLevel, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[0].RiverLevelLow, Is.EqualTo(0.680)); + Assert.That(scenarioRecords[0].DikeTableHeight, Is.EqualTo(21.110)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorPiping, Is.EqualTo(31.600)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(1.300)); + Assert.That(scenarioRecords[0].UpliftCriterionPiping, Is.EqualTo(1.3)); + Assert.That(scenarioRecords[0].UpliftCriterionStability, Is.EqualTo(0.0)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel); - Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow); - Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); - Assert.AreEqual(32.600, scenarioRecords[1].RequiredSafetyFactorPiping); - Assert.AreEqual(1.0, scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(1.400, scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping); - Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].RiverLevel, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[1].RiverLevelLow, Is.EqualTo(1.680)); + Assert.That(scenarioRecords[1].DikeTableHeight, Is.EqualTo(22.110)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorPiping, Is.EqualTo(32.600)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(1.0)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(1.400)); + Assert.That(scenarioRecords[1].UpliftCriterionPiping, Is.EqualTo(1.3)); + Assert.That(scenarioRecords[1].UpliftCriterionStability, Is.EqualTo(0.0)); } [Test] @@ -497,47 +497,47 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[0].RiverLevel); - Assert.AreEqual(0.680, scenarioRecords[0].RiverLevelLow); - Assert.AreEqual(21.110, scenarioRecords[0].DikeTableHeight); - Assert.AreEqual(31.600, scenarioRecords[0].RequiredSafetyFactorPiping); - Assert.AreEqual(0.0, scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(1.300, scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(1.3, scenarioRecords[0].UpliftCriterionPiping); - Assert.AreEqual(0.0, scenarioRecords[0].UpliftCriterionStability); - Assert.AreEqual(1.1, scenarioRecords[0].PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(2.2, scenarioRecords[0].PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(3.3, scenarioRecords[0].PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(4.4, scenarioRecords[0].PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(true, scenarioRecords[0].UsePlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(5.5, scenarioRecords[0].PlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(false, scenarioRecords[0].UsePlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(6.6, scenarioRecords[0].PlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(7.7, scenarioRecords[0].HeadPl3); - Assert.AreEqual(8.8, scenarioRecords[0].HeadPl4); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].RiverLevel, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[0].RiverLevelLow, Is.EqualTo(0.680)); + Assert.That(scenarioRecords[0].DikeTableHeight, Is.EqualTo(21.110)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorPiping, Is.EqualTo(31.600)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[0].RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(1.300)); + Assert.That(scenarioRecords[0].UpliftCriterionPiping, Is.EqualTo(1.3)); + Assert.That(scenarioRecords[0].UpliftCriterionStability, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[0].PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(1.1)); + Assert.That(scenarioRecords[0].PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(2.2)); + Assert.That(scenarioRecords[0].PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(3.3)); + Assert.That(scenarioRecords[0].PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(4.4)); + Assert.That(scenarioRecords[0].UsePlLineOffsetBelowDikeCrestMiddle, Is.EqualTo(true)); + Assert.That(scenarioRecords[0].PlLineOffsetBelowDikeCrestMiddle, Is.EqualTo(5.5)); + Assert.That(scenarioRecords[0].UsePlLineOffsetFactorBelowShoulderCrest, Is.EqualTo(false)); + Assert.That(scenarioRecords[0].PlLineOffsetFactorBelowShoulderCrest, Is.EqualTo(6.6)); + Assert.That(scenarioRecords[0].HeadPl3, Is.EqualTo(7.7)); + Assert.That(scenarioRecords[0].HeadPl4, Is.EqualTo(8.8)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.0, scenarioRecords[1].RiverLevel); - Assert.AreEqual(1.680, scenarioRecords[1].RiverLevelLow); - Assert.AreEqual(22.110, scenarioRecords[1].DikeTableHeight); - Assert.AreEqual(32.600, scenarioRecords[1].RequiredSafetyFactorPiping); - Assert.AreEqual(1.0, scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(1.400, scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(1.3, scenarioRecords[1].UpliftCriterionPiping); - Assert.AreEqual(0.0, scenarioRecords[1].UpliftCriterionStability); - Assert.AreEqual(0.1, scenarioRecords[1].PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(0.2, scenarioRecords[1].PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(0.3, scenarioRecords[1].PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(0.4, scenarioRecords[1].PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(false, scenarioRecords[1].UsePlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(0.5, scenarioRecords[1].PlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(true, scenarioRecords[1].UsePlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(0.6, scenarioRecords[1].PlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(0.7, scenarioRecords[1].HeadPl3); - Assert.AreEqual(0.8, scenarioRecords[1].HeadPl4); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].RiverLevel, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[1].RiverLevelLow, Is.EqualTo(1.680)); + Assert.That(scenarioRecords[1].DikeTableHeight, Is.EqualTo(22.110)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorPiping, Is.EqualTo(32.600)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(1.0)); + Assert.That(scenarioRecords[1].RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(1.400)); + Assert.That(scenarioRecords[1].UpliftCriterionPiping, Is.EqualTo(1.3)); + Assert.That(scenarioRecords[1].UpliftCriterionStability, Is.EqualTo(0.0)); + Assert.That(scenarioRecords[1].PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(0.1)); + Assert.That(scenarioRecords[1].PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(0.2)); + Assert.That(scenarioRecords[1].PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(0.3)); + Assert.That(scenarioRecords[1].PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(0.4)); + Assert.That(scenarioRecords[1].UsePlLineOffsetBelowDikeCrestMiddle, Is.EqualTo(false)); + Assert.That(scenarioRecords[1].PlLineOffsetBelowDikeCrestMiddle, Is.EqualTo(0.5)); + Assert.That(scenarioRecords[1].UsePlLineOffsetFactorBelowShoulderCrest, Is.EqualTo(true)); + Assert.That(scenarioRecords[1].PlLineOffsetFactorBelowShoulderCrest, Is.EqualTo(0.6)); + Assert.That(scenarioRecords[1].HeadPl3, Is.EqualTo(0.7)); + Assert.That(scenarioRecords[1].HeadPl4, Is.EqualTo(0.8)); } [Test] @@ -568,7 +568,7 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; Assert.IsEmpty(scenarioRecords); - Assert.AreEqual(2, csvImporterScenarios.ErrorMessages.Count); + Assert.That(csvImporterScenarios.ErrorMessages.Count, Is.EqualTo(2)); } [Test] @@ -585,15 +585,15 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.001, scenarioRecords[0].HeadPl3); - Assert.AreEqual(0.002, scenarioRecords[0].HeadPl4); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].HeadPl3, Is.EqualTo(0.001)); + Assert.That(scenarioRecords[0].HeadPl4, Is.EqualTo(0.002)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.003, scenarioRecords[1].HeadPl3); - Assert.AreEqual(0.004, scenarioRecords[1].HeadPl4); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].HeadPl3, Is.EqualTo(0.003)); + Assert.That(scenarioRecords[1].HeadPl4, Is.EqualTo(0.004)); } [Test] @@ -610,15 +610,15 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.011, scenarioRecords[0].HeadPl3); - Assert.AreEqual(0.012, scenarioRecords[0].HeadPl4); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].HeadPl3, Is.EqualTo(0.011)); + Assert.That(scenarioRecords[0].HeadPl4, Is.EqualTo(0.012)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.013, scenarioRecords[1].HeadPl3); - Assert.AreEqual(0.014, scenarioRecords[1].HeadPl4); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].HeadPl3, Is.EqualTo(0.013)); + Assert.That(scenarioRecords[1].HeadPl4, Is.EqualTo(0.014)); } [Test] @@ -635,13 +635,13 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.001, scenarioRecords[0].PolderLevel); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].PolderLevel, Is.EqualTo(0.001)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.003, scenarioRecords[1].PolderLevel); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].PolderLevel, Is.EqualTo(0.003)); } [Test] @@ -658,13 +658,13 @@ var csvImporterScenarios = new CsvImporterScenarios(testFilePath); IList scenarioRecords = csvImporterScenarios.ImportedItems; - Assert.AreEqual("D1", scenarioRecords[0].LocationId); - Assert.AreEqual("1", scenarioRecords[0].LocationScenarioId); - Assert.AreEqual(0.001, scenarioRecords[0].HeadPl2); + Assert.That(scenarioRecords[0].LocationId, Is.EqualTo("D1")); + Assert.That(scenarioRecords[0].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[0].HeadPl2, Is.EqualTo(0.001)); - Assert.AreEqual("D2", scenarioRecords[1].LocationId); - Assert.AreEqual("1", scenarioRecords[1].LocationScenarioId); - Assert.AreEqual(0.003, scenarioRecords[1].HeadPl2); + Assert.That(scenarioRecords[1].LocationId, Is.EqualTo("D2")); + Assert.That(scenarioRecords[1].LocationScenarioId, Is.EqualTo("1")); + Assert.That(scenarioRecords[1].HeadPl2, Is.EqualTo(0.003)); } [Test] @@ -681,10 +681,10 @@ DateTime end = DateTime.Now; TimeSpan elapsed = end - start; // Note: numbers are the number of records read, not the number of Dam data objects. - Assert.AreEqual(3306, csvImporterSurfaceLines.ImportedItems.Count); - Assert.AreEqual(3305, csvImporterCharacteristicPoints.ImportedItems.Count); - Assert.AreEqual(23554, csvImporterSoilProfiles.ImportedItems.Count); - Assert.AreEqual(7672, csvImporterSegments.ImportedItems.Count); + Assert.That(csvImporterSurfaceLines.ImportedItems.Count, Is.EqualTo(3306)); + Assert.That(csvImporterCharacteristicPoints.ImportedItems.Count, Is.EqualTo(3305)); + Assert.That(csvImporterSoilProfiles.ImportedItems.Count, Is.EqualTo(23554)); + Assert.That(csvImporterSegments.ImportedItems.Count, Is.EqualTo(7672)); TimeSpan maxTime = TimeSpan.FromSeconds(6); // This is the time on the buildserver; local time was 2 seconds; // enlarged from 4 to 6 sec because code coverage was turned on on build server Assert.Less(elapsed, maxTime); @@ -830,7 +830,7 @@ var csvImporterSoils = new CsvImporterSoils(testFilePath); IList scenarioRecords = csvImporterSoils.ImportedItems; Assert.IsEmpty(scenarioRecords); - Assert.AreEqual(3, csvImporterSoils.ErrorMessages.Count); + Assert.That(csvImporterSoils.ErrorMessages.Count, Is.EqualTo(3)); } [Test] @@ -847,27 +847,27 @@ var csvImporterSigmaTauCurves = new CsvImporterSigmaTauCurves(testFilePath); IList sigmaTauCurveRecords = csvImporterSigmaTauCurves.ImportedItems; - Assert.AreEqual("CurveKlei", sigmaTauCurveRecords[0].SigmaTauCurveName); - Assert.AreEqual(0.0, sigmaTauCurveRecords[0].Sigma); - Assert.AreEqual(2.05, sigmaTauCurveRecords[0].Tau); - Assert.AreEqual("CurveKlei", sigmaTauCurveRecords[1].SigmaTauCurveName); - Assert.AreEqual(13.0, sigmaTauCurveRecords[1].Sigma); - Assert.AreEqual(8.05, sigmaTauCurveRecords[1].Tau); - Assert.AreEqual("CurveKlei", sigmaTauCurveRecords[2].SigmaTauCurveName); - Assert.AreEqual(26.0, sigmaTauCurveRecords[2].Sigma); - Assert.AreEqual(13.79, sigmaTauCurveRecords[2].Tau); - Assert.AreEqual("CurveKlei", sigmaTauCurveRecords[3].SigmaTauCurveName); - Assert.AreEqual(65.0, sigmaTauCurveRecords[3].Sigma); - Assert.AreEqual(28.1, sigmaTauCurveRecords[3].Tau); - Assert.AreEqual("CurveKlei", sigmaTauCurveRecords[4].SigmaTauCurveName); - Assert.AreEqual(110.5, sigmaTauCurveRecords[4].Sigma); - Assert.AreEqual(44.6, sigmaTauCurveRecords[4].Tau); - Assert.AreEqual("CurveZand", sigmaTauCurveRecords[5].SigmaTauCurveName); - Assert.AreEqual(0.0, sigmaTauCurveRecords[5].Sigma); - Assert.AreEqual(0.0, sigmaTauCurveRecords[5].Tau); - Assert.AreEqual("CurveZand", sigmaTauCurveRecords[6].SigmaTauCurveName); - Assert.AreEqual(200.0, sigmaTauCurveRecords[6].Sigma); - Assert.AreEqual(129.88, sigmaTauCurveRecords[6].Tau); + Assert.That(sigmaTauCurveRecords[0].SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(sigmaTauCurveRecords[0].Sigma, Is.EqualTo(0.0)); + Assert.That(sigmaTauCurveRecords[0].Tau, Is.EqualTo(2.05)); + Assert.That(sigmaTauCurveRecords[1].SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(sigmaTauCurveRecords[1].Sigma, Is.EqualTo(13.0)); + Assert.That(sigmaTauCurveRecords[1].Tau, Is.EqualTo(8.05)); + Assert.That(sigmaTauCurveRecords[2].SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(sigmaTauCurveRecords[2].Sigma, Is.EqualTo(26.0)); + Assert.That(sigmaTauCurveRecords[2].Tau, Is.EqualTo(13.79)); + Assert.That(sigmaTauCurveRecords[3].SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(sigmaTauCurveRecords[3].Sigma, Is.EqualTo(65.0)); + Assert.That(sigmaTauCurveRecords[3].Tau, Is.EqualTo(28.1)); + Assert.That(sigmaTauCurveRecords[4].SigmaTauCurveName, Is.EqualTo("CurveKlei")); + Assert.That(sigmaTauCurveRecords[4].Sigma, Is.EqualTo(110.5)); + Assert.That(sigmaTauCurveRecords[4].Tau, Is.EqualTo(44.6)); + Assert.That(sigmaTauCurveRecords[5].SigmaTauCurveName, Is.EqualTo("CurveZand")); + Assert.That(sigmaTauCurveRecords[5].Sigma, Is.EqualTo(0.0)); + Assert.That(sigmaTauCurveRecords[5].Tau, Is.EqualTo(0.0)); + Assert.That(sigmaTauCurveRecords[6].SigmaTauCurveName, Is.EqualTo("CurveZand")); + Assert.That(sigmaTauCurveRecords[6].Sigma, Is.EqualTo(200.0)); + Assert.That(sigmaTauCurveRecords[6].Tau, Is.EqualTo(129.88)); } [Test] @@ -1184,103 +1184,103 @@ private static void CheckCharacteristicPoints(IList characteristicPointsRecords) { - Assert.AreEqual("D1", characteristicPointsRecords[0].SurfaceLineId); - Assert.AreEqual(1, characteristicPointsRecords[0].Volgnummer); + Assert.That(characteristicPointsRecords[0].SurfaceLineId, Is.EqualTo("D1")); + Assert.That(characteristicPointsRecords[0].Volgnummer, Is.EqualTo(1)); - Assert.AreEqual(117.94, characteristicPointsRecords[0].Points[0].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[0].Y); - Assert.AreEqual(0.12, characteristicPointsRecords[0].Points[0].Z); + Assert.That(characteristicPointsRecords[0].Points[0].X, Is.EqualTo(117.94)); + Assert.That(characteristicPointsRecords[0].Points[0].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[0].Z, Is.EqualTo(0.12)); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].X); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].Y); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].Z); + Assert.That(characteristicPointsRecords[0].Points[1].X, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[1].Y, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[1].Z, Is.EqualTo(-1)); - Assert.AreEqual(73.99, characteristicPointsRecords[0].Points[2].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[2].Y); - Assert.AreEqual(-1.0, characteristicPointsRecords[0].Points[2].Z); + Assert.That(characteristicPointsRecords[0].Points[2].X, Is.EqualTo(73.99)); + Assert.That(characteristicPointsRecords[0].Points[2].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[2].Z, Is.EqualTo(-1.0)); - Assert.AreEqual(72.55, characteristicPointsRecords[0].Points[3].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[3].Y); - Assert.AreEqual(-1.46, characteristicPointsRecords[0].Points[3].Z); + Assert.That(characteristicPointsRecords[0].Points[3].X, Is.EqualTo(72.55)); + Assert.That(characteristicPointsRecords[0].Points[3].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[3].Z, Is.EqualTo(-1.46)); - Assert.AreEqual(67.9, characteristicPointsRecords[0].Points[4].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[4].Y); - Assert.AreEqual(1.07, characteristicPointsRecords[0].Points[4].Z); + Assert.That(characteristicPointsRecords[0].Points[4].X, Is.EqualTo(67.9)); + Assert.That(characteristicPointsRecords[0].Points[4].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[4].Z, Is.EqualTo(1.07)); - Assert.AreEqual(63.31, characteristicPointsRecords[0].Points[5].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[5].Y); - Assert.AreEqual(1.36, characteristicPointsRecords[0].Points[5].Z); + Assert.That(characteristicPointsRecords[0].Points[5].X, Is.EqualTo(63.31)); + Assert.That(characteristicPointsRecords[0].Points[5].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[5].Z, Is.EqualTo(1.36)); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].X); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].Y); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].Z); + Assert.That(characteristicPointsRecords[0].Points[6].X, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[6].Y, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[6].Z, Is.EqualTo(-1)); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].X); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].Y); - Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].Z); + Assert.That(characteristicPointsRecords[0].Points[7].X, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[7].Y, Is.EqualTo(-1)); + Assert.That(characteristicPointsRecords[0].Points[7].Z, Is.EqualTo(-1)); - Assert.AreEqual(55.17, characteristicPointsRecords[0].Points[8].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[8].Y); - Assert.AreEqual(4.46, characteristicPointsRecords[0].Points[8].Z); + Assert.That(characteristicPointsRecords[0].Points[8].X, Is.EqualTo(55.17)); + Assert.That(characteristicPointsRecords[0].Points[8].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[8].Z, Is.EqualTo(4.46)); - Assert.AreEqual(54.25, characteristicPointsRecords[0].Points[9].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[9].Y); - Assert.AreEqual(4.69, characteristicPointsRecords[0].Points[9].Z); + Assert.That(characteristicPointsRecords[0].Points[9].X, Is.EqualTo(54.25)); + Assert.That(characteristicPointsRecords[0].Points[9].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[9].Z, Is.EqualTo(4.69)); - Assert.AreEqual(51.75, characteristicPointsRecords[0].Points[10].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[10].Y); - Assert.AreEqual(4.662, characteristicPointsRecords[0].Points[10].Z); + Assert.That(characteristicPointsRecords[0].Points[10].X, Is.EqualTo(51.75)); + Assert.That(characteristicPointsRecords[0].Points[10].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[10].Z, Is.EqualTo(4.662)); - Assert.AreEqual(50.11, characteristicPointsRecords[0].Points[11].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[11].Y); - Assert.AreEqual(4.46, characteristicPointsRecords[0].Points[11].Z); + Assert.That(characteristicPointsRecords[0].Points[11].X, Is.EqualTo(50.11)); + Assert.That(characteristicPointsRecords[0].Points[11].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[11].Z, Is.EqualTo(4.46)); - Assert.AreEqual(40.48, characteristicPointsRecords[0].Points[12].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[12].Y); - Assert.AreEqual(1.94, characteristicPointsRecords[0].Points[12].Z); + Assert.That(characteristicPointsRecords[0].Points[12].X, Is.EqualTo(40.48)); + Assert.That(characteristicPointsRecords[0].Points[12].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[12].Z, Is.EqualTo(1.94)); - Assert.AreEqual(32.21, characteristicPointsRecords[0].Points[13].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[13].Y); - Assert.AreEqual(1.67, characteristicPointsRecords[0].Points[13].Z); + Assert.That(characteristicPointsRecords[0].Points[13].X, Is.EqualTo(32.21)); + Assert.That(characteristicPointsRecords[0].Points[13].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[13].Z, Is.EqualTo(1.67)); - Assert.AreEqual(31.6, characteristicPointsRecords[0].Points[14].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[14].Y); - Assert.AreEqual(1.3, characteristicPointsRecords[0].Points[14].Z); + Assert.That(characteristicPointsRecords[0].Points[14].X, Is.EqualTo(31.6)); + Assert.That(characteristicPointsRecords[0].Points[14].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[14].Z, Is.EqualTo(1.3)); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[15].X); - Assert.AreEqual(0, characteristicPointsRecords[0].Points[15].Y); - Assert.AreEqual(0.68, characteristicPointsRecords[0].Points[15].Z); + Assert.That(characteristicPointsRecords[0].Points[15].X, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[15].Y, Is.EqualTo(0)); + Assert.That(characteristicPointsRecords[0].Points[15].Z, Is.EqualTo(0.68)); } private static void CheckSurfaceLine(IList surfaceLineRecords) { - Assert.AreEqual("D1", surfaceLineRecords[0].SurfaceLineId); - Assert.AreEqual(0.0, surfaceLineRecords[0].Xcoors[0]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[0]); - Assert.AreEqual(0.680, surfaceLineRecords[0].Zcoors[0]); + Assert.That(surfaceLineRecords[0].SurfaceLineId, Is.EqualTo("D1")); + Assert.That(surfaceLineRecords[0].Xcoors[0], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Ycoors[0], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[0], Is.EqualTo(0.680)); - Assert.AreEqual(21.110, surfaceLineRecords[0].Xcoors[1]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[1]); - Assert.AreEqual(1.120, surfaceLineRecords[0].Zcoors[1]); + Assert.That(surfaceLineRecords[0].Xcoors[1], Is.EqualTo(21.110)); + Assert.That(surfaceLineRecords[0].Ycoors[1], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[1], Is.EqualTo(1.120)); - Assert.AreEqual(31.600, surfaceLineRecords[0].Xcoors[2]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[2]); - Assert.AreEqual(1.300, surfaceLineRecords[0].Zcoors[2]); + Assert.That(surfaceLineRecords[0].Xcoors[2], Is.EqualTo(31.600)); + Assert.That(surfaceLineRecords[0].Ycoors[2], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[2], Is.EqualTo(1.300)); - Assert.AreEqual(52.630, surfaceLineRecords[0].Xcoors[10]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[10]); - Assert.AreEqual(4.770, surfaceLineRecords[0].Zcoors[10]); + Assert.That(surfaceLineRecords[0].Xcoors[10], Is.EqualTo(52.630)); + Assert.That(surfaceLineRecords[0].Ycoors[10], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[10], Is.EqualTo(4.770)); - Assert.AreEqual(72.370, surfaceLineRecords[0].Xcoors[22]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[22]); - Assert.AreEqual(-1.060, surfaceLineRecords[0].Zcoors[22]); + Assert.That(surfaceLineRecords[0].Xcoors[22], Is.EqualTo(72.370)); + Assert.That(surfaceLineRecords[0].Ycoors[22], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[22], Is.EqualTo(-1.060)); - Assert.AreEqual(86.660, surfaceLineRecords[0].Xcoors[30]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[30]); - Assert.AreEqual(0.270, surfaceLineRecords[0].Zcoors[30]); + Assert.That(surfaceLineRecords[0].Xcoors[30], Is.EqualTo(86.660)); + Assert.That(surfaceLineRecords[0].Ycoors[30], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[30], Is.EqualTo(0.270)); - Assert.AreEqual(117.940, surfaceLineRecords[0].Xcoors[32]); - Assert.AreEqual(0.0, surfaceLineRecords[0].Ycoors[32]); - Assert.AreEqual(0.120, surfaceLineRecords[0].Zcoors[32]); + Assert.That(surfaceLineRecords[0].Xcoors[32], Is.EqualTo(117.940)); + Assert.That(surfaceLineRecords[0].Ycoors[32], Is.EqualTo(0.0)); + Assert.That(surfaceLineRecords[0].Zcoors[32], Is.EqualTo(0.120)); } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 4625) @@ -76,7 +76,7 @@ Dike dike = damProject.DamProjectData.WaterBoard.Dikes.First(); - Assert.AreEqual(6, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(6)); string sensorConfigurationFilename = Path.Combine(Path.GetDirectoryName(definitionFilename), dataSourceContainer.SensorConfigurationFilename); if (File.Exists(sensorConfigurationFilename)) @@ -89,7 +89,7 @@ // Check data for the second location SensorLocation sensorData = dike.Locations[1].SensorLocation; - Assert.AreEqual(4, sensorData.SensorCount); + Assert.That(sensorData.SensorCount, Is.EqualTo(4)); List sensorIds = (new[] { 0, @@ -102,19 +102,19 @@ Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID)); } - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorData.SourceTypePl1WaterLevelAtRiver); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.SourceTypePl1WaterLevelAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.SourceTypePl3); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.SourceTypePl4); + Assert.That(sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(DataSourceTypeSensors.Ignore)); + Assert.That(sensorData.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(DataSourceTypeSensors.Ignore)); + Assert.That(sensorData.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(DataSourceTypeSensors.Ignore)); + Assert.That(sensorData.SourceTypePl1WaterLevelAtRiver, Is.EqualTo(DataSourceTypeSensors.Sensor)); + Assert.That(sensorData.SourceTypePl1WaterLevelAtPolder, Is.EqualTo(DataSourceTypeSensors.LocationData)); + Assert.That(sensorData.SourceTypePl3, Is.EqualTo(DataSourceTypeSensors.Ignore)); + Assert.That(sensorData.SourceTypePl4, Is.EqualTo(DataSourceTypeSensors.LocationData)); // Test data for the second sensor Sensor currentSensor = sensorData.Sensors.FirstOrDefault(s => s.ID.Equals(10)); - Assert.AreEqual("AS452", currentSensor.Name); - Assert.AreEqual(121.1, currentSensor.RelativeLocation, cTolerance); - Assert.AreEqual(-0.63, currentSensor.Depth, cTolerance); - Assert.AreEqual(SensorType.PiezometricHead, currentSensor.Type); + Assert.That(currentSensor.Name, Is.EqualTo("AS452")); + Assert.That(currentSensor.RelativeLocation, Is.EqualTo(121.1).Within(cTolerance)); + Assert.That(currentSensor.Depth, Is.EqualTo(-0.63).Within(cTolerance)); + Assert.That(currentSensor.Type, Is.EqualTo(SensorType.PiezometricHead)); //+ [1] {[ID: 10, Name: , Depth: -0.63, Type: PiezometricHead, RelativeLocation: 121.1]} Deltares.Dam.Data.Sensors.Sensor } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamJobTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamJobTest.cs (.../DamJobTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamJobTest.cs (.../DamJobTest.cs) (revision 4625) @@ -36,9 +36,9 @@ var job = new DamJob(location); - Assert.AreEqual(false, job.Run.Value, "Initial run value"); - Assert.AreEqual("Jan", job.Name, "Name of the job"); - Assert.AreEqual(location, job.Subject, "Subject of the job"); + Assert.That(job.Run.Value, Is.EqualTo(false), "Initial run value"); + Assert.That(job.Name, Is.EqualTo("Jan"), "Name of the job"); + Assert.That(job.Subject, Is.EqualTo(location), "Subject of the job"); } } @@ -56,20 +56,20 @@ compositeJob.Jobs.Add(new DamJob(location1)); compositeJob.Jobs.Add(new DamJob(location2)); - Assert.AreEqual(false, compositeJob.Run.Value, "Initial run value"); + Assert.That(compositeJob.Run.Value, Is.EqualTo(false), "Initial run value"); compositeJob.Run = true; - Assert.AreEqual(true, compositeJob.Jobs[0].Run.Value, "Set run value to sub job"); - Assert.AreEqual(true, compositeJob.Jobs[1].Run.Value, "Set run vale to sub job"); + Assert.That(compositeJob.Jobs[0].Run.Value, Is.EqualTo(true), "Set run value to sub job"); + Assert.That(compositeJob.Jobs[1].Run.Value, Is.EqualTo(true), "Set run vale to sub job"); compositeJob.Jobs[0].Run = false; - Assert.AreEqual(false, compositeJob.Run.HasValue, "Set run value to parent job"); + Assert.That(compositeJob.Run.HasValue, Is.EqualTo(false), "Set run value to parent job"); compositeJob.Jobs[1].Run = false; - Assert.AreEqual(false, compositeJob.Run.Value, "Set run value to parent job"); + Assert.That(compositeJob.Run.Value, Is.EqualTo(false), "Set run value to parent job"); } } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs =================================================================== diff -u -r4569 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4569) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvImporterTest.cs (.../CsvImporterTest.cs) (revision 4625) @@ -81,7 +81,7 @@ public void CvsImporter_ImportFromNonExistingDirectory_AddsMessageWithFatalErrorType() { ImportDirector.Construct("C:\\SomeNoneExistingDirectory", null); - Assert.AreEqual(1, LogManager.Messages.Count); + Assert.That(LogManager.Messages.Count, Is.EqualTo(1)); Assert.That(LogManager.Messages[0].MessageType, Is.EqualTo(LogMessageType.FatalError)); Assert.That(LogManager.Messages[0].Message, Is.EqualTo("The import folder C:\\SomeNoneExistingDirectory does not exist")); } @@ -100,7 +100,7 @@ } ImportDirector.Construct(importFolder, null); - Assert.AreEqual(LogMessageType.Warning, LogManager.Messages[0].MessageType); + Assert.That(LogManager.Messages[0].MessageType, Is.EqualTo(LogMessageType.Warning)); } /// @@ -123,11 +123,11 @@ using (WaterBoard waterBoard = ImportDirector.Construct(importFolder, null)) { - Assert.AreEqual(2, waterBoard.Segments.Count); - Assert.AreEqual("Geometrie 1", waterBoard.Segments[0].GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual("Geometrie 1 piping", waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.Piping)); - Assert.AreEqual("Geometrie 2", waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual("Geometrie 1 piping", waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.Piping)); + Assert.That(waterBoard.Segments.Count, Is.EqualTo(2)); + Assert.That(waterBoard.Segments[0].GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside), Is.EqualTo("Geometrie 1")); + Assert.That(waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.Piping), Is.EqualTo("Geometrie 1 piping")); + Assert.That(waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.StabilityInside), Is.EqualTo("Geometrie 2")); + Assert.That(waterBoard.Segments[1].GetMostProbableGeometry2DName(FailureMechanismSystemType.Piping), Is.EqualTo("Geometrie 1 piping")); } } @@ -143,24 +143,24 @@ Assert.IsNotNull(dike); - Assert.AreEqual(2, dike.SoilProfiles.Count, "SoilProfiles.Count"); + Assert.That(dike.SoilProfiles.Count, Is.EqualTo(2), "SoilProfiles.Count"); - Assert.AreEqual(2, waterBoard.Segments.Count, "Segments.Count"); + Assert.That(waterBoard.Segments.Count, Is.EqualTo(2), "Segments.Count"); - Assert.AreEqual(1, dike.SurfaceLines2.Count, "SurfaceLines.Count"); + Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(1), "SurfaceLines.Count"); - Assert.AreEqual(1, dike.Locations.Count); - Assert.AreEqual("LOC1", dike.Locations[0].Name); - Assert.AreEqual("D1", dike.Locations[0].SurfaceLine2.Name); - Assert.AreEqual("1", dike.Locations[0].Segment.Name); - Assert.AreEqual(414.950, dike.Locations[0].XRd); - Assert.AreEqual(91.850, dike.Locations[0].YRd); - Assert.AreEqual(14.0, dike.Locations[0].XSoilGeometry2DOrigin); - Assert.AreEqual("ophoogmateriaaldijk", dike.Locations[0].DikeEmbankmentMaterial); - Assert.AreEqual("ophoogmateriaalberm", dike.Locations[0].ShoulderEmbankmentMaterial); - Assert.AreEqual(0.31, dike.Locations[0].DampingFactorPL3); - Assert.AreEqual(0.41, dike.Locations[0].DampingFactorPL4); - Assert.AreEqual(13, dike.SurfaceLines2[0].CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None)); + Assert.That(dike.Locations.Count, Is.EqualTo(1)); + Assert.That(dike.Locations[0].Name, Is.EqualTo("LOC1")); + Assert.That(dike.Locations[0].SurfaceLine2.Name, Is.EqualTo("D1")); + Assert.That(dike.Locations[0].Segment.Name, Is.EqualTo("1")); + Assert.That(dike.Locations[0].XRd, Is.EqualTo(414.950)); + Assert.That(dike.Locations[0].YRd, Is.EqualTo(91.850)); + Assert.That(dike.Locations[0].XSoilGeometry2DOrigin, Is.EqualTo(14.0)); + Assert.That(dike.Locations[0].DikeEmbankmentMaterial, Is.EqualTo("ophoogmateriaaldijk")); + Assert.That(dike.Locations[0].ShoulderEmbankmentMaterial, Is.EqualTo("ophoogmateriaalberm")); + Assert.That(dike.Locations[0].DampingFactorPL3, Is.EqualTo(0.31)); + Assert.That(dike.Locations[0].DampingFactorPL4, Is.EqualTo(0.41)); + Assert.That(dike.SurfaceLines2[0].CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None), Is.EqualTo(13)); Assert.IsNotNull(dike.SurfaceLines2[0].CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)); } } @@ -173,7 +173,7 @@ { WaterBoard waterBoard = ImportDirector.Construct(importFolder, null); Dike dike = waterBoard.Dikes[0]; - Assert.AreSame(dike.SoilProfiles[0], waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.StabilityInside)); + Assert.That(waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.StabilityInside), Is.SameAs(dike.SoilProfiles[0])); } /// @@ -187,8 +187,8 @@ { WaterBoard waterBoard = ImportDirector.Construct(importFolder, null); Dike dike = waterBoard.Dikes[0]; - Assert.AreEqual(80, waterBoard.Segments[0].GetSoilProfileProbability(dike.SoilProfiles[0], FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual(100, waterBoard.Segments[0].GetSoilProfileProbability(dike.SoilProfiles[1], FailureMechanismSystemType.Piping)); + Assert.That(waterBoard.Segments[0].GetSoilProfileProbability(dike.SoilProfiles[0], FailureMechanismSystemType.StabilityInside), Is.EqualTo(80)); + Assert.That(waterBoard.Segments[0].GetSoilProfileProbability(dike.SoilProfiles[1], FailureMechanismSystemType.Piping), Is.EqualTo(100)); } /// @@ -198,8 +198,8 @@ public void SegmentsOfImportedDikeHaveCorrectMostProbabableSoilProfile() { WaterBoard waterBoard = ImportDirector.Construct(importFolder, null); - Assert.AreEqual("1DP1", waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.StabilityInside).Name); - Assert.AreEqual("1DP2", waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.Piping).Name); + Assert.That(waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.StabilityInside).Name, Is.EqualTo("1DP1")); + Assert.That(waterBoard.Segments[0].GetMostProbableProfile(FailureMechanismSystemType.Piping).Name, Is.EqualTo("1DP2")); } /// @@ -210,7 +210,7 @@ { WaterBoard waterBoard = ImportDirector.Construct(importFolder, null); Dike dike = waterBoard.Dikes[0]; - Assert.AreSame(dike.Locations[0].SurfaceLine2, dike.SurfaceLines2[0]); + Assert.That(dike.SurfaceLines2[0], Is.SameAs(dike.Locations[0].SurfaceLine2)); } /// Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs (.../CsvExporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExporterTest.cs (.../CsvExporterTest.cs) (revision 4625) @@ -133,7 +133,7 @@ { var text = "text1.\r\ntext2.\r\n"; CsvExportData.RemoveCarriageReturnsFromMessage(ref text); - Assert.AreEqual("text1. text2.", text); + Assert.That(text, Is.EqualTo("text1. text2.")); } [Test] @@ -142,7 +142,7 @@ var csvExportData = new CsvExportData(); csvExportData.ResultMessage = "text1.\r\ntext2.\r\n"; string message = csvExportData.ResultMessage; - Assert.AreEqual("text1. text2.", message); + Assert.That(message, Is.EqualTo("text1. text2.")); } class DataStub Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs (.../LocationCharacteristicPointImporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs (.../LocationCharacteristicPointImporterTest.cs) (revision 4625) @@ -180,8 +180,8 @@ importer.Import(); - Assert.AreEqual(0, location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).X); - Assert.AreEqual(0, location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).Y); + Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).X, Is.EqualTo(0)); + Assert.That(location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(dikeTopAtPolder).Y, Is.EqualTo(0)); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamSpatialEditorDecoratorTest.cs (.../DamSpatialEditorDecoratorTest.cs) (revision 4625) @@ -133,7 +133,7 @@ // The main issue why the test currently does not pass, is because the shape collection contains // only one element which represents the surface (I believe). Expected item would also be the // surface line on top of the soil surface area. - CollectionAssert.DoesNotContain(editor.Shapes.Select(sh => sh.DataObject), characteristicPoint); + Assert.That(editor.Shapes.Select(sh => sh.DataObject), Has.No.Member(characteristicPoint)); // Register the event listener. A shape created event should be fired when the characteristic point // is created in the shape collection. @@ -151,7 +151,7 @@ // Check if the event was fired and whether the shapes now contain the characteristic point // that was set. Assert.IsTrue(shapeCreatedFired); - CollectionAssert.Contains(editor.Shapes.Select(sh => sh.DataObject), characteristicPoint); + Assert.That(editor.Shapes.Select(sh => sh.DataObject), Has.Member(characteristicPoint)); } } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/CoverageFunctionTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/CoverageFunctionTest.cs (.../CoverageFunctionTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/CoverageFunctionTest.cs (.../CoverageFunctionTest.cs) (revision 4625) @@ -104,11 +104,11 @@ Func func = rep.GetCoverageFunc(); var actual = (string) func(attribute.ToUpper(), 1, 1); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); actual = (string) func(attribute.ToLower(), 1, 1); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); mocks.ReplayAll(); } @@ -221,7 +221,7 @@ Func func = repository.GetCoverageFunc(); var actual = (double) func(attribute, 0, 0); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual, 0.0001); + Assert.That(actual, Is.EqualTo(expected).Within(0.0001)); } [Test] @@ -257,7 +257,7 @@ Func func = repository.GetCoverageFunc(); var actual = (string) func(attribute, 0, 0); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); } [Test] @@ -290,15 +290,15 @@ Func func = repository.GetCoverageFunc(); var actual = (double) func(attribute, 1, 1); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); actual = (double) func(attribute, 1, 2); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); actual = (double) func(attribute, 1, 1.5); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); } [Test] @@ -333,7 +333,7 @@ Func func = repository.GetCoverageFunc(attribute); var actual = (double) func(0, 0); Assert.IsNotNull(actual); - Assert.AreEqual(expected, actual, 0.0001); + Assert.That(actual, Is.EqualTo(expected).Within(0.0001)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry2DDataTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry2DDataTests.cs (.../Geometry2DDataTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry2DDataTests.cs (.../Geometry2DDataTests.cs) (revision 4625) @@ -32,9 +32,9 @@ public void AddBoundaryLineIncreasesCount() { var geometry2DData = new Geometry2DData(); - Assert.AreEqual(0, geometry2DData.LayerCount, "New Geometry2DData object should have no boundary lines"); + Assert.That(geometry2DData.LayerCount, Is.EqualTo(0), "New Geometry2DData object should have no boundary lines"); geometry2DData.AddLayer(new Geometry2DLayer()); - Assert.AreEqual(1, geometry2DData.LayerCount, "Adding boundary line did not increase boundary line count"); + Assert.That(geometry2DData.LayerCount, Is.EqualTo(1), "Adding boundary line did not increase boundary line count"); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4625) @@ -46,7 +46,7 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 allCalculationresults.Clear(); @@ -98,13 +98,13 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 allCalculationresults.Clear(); allCalculationresults = ComputeProject(projectFilename, PipingModelType.Wti2017, 0); expectedPipingFactor = 0.42241892923665264; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); } /// @@ -117,13 +117,13 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 allCalculationresults.Clear(); allCalculationresults = ComputeProject(projectFilename, PipingModelType.Wti2017, 0); expectedPipingFactor = 0.4275708873438484; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); } /// @@ -136,13 +136,13 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 is not supported for now allCalculationresults.Clear(); allCalculationresults = ComputeProject(projectFilename, PipingModelType.Wti2017, 0); expectedPipingFactor = 0.50501856442086579; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); } /// @@ -155,13 +155,13 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 is not supported for now allCalculationresults.Clear(); allCalculationresults = ComputeProject(projectFilename, PipingModelType.Wti2017, 0); expectedPipingFactor = 0.51473283261943303; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].Wti2017BackwardErosionSafetyFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); } /// @@ -177,9 +177,9 @@ AnalysisType analysisType = DamProjectCalculationSpecification.SelectedAnalysisType; try { - Assert.AreEqual(1, damProjectData.WaterBoard.Dikes.Count); + Assert.That(damProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = damProjectData.WaterBoard.Dikes[0]; - Assert.AreEqual(1, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(1)); dike.Locations[0].DistanceToEntryPoint = distanceToEntryPoint; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel; DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.NoAdaption; @@ -234,7 +234,7 @@ List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, distanceToEntryPoint); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself - Assert.AreEqual(expectedPipingFactor, allCalculationresults[0].BlighPipingFactor.Value, cTolerance); + Assert.That(allCalculationresults[0].BlighPipingFactor.Value, Is.EqualTo(expectedPipingFactor).Within(cTolerance)); // Wti2017 is not supported for now allCalculationresults.Clear(); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 4625) @@ -69,22 +69,22 @@ IList surfaceLinePoints = dataPluginImporter.GetSurfaceLinePoints(dikeRingId, surfaceline02_4Id); Assert.IsTrue(surfaceLinePoints.Count > 0); - Assert.AreEqual(198341.355, surfaceLinePoints[0].X, cToleranceCoordinate); - Assert.AreEqual(503761.972, surfaceLinePoints[0].Y, cToleranceCoordinate); - Assert.AreEqual(0.92, surfaceLinePoints[0].Z, cToleranceCoordinate); + Assert.That(surfaceLinePoints[0].X, Is.EqualTo(198341.355).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[0].Y, Is.EqualTo(503761.972).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[0].Z, Is.EqualTo(0.92).Within(cToleranceCoordinate)); int lastPointIndex = surfaceLinePoints.Count() - 1; - Assert.AreEqual(198419.699, surfaceLinePoints[lastPointIndex].X, cToleranceCoordinate); - Assert.AreEqual(503781.658, surfaceLinePoints[lastPointIndex].Y, cToleranceCoordinate); - Assert.AreEqual(2.54, surfaceLinePoints[lastPointIndex].Z, cToleranceCoordinate); + Assert.That(surfaceLinePoints[lastPointIndex].X, Is.EqualTo(198419.699).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[lastPointIndex].Y, Is.EqualTo(503781.658).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[lastPointIndex].Z, Is.EqualTo(2.54).Within(cToleranceCoordinate)); // Check specific characteristic points of 1 surfaceline IEnumerable surfaceLineCharacteristicPoints = dataPluginImporter.GetSurfaceLineCharacteristicPoints(dikeRingId, surfaceline02_4Id); Assert.IsTrue(surfaceLineCharacteristicPoints.Count() > 0); DpCharacteristicPoint pointSurfaceLevelOutside = surfaceLineCharacteristicPoints.Where(x => x.Id.Equals("DikeTopAtPolder")).FirstOrDefault(); - Assert.AreEqual(198390.4194, pointSurfaceLevelOutside.X, cToleranceCoordinate); - Assert.AreEqual(503774.3007, pointSurfaceLevelOutside.Y, cToleranceCoordinate); - Assert.AreEqual(5.36, pointSurfaceLevelOutside.Z, cToleranceCoordinate); + Assert.That(pointSurfaceLevelOutside.X, Is.EqualTo(198390.4194).Within(cToleranceCoordinate)); + Assert.That(pointSurfaceLevelOutside.Y, Is.EqualTo(503774.3007).Within(cToleranceCoordinate)); + Assert.That(pointSurfaceLevelOutside.Z, Is.EqualTo(5.36).Within(cToleranceCoordinate)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileReaderTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileReaderTest.cs (.../ShapeFileReaderTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileReaderTest.cs (.../ShapeFileReaderTest.cs) (revision 4625) @@ -65,7 +65,7 @@ Assert.IsNotNull(geom.Geometry); Assert.IsNotNull(geom.WktFormat); Assert.IsNotNull(geom.Attributes); - Assert.AreEqual(0, geom.Attributes.Count); + Assert.That(geom.Attributes.Count, Is.EqualTo(0)); } } @@ -84,7 +84,7 @@ Assert.IsNotNull(geom.Geometry); Assert.IsNotNull(geom.WktFormat); Assert.IsNotNull(geom.Attributes); - Assert.AreEqual(0, geom.Attributes.Count); + Assert.That(geom.Attributes.Count, Is.EqualTo(0)); } }; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardPostProcessRelativeProfilesTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardPostProcessRelativeProfilesTest.cs (.../WaterBoardPostProcessRelativeProfilesTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardPostProcessRelativeProfilesTest.cs (.../WaterBoardPostProcessRelativeProfilesTest.cs) (revision 4625) @@ -142,16 +142,16 @@ // If there is no move, than there is no added layer if (Math.Abs(offset) < CTolerance) { - Assert.AreEqual(1.0 + offset, soilProfile1D.TopLevel, CTolerance); - Assert.AreEqual(-1.0 + offset, soilProfile1D.Layers[1].TopLevel, CTolerance); - Assert.AreEqual(-10.0 + offset, soilProfile1D.BottomLevel, CTolerance); + Assert.That(soilProfile1D.TopLevel, Is.EqualTo(1.0 + offset).Within(CTolerance)); + Assert.That(soilProfile1D.Layers[1].TopLevel, Is.EqualTo(-1.0 + offset).Within(CTolerance)); + Assert.That(soilProfile1D.BottomLevel, Is.EqualTo(-10.0 + offset).Within(CTolerance)); } else { // If there is a move, than there is one added (top) layer - Assert.AreEqual(2.0 + offset, soilProfile1D.TopLevel, CTolerance); - Assert.AreEqual(-1.0 + offset, soilProfile1D.Layers[2].TopLevel, CTolerance); - Assert.AreEqual(-10.0 + offset, soilProfile1D.BottomLevel, CTolerance); + Assert.That(soilProfile1D.TopLevel, Is.EqualTo(2.0 + offset).Within(CTolerance)); + Assert.That(soilProfile1D.Layers[2].TopLevel, Is.EqualTo(-1.0 + offset).Within(CTolerance)); + Assert.That(soilProfile1D.BottomLevel, Is.EqualTo(-10.0 + offset).Within(CTolerance)); } } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4625) @@ -61,17 +61,17 @@ DataSourceContainer dataSourceContainerDest = DataSourceContainer.Deserialize(cXmlFilename); - Assert.AreEqual(dataSourceContainerSrc.MapSoilProfile2D, dataSourceContainerDest.MapSoilProfile2D); - Assert.AreEqual(dataSourceContainerSrc.SensorConfigurationFilename, dataSourceContainerDest.SensorConfigurationFilename); - Assert.AreEqual(dataSourceContainerSrc.DataSourceEsriProjection, dataSourceContainerDest.DataSourceEsriProjection); - Assert.AreEqual(dataSourceContainerSrc.IsImportAsRelativeProfiles, dataSourceContainerDest.IsImportAsRelativeProfiles); - Assert.AreEqual(dataSourceContainerSrc.SoilProfileCharacteristicPointReference, dataSourceContainerDest.SoilProfileCharacteristicPointReference); - Assert.AreEqual(dataSourceContainerSrc.DataSourceList.Count, dataSourceContainerDest.DataSourceList.Count); - Assert.AreEqual(dataSourceContainerSrc.DataSourceList[0].DataSourceType, dataSourceContainerDest.DataSourceList[0].DataSourceType); - Assert.AreEqual(dataSourceContainerSrc.DataSourceList[0].DataLocation, dataSourceContainerDest.DataSourceList[0].DataLocation); + Assert.That(dataSourceContainerDest.MapSoilProfile2D, Is.EqualTo(dataSourceContainerSrc.MapSoilProfile2D)); + Assert.That(dataSourceContainerDest.SensorConfigurationFilename, Is.EqualTo(dataSourceContainerSrc.SensorConfigurationFilename)); + Assert.That(dataSourceContainerDest.DataSourceEsriProjection, Is.EqualTo(dataSourceContainerSrc.DataSourceEsriProjection)); + Assert.That(dataSourceContainerDest.IsImportAsRelativeProfiles, Is.EqualTo(dataSourceContainerSrc.IsImportAsRelativeProfiles)); + Assert.That(dataSourceContainerDest.SoilProfileCharacteristicPointReference, Is.EqualTo(dataSourceContainerSrc.SoilProfileCharacteristicPointReference)); + Assert.That(dataSourceContainerDest.DataSourceList.Count, Is.EqualTo(dataSourceContainerSrc.DataSourceList.Count)); + Assert.That(dataSourceContainerDest.DataSourceList[0].DataSourceType, Is.EqualTo(dataSourceContainerSrc.DataSourceList[0].DataSourceType)); + Assert.That(dataSourceContainerDest.DataSourceList[0].DataLocation, Is.EqualTo(dataSourceContainerSrc.DataSourceList[0].DataLocation)); Assert.IsNotNull(dataSourceContainerDest.DataAttributes); Assert.IsTrue(dataSourceContainerDest.DataAttributes.Count == 1); - Assert.AreEqual(dataSourceContainerSrc.DataAttributes.ElementAt(0).AttributeName, dataSourceContainerDest.DataAttributes.ElementAt(0).AttributeName); + Assert.That(dataSourceContainerDest.DataAttributes.ElementAt(0).AttributeName, Is.EqualTo(dataSourceContainerSrc.DataAttributes.ElementAt(0).AttributeName)); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4625) @@ -87,7 +87,7 @@ dataPluginImporter.SetDataSources("", srcDataSources); //var destDataSources = dataPluginImporter.DataSources.ToList(); List destDataSources = dataPluginImporter.DataSources.ToList(); - Assert.AreEqual(srcDataSources.Count, destDataSources.Count()); + Assert.That(destDataSources.Count(), Is.EqualTo(srcDataSources.Count)); Assert.IsTrue(srcDataSources[0].Equals(destDataSources.FirstOrDefault())); } @@ -117,14 +117,14 @@ Info info = dataPluginImporter.WaterBoardInfo; if (LocalizationManager.CurrentLanguage == LanguageType.Dutch) { - Assert.AreEqual("Waterschap", info.Name); + Assert.That(info.Name, Is.EqualTo("Waterschap")); } else { - Assert.AreEqual("WaterBoard", info.Name); + Assert.That(info.Name, Is.EqualTo("WaterBoard")); } - Assert.AreEqual("Waterschap", info.Description); + Assert.That(info.Description, Is.EqualTo("Waterschap")); } /// @@ -147,14 +147,14 @@ Assert.IsNotEmpty(scenarioDetailsOne); NameValueParameter headPl2ValueOne = scenarioDetailsOne.SingleOrDefault(x => x.ParameterName.Equals("HeadPL2")); Assert.IsNotNull(headPl2ValueOne); - Assert.AreEqual("-5.37", headPl2ValueOne.ParameterValue); + Assert.That(headPl2ValueOne.ParameterValue, Is.EqualTo("-5.37")); string scenarioIdTwo = dataPluginImporter.GetScenarioList(dikeRingId, Location2Id).FirstOrDefault(); NameValueParameter[] scenarioDetailsTwo = dataPluginImporter.GetScenarioDetails(dikeRingId, Location2Id, scenarioIdTwo).ToArray(); Assert.IsNotEmpty(scenarioDetailsTwo); NameValueParameter headPl2ValueTwo = scenarioDetailsTwo.SingleOrDefault(x => x.ParameterName.Equals("HeadPL2")); Assert.IsNotNull(headPl2ValueTwo); - Assert.AreEqual("-5.37", headPl2ValueTwo.ParameterValue); + Assert.That(headPl2ValueTwo.ParameterValue, Is.EqualTo("-5.37")); } /// @@ -177,10 +177,10 @@ IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); Assert.IsTrue(nameValueParameters.Any()); - Assert.AreEqual("-99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("-99")); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location2Id, scenarioId); - Assert.AreEqual("-99", scenarioDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.That(scenarioDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("-99")); } /// @@ -203,10 +203,10 @@ IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); Assert.IsTrue(nameValueParameters.Any()); - Assert.AreEqual("-3.651", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("-3.651")); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location2Id, scenarioId); - Assert.AreEqual("-3.632", scenarioDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); + Assert.That(scenarioDetails.First(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("-3.632")); } /// @@ -249,13 +249,13 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-560", scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("1.2")); scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-570").FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-570", scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("2.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("2.2")); // Expected: no error messages - Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); + Assert.That(dataPluginImporter.ImportLogMessages.Count, Is.EqualTo(0)); } /// @@ -298,13 +298,13 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-560", scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("0.1")); scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-570").FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-570", scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("0.2")); // Expected: no error messages - Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); + Assert.That(dataPluginImporter.ImportLogMessages.Count, Is.EqualTo(0)); } /// @@ -347,13 +347,13 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-560", scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo(null)); scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-570").FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, "RK210-570", scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo(null)); // Expected: no error messages - Assert.AreEqual(0, dataPluginImporter.ImportLogMessages.Count); + Assert.That(dataPluginImporter.ImportLogMessages.Count, Is.EqualTo(0)); } /// @@ -394,46 +394,46 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("1.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("1.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("1.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("1")); // check values for location 2 scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("1.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual(null, nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("1.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("1.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("1.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo(null)); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("1")); } /// @@ -474,46 +474,46 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("2.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.55", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.57", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.58", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.59", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("2.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("1.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("1.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("1.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("0.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("2.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.55")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.56")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.57")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.58")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.59")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.6")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("0.88")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("0.77")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("2.88")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("1.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("1.77")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("1.09")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("1.12")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("1.14")); // check values for location 2 scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("1.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("3.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.65", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.67", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.68", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.69", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("1.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("1.88", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("1.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("1.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("1.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("1.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("3.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.65")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.66")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.67")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.68")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.69")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.7")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("0.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("0.66")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("2.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("1.22")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("1.88")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("1.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("1.13")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("1.15")); } /// @@ -562,46 +562,46 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("1.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("3.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.21", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.22", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.23", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.24", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("3.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("2.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("0.6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("0.63", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("0.66", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("1.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("3.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.21")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.22")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.23")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("False")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.24")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("False")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("3")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("4")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("3.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("2.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("0.6")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("0.63")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("0.66")); // check values for location 2 scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("2.99", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.11", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.12", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.14", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("0.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("0.53", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("0.56", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("0.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("2.99")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.11")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.12")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.13")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("False")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.14")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.15")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("4")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("3")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("3")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("0.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("0.53")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("0.56")); } /// @@ -650,46 +650,46 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("2.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.05", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.06", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.07", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.08", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.09", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.1", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("6", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("4.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("3.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("0.81", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("0.83", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("0.85", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("0.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("2.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.05")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.06")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.07")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.08")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.09")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("False")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.1")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("4")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("6")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("4.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("3.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("0.81")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("0.83")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("0.85")); // check values for location 2 scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("1.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("3.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.15", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.16", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.17", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.18", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("False", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.19", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.2", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("4", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("3", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("0.7", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("0.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("0.8", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("1.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("3.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.15")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.16")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.17")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.18")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("False")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.19")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.2")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("3")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("4")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("4")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("3")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("0.7")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("0.75")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("0.8")); } /// @@ -738,46 +738,46 @@ string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); NameValueParameter[] nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("0.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("2.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("0.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("0.76", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("0.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("0.78", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("0.79", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.8", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("0.91", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("0.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("1.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("1.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("0.93", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("0.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("0.95", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("0.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("2.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("0.75")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("0.76")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("0.77")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("0.78")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("0.79")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.8")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("0.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("0.91")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("0.92")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("1.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("1.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("0.93")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("0.94")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("0.95")); // check values for location 2 scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId2).FirstOrDefault(); scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId2, scenarioId); nameValueParameters = scenarioDetails as NameValueParameter[] ?? scenarioDetails.ToArray(); - Assert.AreEqual("1.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue); - Assert.AreEqual("3.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue); - Assert.AreEqual("1.75", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue); - Assert.AreEqual("1.76", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue); - Assert.AreEqual("1.77", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue); - Assert.AreEqual("1.78", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("1.79", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue); - Assert.AreEqual("True", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("0.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue); - Assert.AreEqual("1.9", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue); - Assert.AreEqual("1.91", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue); - Assert.AreEqual("1.92", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue); - Assert.AreEqual("2.5", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue); - Assert.AreEqual("2.25", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue); - Assert.AreEqual("1.93", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue); - Assert.AreEqual("1.94", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue); - Assert.AreEqual("1.95", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL3")).ParameterValue, Is.EqualTo("1.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("HeadPL4")).ParameterValue, Is.EqualTo("3.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtRiver")).ParameterValue, Is.EqualTo("1.75")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeTopAtPolder")).ParameterValue, Is.EqualTo("1.76")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowShoulderBaseInside")).ParameterValue, Is.EqualTo("1.77")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeToeAtPolder")).ParameterValue, Is.EqualTo("1.78")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetBelowDikeCrestMiddle")).ParameterValue, Is.EqualTo("1.79")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UsePlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("True")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("PlLineOffsetFactorBelowShoulderCrest")).ParameterValue, Is.EqualTo("0.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionStability")).ParameterValue, Is.EqualTo("1.9")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("UpliftCriterionPiping")).ParameterValue, Is.EqualTo("1.91")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("DikeTableHeight")).ParameterValue, Is.EqualTo("1.92")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevel")).ParameterValue, Is.EqualTo("2.5")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RiverLevelLow")).ParameterValue, Is.EqualTo("2.25")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorPiping")).ParameterValue, Is.EqualTo("1.93")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityInnerSlope")).ParameterValue, Is.EqualTo("1.94")); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("RequiredSafetyFactorStabilityOuterSlope")).ParameterValue, Is.EqualTo("1.95")); } private void SetupInvoer1WithShapeFiles() Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GaugePLLineTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GaugePLLineTest.cs (.../GaugePLLineTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GaugePLLineTest.cs (.../GaugePLLineTest.cs) (revision 4625) @@ -65,14 +65,14 @@ gaugePLLine.Points.Add(new GaugePLLinePoint(1.1, 2.1, gauge1.Name, gauge2.Name)); gaugePLLine.Points.Add(new GaugePLLinePoint(1.1, 2.100001, gauge3.Name, gauge4.Name)); - Assert.AreEqual(PLLineType.PL3, gaugePLLine.PLLineType); - Assert.AreEqual(2, gaugePLLine.Points.Count); + Assert.That(gaugePLLine.PLLineType, Is.EqualTo(PLLineType.PL3)); + Assert.That(gaugePLLine.Points.Count, Is.EqualTo(2)); Assert.IsTrue(gaugePLLine.Points[1].LocationEquals(gaugePLLine.Points[0], 0.0001)); - Assert.AreEqual(gauge1.Name, gaugePLLine.Points[0].GaugeIDX); - Assert.AreEqual(gauge2.Name, gaugePLLine.Points[0].GaugeIDZ); - Assert.AreEqual(gauge3.Name, gaugePLLine.Points[1].GaugeIDX); - Assert.AreEqual(gauge4.Name, gaugePLLine.Points[1].GaugeIDZ); + Assert.That(gaugePLLine.Points[0].GaugeIDX, Is.EqualTo(gauge1.Name)); + Assert.That(gaugePLLine.Points[0].GaugeIDZ, Is.EqualTo(gauge2.Name)); + Assert.That(gaugePLLine.Points[1].GaugeIDX, Is.EqualTo(gauge3.Name)); + Assert.That(gaugePLLine.Points[1].GaugeIDZ, Is.EqualTo(gauge4.Name)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileValidatorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileValidatorTest.cs (.../StiFileValidatorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileValidatorTest.cs (.../StiFileValidatorTest.cs) (revision 4625) @@ -76,7 +76,7 @@ IEnumerable validationMessages = fileValidator.Validate(); // Assert - CollectionAssert.IsEmpty(validationMessages); + Assert.That(validationMessages, Is.Empty); } [Test] @@ -90,7 +90,7 @@ IEnumerable messages = fileValidator.Validate(); // Assert - CollectionAssert.IsEmpty(messages); + Assert.That(messages, Is.Empty); } [Test] @@ -108,10 +108,10 @@ // Then var expectedErrorMessage = $"{propertyName} data in '{filePath}' is of a version of D-Geo Stability that is not supported and cannot be read."; - CollectionAssert.AreEqual(new[] + Assert.That(messages, Is.EqualTo(new[] { expectedErrorMessage - }, messages); + }).AsCollection); } [Test] @@ -127,10 +127,10 @@ IEnumerable messages = fileValidator.Validate(); // Then - CollectionAssert.AreEqual(new[] + Assert.That(messages, Is.EqualTo(new[] { $"{filePath} is not a D-Geo Stability file (*.sti)." - }, messages); + }).AsCollection); } private static IEnumerable GetUnsupportedFileVersions() Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamContextTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamContextTest.cs (.../DamContextTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/DamContextTest.cs (.../DamContextTest.cs) (revision 4625) @@ -54,12 +54,12 @@ IEnumerable columnNamedFilters = context.GetColumnNamedFilters(typeof(Scenario)); // Assert - CollectionAssert.AreEqual(new[] + Assert.That(columnNamedFilters, Is.EqualTo(new[] { "InsideStabilityScenarioCategory", "PipingScenarioCategory", "PlLineSchematizationScenarioCategory" - }, columnNamedFilters); + }).AsCollection); } [Test] @@ -74,7 +74,7 @@ IList filteredColumnNames = context.GetFilteredColumns(typeof(Scenario), filterValue); // Assert - CollectionAssert.AreEquivalent(expectedColumnNames, filteredColumnNames); + Assert.That(filteredColumnNames, Is.EquivalentTo(expectedColumnNames)); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r4615 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4615) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 4625) @@ -56,64 +56,64 @@ using WaterBoard waterBoard = WaterBoardImporter.ImportAllData("", dataSourceContainer, DamProjectType.Calamity, null, out List _); // Check Dike - Assert.AreEqual(1, waterBoard.Dikes.Count); + Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = waterBoard.Dikes[0]; //Check Soils // ToDO For now expect 0 as the soildb for this test has not yet been replaced with a soils.csv - Assert.AreEqual(0, dike.SoilList.Soils.Count); + Assert.That(dike.SoilList.Soils.Count, Is.EqualTo(0)); // Assert.AreEqual(47, dike.SoilList.Soils.Count); // Soil soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName(soilKleiDuin)]; // Assert.AreEqual(15.7, soil.AbovePhreaticLevel, cTolerance); // Check Soilprofiles - Assert.AreEqual(26, dike.SoilProfiles.Count); + Assert.That(dike.SoilProfiles.Count, Is.EqualTo(26)); SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals(soilProfileId)); - Assert.AreEqual(soilKleiDuin, soilProfile.Layers[0].Soil.Name); + Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo(soilKleiDuin)); // Check Segments - Assert.AreEqual(24, waterBoard.Segments.Count); + Assert.That(waterBoard.Segments.Count, Is.EqualTo(24)); Segment segment = waterBoard.Segments.First(x => x.Name.Equals(segmentId)); - Assert.AreEqual("10Y_024_STBI.sti", segment.SoilProfileProbabilities[0].SoilGeometryName); - Assert.AreEqual(100.0, segment.SoilProfileProbabilities[0].Probability, cTolerance); + Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.IsTrue(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.StabilityInside)); // Check segment with stability and piping segment = waterBoard.Segments.FirstOrDefault(x => x.Name.Equals("segment_dijkring10_dwp02_4")); - Assert.AreEqual("10Y_024_STBI.sti", segment.SoilProfileProbabilities[0].SoilGeometryName); - Assert.AreEqual(100.0, segment.SoilProfileProbabilities[0].Probability, cTolerance); + Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.IsTrue(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.StabilityInside)); - Assert.AreEqual("10Y_024_STBI.sti", segment.SoilProfileProbabilities[1].SoilGeometryName); - Assert.AreEqual(100.0, segment.SoilProfileProbabilities[1].Probability, cTolerance); + Assert.That(segment.SoilProfileProbabilities[1].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[1].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.IsTrue(segment.SoilProfileProbabilities[1].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.Piping)); // Check surfacelines - Assert.AreEqual(13, dike.SurfaceLines2.Count); + Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(13)); SurfaceLine2 surfaceline = dike.SurfaceLines2.First(x => x.Name.Equals(surfacelineId)); Assert.IsTrue(surfaceline.Geometry.Points.Any()); - Assert.AreEqual(0.0, surfaceline.Geometry.Points[0].X, cToleranceCoordinate); - Assert.AreEqual(0.0, surfaceline.Geometry.Points[0].Y, cToleranceCoordinate); - Assert.AreEqual(-0.48, surfaceline.Geometry.Points[0].Z, cToleranceCoordinate); + Assert.That(surfaceline.Geometry.Points[0].X, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceline.Geometry.Points[0].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceline.Geometry.Points[0].Z, Is.EqualTo(-0.48).Within(cToleranceCoordinate)); int lastPointIndex = surfaceline.Geometry.Count - 1; - Assert.AreEqual(71.25, surfaceline.Geometry.Points[lastPointIndex].X, cToleranceCoordinate); - Assert.AreEqual(0.0, surfaceline.Geometry.Points[lastPointIndex].Y, cToleranceCoordinate); - Assert.AreEqual(-0.36, surfaceline.Geometry.Points[lastPointIndex].Z, cToleranceCoordinate); + Assert.That(surfaceline.Geometry.Points[lastPointIndex].X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); + Assert.That(surfaceline.Geometry.Points[lastPointIndex].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceline.Geometry.Points[lastPointIndex].Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); GeometryPoint point = surfaceline.CharacteristicPoints.GetGeometryPoint( CharacteristicPointType.SurfaceLevelInside); - Assert.AreEqual(71.25, point.X, cToleranceCoordinate); - Assert.AreEqual(0.0, point.Y, cToleranceCoordinate); - Assert.AreEqual(-0.36, point.Z, cToleranceCoordinate); + Assert.That(point.X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); + Assert.That(point.Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(point.Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); // Check locations - Assert.AreEqual(13, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(13)); Location location = dike.Locations.First(x => x.Name.Equals(locationId)); -// Assert.AreEqual(0.25, location.MinimalCircleDepth, cTolerance); // is default from modelparameters + // Assert.AreEqual(0.25, location.MinimalCircleDepth, cTolerance); // is default from modelparameters - Assert.AreEqual("segment_dijkring10_dwp04_1", location.Segment.Name); - Assert.AreEqual("dijkring10_dwp04_1", location.SurfaceLine2.Name); + Assert.That(location.Segment.Name, Is.EqualTo("segment_dijkring10_dwp04_1")); + Assert.That(location.SurfaceLine2.Name, Is.EqualTo("dijkring10_dwp04_1")); dike.Validate(); } @@ -135,36 +135,36 @@ out List _); // Check Dike - Assert.AreEqual(1, waterBoard.Dikes.Count); + Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = waterBoard.Dikes[0]; //Check locations - Assert.AreEqual(2, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(2)); // Check Soilprofiles - Assert.AreEqual(23, dike.SoilProfiles.Count); + Assert.That(dike.SoilProfiles.Count, Is.EqualTo(23)); SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals("25_2_1_bz_4")); - Assert.AreEqual("kade", soilProfile.Layers[0].Soil.Name); + Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade")); //Check Soils - Assert.AreEqual(51, dike.SoilList.Soils.Count); + Assert.That(dike.SoilList.Soils.Count, Is.EqualTo(51)); Soil soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("kade")]; - Assert.AreEqual(17.0, soil.AbovePhreaticLevel, cTolerance); + Assert.That(soil.AbovePhreaticLevel, Is.EqualTo(17.0).Within(cTolerance)); //Check Soil with sigma-tau table soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName("CCC")]; - Assert.AreEqual(ShearStrengthModel.StressTable, soil.ShearStrengthModel); - Assert.AreEqual("CurveKlei", soil.StressTable.Name); - Assert.AreEqual(5, soil.StressTable.SigmaTaus.Count); - Assert.AreEqual(0.0, soil.StressTable.SigmaTaus[0].Sigma, cTolerance); - Assert.AreEqual(2.05, soil.StressTable.SigmaTaus[0].Tau, cTolerance); - Assert.AreEqual(110.5, soil.StressTable.SigmaTaus[4].Sigma, cTolerance); - Assert.AreEqual(44.6, soil.StressTable.SigmaTaus[4].Tau, cTolerance); + Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable)); + Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); + Assert.That(soil.StressTable.SigmaTaus.Count, Is.EqualTo(5)); + Assert.That(soil.StressTable.SigmaTaus[0].Sigma, Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[0].Tau, Is.EqualTo(2.05).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[4].Sigma, Is.EqualTo(110.5).Within(cTolerance)); + Assert.That(soil.StressTable.SigmaTaus[4].Tau, Is.EqualTo(44.6).Within(cTolerance)); // Check Segments - Assert.AreEqual(2, waterBoard.Segments.Count); + Assert.That(waterBoard.Segments.Count, Is.EqualTo(2)); Segment segment = waterBoard.Segments.First(x => x.Name.Equals("106")); - Assert.AreEqual("25_2_1_bz_1", segment.SoilProfileProbabilities[0].SoilGeometryName); - Assert.AreEqual(35.0, segment.SoilProfileProbabilities[0].Probability, cTolerance); + Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("25_2_1_bz_1")); + Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(35.0).Within(cTolerance)); Assert.IsTrue(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.StabilityInside)); } @@ -240,11 +240,11 @@ damProject.SaveXMLProject(projectFilename, damProject); // Check Dike - Assert.AreEqual(1, damProject.DamProjectData.WaterBoard.Dikes.Count); + Assert.That(damProject.DamProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = damProject.DamProjectData.WaterBoard.Dikes[0]; //Check locations - Assert.AreEqual(17, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(17)); } } @@ -263,11 +263,11 @@ DamProjectType.Calamity, null, out List _); // Check Dike - Assert.AreEqual(1, waterBoard.Dikes.Count); + Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = waterBoard.Dikes[0]; //Check locations - Assert.AreEqual(2, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(2)); } [Test] @@ -295,26 +295,26 @@ } // Check Dike - Assert.AreEqual(1, waterBoard.Dikes.Count); + Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = waterBoard.Dikes[0]; //Check locations - Assert.AreEqual(2, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(2)); // Check Soilprofiles // Count is 43: 23 (imported) + 7 (generated for first location) + 13 (generated for second location) - Assert.AreEqual(43, dike.SoilProfiles.Count); + Assert.That(dike.SoilProfiles.Count, Is.EqualTo(43)); SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals("25_2_1_bz_4")); - Assert.AreEqual("kade", soilProfile.Layers[0].Soil.Name); - Assert.AreEqual(60.0, soilProfile.TopLevel); + Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo("kade")); + Assert.That(soilProfile.TopLevel, Is.EqualTo(60.0)); // Check if all profiles are made absolute from relative foreach (Location location in waterBoard.Locations) foreach (SoilGeometryProbability soilProfileProbability in location.Segment.SoilProfileProbabilities) { GeometryPoint dikeToeAtPolder = location.SurfaceLine2.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType .DikeToeAtPolder); - Assert.AreEqual(soilProfileProbability.SoilProfile.Layers[1].TopLevel, dikeToeAtPolder.Z, cTolerance); + Assert.That(dikeToeAtPolder.Z, Is.EqualTo(soilProfileProbability.SoilProfile.Layers[1].TopLevel).Within(cTolerance)); } // Compare reference waterboard to converted waterboard @@ -336,9 +336,9 @@ // As the moved profile has a new top layer, make sure to compare the proper layers if (layerIndex > 0) { - Assert.AreEqual( - referenceSoilProfileProbability.SoilProfile.Layers[layerIndex - 1].Height, - soilProfileProbability.SoilProfile.Layers[layerIndex].Height, cTolerance, + Assert.That( + soilProfileProbability.SoilProfile.Layers[layerIndex].Height, + Is.EqualTo(referenceSoilProfileProbability.SoilProfile.Layers[layerIndex - 1].Height).Within(cTolerance), string.Format( "Location {0} Segment {1} soilProfile {2} Layer {3} ({4}/{5}), Org ({6}/{7})", location.Name, location.Segment.Name, soilProfileProbability.SoilProfile.Name, @@ -390,15 +390,15 @@ dikeList, DamProjectType.Calamity, null, out List _)) { // Check Dike - Assert.AreEqual(1, waterBoard.Dikes.Count); + Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = waterBoard.Dikes[0]; //Check locations - Assert.AreEqual(2, dike.Locations.Count); - Assert.AreEqual(MStabZonesType.NoZones, dike.Locations[0].StabilityZoneType); - Assert.AreEqual(0.5, dike.Locations[0].ForbiddenZoneFactor, cTolerance); - Assert.AreEqual(MStabZonesType.ForbiddenZone, dike.Locations[1].StabilityZoneType); - Assert.AreEqual(0.9, dike.Locations[1].ForbiddenZoneFactor, cTolerance); + Assert.That(dike.Locations.Count, Is.EqualTo(2)); + Assert.That(dike.Locations[0].StabilityZoneType, Is.EqualTo(MStabZonesType.NoZones)); + Assert.That(dike.Locations[0].ForbiddenZoneFactor, Is.EqualTo(0.5).Within(cTolerance)); + Assert.That(dike.Locations[1].StabilityZoneType, Is.EqualTo(MStabZonesType.ForbiddenZone)); + Assert.That(dike.Locations[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(cTolerance)); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ExportTextFileTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ExportTextFileTest.cs (.../ExportTextFileTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ExportTextFileTest.cs (.../ExportTextFileTest.cs) (revision 4625) @@ -41,7 +41,7 @@ exporter.Export(); Assert.IsTrue(File.Exists("testfile.txt")); - Assert.AreEqual(testData, File.ReadAllText("testfile.txt")); + Assert.That(File.ReadAllText("testfile.txt"), Is.EqualTo(testData)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UISupport/ConfigurationManagerTest.cs (.../ConfigurationManagerTest.cs) (revision 4625) @@ -33,14 +33,14 @@ public void ReturnsCorrectAvailableDamProjectTypes() { ICollection projectTypes = ConfigurationManager.Instance.GetAvailableDamProjectTypes(); - Assert.AreEqual(2, projectTypes.Count); + Assert.That(projectTypes.Count, Is.EqualTo(2)); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanisms() { ICollection failureMechanisms = ConfigurationManager.Instance.GetAvailableFailureMechanisms(DamProjectType.Design); - Assert.AreEqual(3, failureMechanisms.Count, "DamClassicStability: Incorrect number of failuremechanisms for deterministic calculation"); + Assert.That(failureMechanisms.Count, Is.EqualTo(3), "DamClassicStability: Incorrect number of failuremechanisms for deterministic calculation"); foreach (object failureMechanism in failureMechanisms) { Assert.IsTrue(failureMechanism.Equals(FailureMechanismSystemType.Piping) || @@ -53,22 +53,22 @@ public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForDesignOption() { ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.Piping); - Assert.AreEqual(2, pipingModels.Count, "DamClassicStability: Incorrect number of models for deterministic piping calculation"); + Assert.That(pipingModels.Count, Is.EqualTo(2), "DamClassicStability: Incorrect number of models for deterministic piping calculation"); ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(3, stabilityInsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability inside calculation"); + Assert.That(stabilityInsideModels.Count, Is.EqualTo(3), "DamClassicStability: Incorrect number of models for deterministic stability inside calculation"); ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Design, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(1, stabilityOutsideModels.Count, "DamClassicStability: Incorrect number of models for deterministic stability outside calculation"); + Assert.That(stabilityOutsideModels.Count, Is.EqualTo(1), "DamClassicStability: Incorrect number of models for deterministic stability outside calculation"); } [Test] public void ReturnsCorrectAvailableDeterministicFailuremechanismModelsForCalamityOption() { ICollection pipingModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.Piping); - Assert.AreEqual(1, pipingModels.Count, "Incorrect number of models for deterministic piping calculation"); + Assert.That(pipingModels.Count, Is.EqualTo(1), "Incorrect number of models for deterministic piping calculation"); ICollection stabilityInsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(2, stabilityInsideModels.Count, "Incorrect number of models for deterministic stability inside calculation"); + Assert.That(stabilityInsideModels.Count, Is.EqualTo(2), "Incorrect number of models for deterministic stability inside calculation"); ICollection stabilityOutsideModels = ConfigurationManager.Instance.GetAvailableMechanismModels(DamProjectType.Calamity, FailureMechanismSystemType.StabilityOutside); - Assert.AreEqual(1, stabilityOutsideModels.Count, "Incorrect number of models for deterministic stability outside calculation"); + Assert.That(stabilityOutsideModels.Count, Is.EqualTo(1), "Incorrect number of models for deterministic stability outside calculation"); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs (.../ObjectMaterializerTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ObjectMaterializerTest.cs (.../ObjectMaterializerTest.cs) (revision 4625) @@ -33,7 +33,7 @@ { var materializer = new ObjectMaterializer(); materializer.Add("name", (entity, value) => entity.Name = value); - Assert.AreEqual(1, materializer.Count); + Assert.That(materializer.Count, Is.EqualTo(1)); } [Test] @@ -42,7 +42,7 @@ var materializer = new ObjectMaterializer(); materializer.Add("name", (entity, value) => entity.Name = value); materializer.Remove("name"); - Assert.AreEqual(0, materializer.Count); + Assert.That(materializer.Count, Is.EqualTo(0)); } [Test] @@ -72,8 +72,8 @@ materializer["name"](foo, "Foo's name"); materializer["age"](foo, "10"); - Assert.AreEqual(10, foo.Age); - Assert.AreEqual("Foo's name", foo.Name); + Assert.That(foo.Age, Is.EqualTo(10)); + Assert.That(foo.Name, Is.EqualTo("Foo's name")); } class Foo Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileReaderTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileReaderTest.cs (.../StiFileReaderTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/StiFileReaderTest.cs (.../StiFileReaderTest.cs) (revision 4625) @@ -71,18 +71,18 @@ .With.Message.EqualTo($"'{filePath}' is an unsupported file.")); var expectedMessage = $"Soil data in '{filePath}' is of a version of D-Geo Stability that is not supported and cannot be read."; - CollectionAssert.AreEqual(new[] + Assert.That(LogManager.Messages.Select(m => m.Message), Is.EqualTo(new[] { expectedMessage - }, LogManager.Messages.Select(m => m.Message)); - CollectionAssert.AreEqual(new[] + }).AsCollection); + Assert.That(LogManager.Messages.Select(m => m.MessageType), Is.EqualTo(new[] { LogMessageType.Error - }, LogManager.Messages.Select(m => m.MessageType)); - CollectionAssert.AreEqual(new[] + }).AsCollection); + Assert.That(LogManager.Messages.Select(m => m.Subject), Is.EqualTo(new[] { reader - }, LogManager.Messages.Select(m => m.Subject)); + }).AsCollection); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/LocationJobSymbolTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/LocationJobSymbolTest.cs (.../LocationJobSymbolTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Forms/LocationJobSymbolTest.cs (.../LocationJobSymbolTest.cs) (revision 4625) @@ -33,18 +33,18 @@ { var symbol = new LocationJobSymbol(); - Assert.AreEqual(Color.White, symbol.GetColor(double.NaN)); - Assert.AreEqual(Color.White, symbol.GetColor(-1)); - Assert.AreEqual(Color.Red, symbol.GetColor(0.1)); - Assert.AreEqual(Color.Red, symbol.GetColor(1.0)); - Assert.AreEqual(Color.Orange, symbol.GetColor(1.01)); - Assert.AreEqual(Color.Orange, symbol.GetColor(1.05)); - Assert.AreEqual(Color.Yellow, symbol.GetColor(1.06)); - Assert.AreEqual(Color.Yellow, symbol.GetColor(1.1)); - Assert.AreEqual(Color.Yellow, symbol.GetColor(1.16)); - Assert.AreEqual(Color.Lime, symbol.GetColor(1.17)); - Assert.AreEqual(Color.Lime, symbol.GetColor(1.18)); - Assert.AreEqual(Color.Gray, symbol.GetColor(99.1)); + Assert.That(symbol.GetColor(double.NaN), Is.EqualTo(Color.White)); + Assert.That(symbol.GetColor(-1), Is.EqualTo(Color.White)); + Assert.That(symbol.GetColor(0.1), Is.EqualTo(Color.Red)); + Assert.That(symbol.GetColor(1.0), Is.EqualTo(Color.Red)); + Assert.That(symbol.GetColor(1.01), Is.EqualTo(Color.Orange)); + Assert.That(symbol.GetColor(1.05), Is.EqualTo(Color.Orange)); + Assert.That(symbol.GetColor(1.06), Is.EqualTo(Color.Yellow)); + Assert.That(symbol.GetColor(1.1), Is.EqualTo(Color.Yellow)); + Assert.That(symbol.GetColor(1.16), Is.EqualTo(Color.Yellow)); + Assert.That(symbol.GetColor(1.17), Is.EqualTo(Color.Lime)); + Assert.That(symbol.GetColor(1.18), Is.EqualTo(Color.Lime)); + Assert.That(symbol.GetColor(99.1), Is.EqualTo(Color.Gray)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs (.../LineAttributeImporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LineAttributeImporterTest.cs (.../LineAttributeImporterTest.cs) (revision 4625) @@ -233,7 +233,7 @@ importer.Import(); - Assert.AreEqual(expectedValue, location.TrafficLoad); + Assert.That(location.TrafficLoad, Is.EqualTo(expectedValue)); } [Test] @@ -280,7 +280,7 @@ importer.Import(); - Assert.AreEqual(expectedValue, location.TrafficLoad); + Assert.That(location.TrafficLoad, Is.EqualTo(expectedValue)); } [Test] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/PolygonAttributeImporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/PolygonAttributeImporterTest.cs (.../PolygonAttributeImporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/PolygonAttributeImporterTest.cs (.../PolygonAttributeImporterTest.cs) (revision 4625) @@ -83,7 +83,7 @@ importer.Import(); - Assert.AreEqual(expected, target.Property1); + Assert.That(target.Property1, Is.EqualTo(expected)); } [Test] @@ -135,7 +135,7 @@ importer.Import(); - Assert.AreEqual(expected, target.Property1); + Assert.That(target.Property1, Is.EqualTo(expected)); } [Test] @@ -188,7 +188,7 @@ importer.Import(); - Assert.AreEqual(expected, target.Property1); + Assert.That(target.Property1, Is.EqualTo(expected)); } [Test] @@ -319,7 +319,7 @@ importer.Import(); - Assert.AreEqual(1, importer.Errors.OfType().Count()); + Assert.That(importer.Errors.OfType().Count(), Is.EqualTo(1)); } class MockTarget Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 4625) @@ -63,7 +63,7 @@ NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.IsTrue(nameValueParameters.Count() > 0); - Assert.AreEqual("13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TrafficLoad")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TrafficLoad")).ParameterValue, Is.EqualTo("13")); } [Test] @@ -77,7 +77,7 @@ NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.IsTrue(nameValueParameters.Count() > 0); - Assert.AreEqual("0.123", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.123")); } [Test] @@ -90,11 +90,11 @@ IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location1Id); NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); Assert.IsTrue(nameValueParameters.Count() > 0); - Assert.AreEqual("0.33", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue); + Assert.That(nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.33")); locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location22Id); - Assert.AreEqual("0.55", locationDetails.First( - x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue); + Assert.That(locationDetails.First( + x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue, Is.EqualTo("0.55")); } /*[Test] @@ -118,11 +118,11 @@ dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location275Id); - Assert.AreEqual("-1.5", locationDetails.First( - x => x.ParameterName.Equals("PenetrationLength")).ParameterValue); + Assert.That(locationDetails.First( + x => x.ParameterName.Equals("PenetrationLength")).ParameterValue, Is.EqualTo("-1.5")); locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location475Id); - Assert.AreEqual("-1", locationDetails.First( - x => x.ParameterName.Equals("PenetrationLength")).ParameterValue); + Assert.That(locationDetails.First( + x => x.ParameterName.Equals("PenetrationLength")).ParameterValue, Is.EqualTo("-1")); } private void SetupGrootSalland() Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs (.../FailureMechanismeParamatersMStabXmlHandlerTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs (.../FailureMechanismeParamatersMStabXmlHandlerTest.cs) (revision 4625) @@ -91,7 +91,7 @@ // assert Assert.IsTrue(canHandle); - Assert.AreEqual(surfaceLine2, failureMechanism.SurfaceLine); + Assert.That(failureMechanism.SurfaceLine, Is.EqualTo(surfaceLine2)); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/SpecifcationTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/SpecifcationTest.cs (.../SpecifcationTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Specifications.Tests/SpecifcationTest.cs (.../SpecifcationTest.cs) (revision 4625) @@ -60,7 +60,7 @@ const bool expected = false; bool actual = validAndNotInCollection.IsSatisfiedBy(c); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); } /// @@ -121,7 +121,7 @@ validLayers[0].Top = 1; const bool expected = false; bool actual = validLayers[0].IsSatisfiedBySpecification(new LayerHasValidTopBottomValues()); - Assert.AreEqual(expected, actual); + Assert.That(actual, Is.EqualTo(expected)); } /// @@ -161,7 +161,7 @@ // check Assert.IsTrue(vr.Any()); // <- should have at least one broken validation rule - Assert.AreEqual(vr.ElementAt(0).Text, (new LayerHasValidTopBottomValues()).Description); + Assert.That((new LayerHasValidTopBottomValues()).Description, Is.EqualTo(vr.ElementAt(0).Text)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4625) @@ -48,7 +48,7 @@ SensorLocation right = SensorLocation.Deserialize(xml); // assert - Assert.AreEqual(left.GroupID, right.GroupID); + Assert.That(right.GroupID, Is.EqualTo(left.GroupID)); } #endregion @@ -538,20 +538,20 @@ List> table = testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).ToList(); - Assert.AreEqual(5, table.ElementAt(0).Key); - Assert.AreEqual(10, table.ElementAt(1).Key); - Assert.AreEqual(12, table.ElementAt(2).Key); + Assert.That(table.ElementAt(0).Key, Is.EqualTo(5)); + Assert.That(table.ElementAt(1).Key, Is.EqualTo(10)); + Assert.That(table.ElementAt(2).Key, Is.EqualTo(12)); - Assert.AreEqual(5, table[0].Key); - Assert.AreEqual(10, table[1].Key); - Assert.AreEqual(12, table[2].Key); + Assert.That(table[0].Key, Is.EqualTo(5)); + Assert.That(table[1].Key, Is.EqualTo(10)); + Assert.That(table[2].Key, Is.EqualTo(12)); List sortedSensors = testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).Select(s => s.Value).ToList(); - Assert.AreEqual(5, sortedSensors[0].RelativeLocation); - Assert.AreEqual(10, sortedSensors[1].RelativeLocation); - Assert.AreEqual(12, sortedSensors[2].RelativeLocation); + Assert.That(sortedSensors[0].RelativeLocation, Is.EqualTo(5)); + Assert.That(sortedSensors[1].RelativeLocation, Is.EqualTo(10)); + Assert.That(sortedSensors[2].RelativeLocation, Is.EqualTo(12)); } } @@ -600,7 +600,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -670,7 +670,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -740,7 +740,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -811,7 +811,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -883,7 +883,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(polderLevel, actualValue); + Assert.That(actualValue, Is.EqualTo(polderLevel)); } [Test] @@ -906,7 +906,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -954,7 +954,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -977,7 +977,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -1025,7 +1025,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -1048,7 +1048,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -1096,7 +1096,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert - Assert.AreEqual(testValue, actualValue); + Assert.That(actualValue, Is.EqualTo(testValue)); } [Test] @@ -1119,7 +1119,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } #endregion Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4625) @@ -60,11 +60,11 @@ public void CanImportDikeData() { IEnumerable dikeList = dataPluginImporter.GetDikeRingIdList(); - Assert.AreEqual(1, dikeList.Count()); + Assert.That(dikeList.Count(), Is.EqualTo(1)); string dikeRingId = dikeList.FirstOrDefault(); dataPluginImporter.ImportDataForDikeRings(null); Info dikeInfo = dataPluginImporter.GetDikeRingInfo(dikeRingId); - Assert.AreEqual("dijkring10", dikeInfo.Name); + Assert.That(dikeInfo.Name, Is.EqualTo("dijkring10")); } [Test] @@ -74,17 +74,17 @@ dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationIdList = dataPluginImporter.GetLocationIdList(dikeRingId); - Assert.AreEqual(24, locationIdList.Count()); + Assert.That(locationIdList.Count(), Is.EqualTo(24)); Info locationInfo = dataPluginImporter.GetLocationInfo(dikeRingId, location18_6Id); - Assert.AreEqual(location18_6Id, locationInfo.Name); + Assert.That(locationInfo.Name, Is.EqualTo(location18_6Id)); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, location18_6Id); Assert.IsTrue(locationDetails.Any()); - Assert.AreEqual("dijkring10_dwp18_6", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SurfaceLineId")).ParameterValue); - Assert.AreEqual("segment_dijkring10_dwp18_6", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SegmentId")).ParameterValue); - Assert.AreEqual("192584.1", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("XRd")).ParameterValue); - Assert.AreEqual("511740.3", locationDetails.FirstOrDefault(x => x.ParameterName.Equals("YRd")).ParameterValue); + Assert.That(locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SurfaceLineId")).ParameterValue, Is.EqualTo("dijkring10_dwp18_6")); + Assert.That(locationDetails.FirstOrDefault(x => x.ParameterName.Equals("SegmentId")).ParameterValue, Is.EqualTo("segment_dijkring10_dwp18_6")); + Assert.That(locationDetails.FirstOrDefault(x => x.ParameterName.Equals("XRd")).ParameterValue, Is.EqualTo("192584.1")); + Assert.That(locationDetails.FirstOrDefault(x => x.ParameterName.Equals("YRd")).ParameterValue, Is.EqualTo("511740.3")); } [Test] @@ -94,20 +94,20 @@ dataPluginImporter.ImportDataForDikeRings(null); IEnumerable segmentIdList = dataPluginImporter.GetSegmentIdList(dikeRingId); - Assert.AreEqual(24, segmentIdList.Count()); + Assert.That(segmentIdList.Count(), Is.EqualTo(24)); IEnumerable segmentProfile1DIdList = dataPluginImporter.GetProfile1DIdListForSegment(dikeRingId, segment05_4Id, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(0, segmentProfile1DIdList.Count()); + Assert.That(segmentProfile1DIdList.Count(), Is.EqualTo(0)); IEnumerable segmentProfile2DIdList = dataPluginImporter.GetProfile2DIdListForSegment(dikeRingId, segment05_4Id, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual(1, segmentProfile2DIdList.Count()); + Assert.That(segmentProfile2DIdList.Count(), Is.EqualTo(1)); string soilProfile2DId = segmentProfile2DIdList.FirstOrDefault(); - Assert.AreEqual("10Y_054_STBI.sti", soilProfile2DId); + Assert.That(soilProfile2DId, Is.EqualTo("10Y_054_STBI.sti")); IEnumerable profileDetails = dataPluginImporter.GetSegmentProfile2DDetails(dikeRingId, segment05_4Id, soilProfile2DId, FailureMechanismSystemType.StabilityInside); - Assert.AreEqual("100", profileDetails.FirstOrDefault(x => x.ParameterName.Equals("Probability")).ParameterValue); - Assert.AreEqual("StabilityInside", profileDetails.FirstOrDefault(x => x.ParameterName.Equals("FailureMechanismType")).ParameterValue); + Assert.That(profileDetails.FirstOrDefault(x => x.ParameterName.Equals("Probability")).ParameterValue, Is.EqualTo("100")); + Assert.That(profileDetails.FirstOrDefault(x => x.ParameterName.Equals("FailureMechanismType")).ParameterValue, Is.EqualTo("StabilityInside")); } [Test] @@ -120,28 +120,28 @@ dataPluginImporter.ImportDataForDikeRings(null); IEnumerable surfaceLineIdList = dataPluginImporter.GetSurfaceLineIdList(dikeRingId); - Assert.AreEqual(13, surfaceLineIdList.Count()); + Assert.That(surfaceLineIdList.Count(), Is.EqualTo(13)); // Check begin- and endpoint of 1 surfaceline IList surfaceLinePoints = dataPluginImporter.GetSurfaceLinePoints(dikeRingId, surfaceline40_0Id); Assert.IsTrue(surfaceLinePoints.Count() > 0); - Assert.AreEqual(0.0, surfaceLinePoints[0].X, cToleranceCoordinate); - Assert.AreEqual(0.0, surfaceLinePoints[0].Y, cToleranceCoordinate); - Assert.AreEqual(-0.48, surfaceLinePoints[0].Z, cToleranceCoordinate); + Assert.That(surfaceLinePoints[0].X, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[0].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[0].Z, Is.EqualTo(-0.48).Within(cToleranceCoordinate)); int lastPointIndex = surfaceLinePoints.Count() - 1; - Assert.AreEqual(71.25, surfaceLinePoints[lastPointIndex].X, cToleranceCoordinate); - Assert.AreEqual(0.0, surfaceLinePoints[lastPointIndex].Y, cToleranceCoordinate); - Assert.AreEqual(-0.36, surfaceLinePoints[lastPointIndex].Z, cToleranceCoordinate); + Assert.That(surfaceLinePoints[lastPointIndex].X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[lastPointIndex].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(surfaceLinePoints[lastPointIndex].Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); // Check specific characteristic points of 1 surfaceline IEnumerable surfaceLineCharacteristicPoints = dataPluginImporter.GetSurfaceLineCharacteristicPoints(dikeRingId, surfaceline40_0Id); - Assert.AreEqual(13, surfaceLineIdList.Count()); + Assert.That(surfaceLineIdList.Count(), Is.EqualTo(13)); Assert.IsTrue(surfaceLineCharacteristicPoints.Count() > 0); DpCharacteristicPoint pointSurfaceLevelOutside = surfaceLineCharacteristicPoints.Where(x => x.Id.Equals("SurfaceLevelInside")).FirstOrDefault(); - Assert.AreEqual(71.25, pointSurfaceLevelOutside.X, cToleranceCoordinate); - Assert.AreEqual(0.0, pointSurfaceLevelOutside.Y, cToleranceCoordinate); - Assert.AreEqual(-0.36, pointSurfaceLevelOutside.Z, cToleranceCoordinate); + Assert.That(pointSurfaceLevelOutside.X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); + Assert.That(pointSurfaceLevelOutside.Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); + Assert.That(pointSurfaceLevelOutside.Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); DpCharacteristicPoint pointDitchPolderSide = surfaceLineCharacteristicPoints.Where(x => x.Id.Equals("DitchPolderSide")).FirstOrDefault(); Assert.IsNull(pointDitchPolderSide.Id); @@ -157,17 +157,17 @@ dataPluginImporter.ImportDataForDikeRings(null); IEnumerable soilProfile1DIdList = dataPluginImporter.GetSoilProfile1DIdList(dikeRingId); - Assert.AreEqual(26, soilProfile1DIdList.Count()); + Assert.That(soilProfile1DIdList.Count(), Is.EqualTo(26)); DpSoilProfile soilProfile = dataPluginImporter.GetSoilProfile1DDetails(dikeRingId, soilprofile10Y_149_STBI_pId); - Assert.AreEqual(4, soilProfile.Layers.Count()); - Assert.AreEqual(60.0, soilProfile.Layers[0].TopLevel, cToleranceCoordinate); - Assert.AreEqual("klei", soilProfile.Layers[0].SoilName); - Assert.AreEqual(-3.2, soilProfile.Layers[1].TopLevel, cToleranceCoordinate); - Assert.AreEqual("veen", soilProfile.Layers[1].SoilName); - Assert.AreEqual(-5.0, soilProfile.Layers[2].TopLevel, cToleranceCoordinate); - Assert.AreEqual("WL_zand", soilProfile.Layers[2].SoilName); - Assert.AreEqual(-25.0, soilProfile.Layers[3].TopLevel, cToleranceCoordinate); - Assert.AreEqual("DummyForBottomLevel", soilProfile.Layers[3].SoilName); + Assert.That(soilProfile.Layers.Count(), Is.EqualTo(4)); + Assert.That(soilProfile.Layers[0].TopLevel, Is.EqualTo(60.0).Within(cToleranceCoordinate)); + Assert.That(soilProfile.Layers[0].SoilName, Is.EqualTo("klei")); + Assert.That(soilProfile.Layers[1].TopLevel, Is.EqualTo(-3.2).Within(cToleranceCoordinate)); + Assert.That(soilProfile.Layers[1].SoilName, Is.EqualTo("veen")); + Assert.That(soilProfile.Layers[2].TopLevel, Is.EqualTo(-5.0).Within(cToleranceCoordinate)); + Assert.That(soilProfile.Layers[2].SoilName, Is.EqualTo("WL_zand")); + Assert.That(soilProfile.Layers[3].TopLevel, Is.EqualTo(-25.0).Within(cToleranceCoordinate)); + Assert.That(soilProfile.Layers[3].SoilName, Is.EqualTo("DummyForBottomLevel")); } [Test] @@ -179,19 +179,19 @@ dataPluginImporter.ImportDataForDikeRings(null); List scenarioList = dataPluginImporter.GetScenarioList(dikeRingId, location18_6Id).ToList(); - Assert.AreEqual(1, scenarioList.Count()); + Assert.That(scenarioList.Count(), Is.EqualTo(1)); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, location18_6Id, "1"); foreach (NameValueParameter nameValue in scenarioDetails) { switch (nameValue.ParameterName) { case "WaterLevel": - Assert.AreEqual(1.5, Convert.ToDouble(nameValue.ParameterValue), cToleranceDimension); + Assert.That(Convert.ToDouble(nameValue.ParameterValue), Is.EqualTo(1.5).Within(cToleranceDimension)); break; case "DikeTableHeight": - Assert.AreEqual(2, Convert.ToDouble(nameValue.ParameterValue), cToleranceDimension); + Assert.That(Convert.ToDouble(nameValue.ParameterValue), Is.EqualTo(2).Within(cToleranceDimension)); break; } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs (.../Geometry.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Geometry.cs (.../Geometry.cs) (revision 4625) @@ -36,7 +36,7 @@ { var geom = Feature.Create(geomWktTestString); Assert.IsNotNull(geom); - Assert.AreEqual(geomWktTestString, geom.WktFormat); + Assert.That(geom.WktFormat, Is.EqualTo(geomWktTestString)); } [Test] @@ -45,7 +45,7 @@ const string geomWkt = "POINT (0 0)"; var geom = Feature.Create(geomWkt); Assert.IsNotNull(geom); - Assert.AreEqual(geomWkt, geom.WktFormat); + Assert.That(geom.WktFormat, Is.EqualTo(geomWkt)); Assert.IsInstanceOf(typeof(Point), geom.Geometry); } @@ -56,7 +56,7 @@ var geom = Feature.Create(geomWkt); Assert.IsNotNull(geom); Assert.IsNotNull(geom.Id); - Assert.AreNotEqual(Guid.Empty, geom.Id); + Assert.That(geom.Id, Is.Not.EqualTo(Guid.Empty)); } [Test] @@ -68,7 +68,7 @@ const string testvalue = "testvalue"; geom.AddAttribute("test", testvalue); - Assert.AreEqual(testvalue, geom["test"]); + Assert.That(geom["test"], Is.EqualTo(testvalue)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamProjectTest.cs (.../DamProjectTest.cs) (revision 4625) @@ -33,7 +33,7 @@ { DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InApplicationMap; string projectWorkingPath = DamProject.ProjectWorkingPath; - Assert.AreEqual(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation", projectWorkingPath); + Assert.That(projectWorkingPath, Is.EqualTo(Path.GetDirectoryName(typeof(DamProject).Assembly.Location) + @"\DamCalculation")); } [Test] @@ -43,7 +43,7 @@ DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InUserMap; DamProject.UserWorkingPath = userProjectPath; string projectWorkingPath = DamProject.ProjectWorkingPath; - Assert.AreEqual(userProjectPath, projectWorkingPath); + Assert.That(projectWorkingPath, Is.EqualTo(userProjectPath)); } [Test] @@ -55,7 +55,7 @@ damProject.ProjectFileName = cProjectFilename; DamProject.ProjectWorkingPathLocation = ProjectPathLocation.InProjectMap; string projectWorkingPath = DamProject.ProjectWorkingPath; - Assert.AreEqual(cProjectWorkingPath, projectWorkingPath); + Assert.That(projectWorkingPath, Is.EqualTo(cProjectWorkingPath)); } [Test] @@ -64,7 +64,7 @@ var projectFilename = "Delfland.damx"; var mapName = @"..\..\geometries\"; string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 2); - Assert.AreEqual(@"Delfland.geometries2D.2\", newMapname); + Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.2\")); } [Test] @@ -73,7 +73,7 @@ var projectFilename = "Delfland.damx"; var mapName = @"Delfland.geometries2D.10\"; string newMapname = DamProject.CreateNewGeometry2DMapname(projectFilename, mapName, 10); - Assert.AreEqual(@"Delfland.geometries2D.10\", newMapname); + Assert.That(newMapname, Is.EqualTo(@"Delfland.geometries2D.10\")); } [Test] @@ -89,8 +89,8 @@ }); damProject.DamProjectData.WaterBoard.Dikes.Add(new Dike()); damProject.AssignGeometry2DMapnameIfNotAssigned(mapName2); - Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D); - Assert.AreEqual(mapName1, damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D); - Assert.AreEqual(mapName2, damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D); + Assert.That(damProject.DamProjectData.WaterBoard.Dikes[0].MapForSoilGeometries2D, Is.EqualTo(mapName2)); + Assert.That(damProject.DamProjectData.WaterBoard.Dikes[1].MapForSoilGeometries2D, Is.EqualTo(mapName1)); + Assert.That(damProject.DamProjectData.WaterBoard.Dikes[2].MapForSoilGeometries2D, Is.EqualTo(mapName2)); } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvExportSurfaceLineTest.cs (.../CsvExportSurfaceLineTest.cs) (revision 4625) @@ -97,7 +97,7 @@ } surfaceLine.Name = surfaceLineRecord.SurfaceLineId; - Assert.AreEqual(orgSurfaceLineString, surfaceLine.ToString()); + Assert.That(surfaceLine.ToString(), Is.EqualTo(orgSurfaceLineString)); } } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs (.../DikeCoordinateSystemConverterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeCoordinateSystemConverterTest.cs (.../DikeCoordinateSystemConverterTest.cs) (revision 4625) @@ -187,7 +187,7 @@ { using (SurfaceLine2 expectedLocalSurfaceLine = CreateResultingLocalSurfaceLine()) { - Assert.AreEqual(expectedLocalSurfaceLine.Geometry.Count, localSurfaceLine.Geometry.Points.Count, String.Format("Surfaceline line {0}", localSurfaceLine.Name)); + Assert.That(localSurfaceLine.Geometry.Points.Count, Is.EqualTo(expectedLocalSurfaceLine.Geometry.Count), String.Format("Surfaceline line {0}", localSurfaceLine.Name)); for (var pointIndex = 0; pointIndex < localSurfaceLine.Geometry.Points.Count; pointIndex++) { Assert.IsTrue(localSurfaceLine.Geometry.Points[pointIndex].LocationEquals(expectedLocalSurfaceLine.Geometry.Points[pointIndex]), @@ -203,7 +203,7 @@ private void CheckResultingLocalPL1Line(PL1Line localPL1Line) { PL1Line expectedLocalPL1Line = CreateResultingLocalPL1Line(); - Assert.AreEqual(expectedLocalPL1Line.Points.Count, localPL1Line.Points.Count, String.Format("PL1 line {0}", localPL1Line.Name)); + Assert.That(localPL1Line.Points.Count, Is.EqualTo(expectedLocalPL1Line.Points.Count), String.Format("PL1 line {0}", localPL1Line.Name)); for (var pointIndex = 0; pointIndex < localPL1Line.Points.Count; pointIndex++) { Assert.IsTrue(localPL1Line.Points[pointIndex].LocationEquals(expectedLocalPL1Line.Points[pointIndex]), Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs (.../TimeSerieCollectionTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSerieCollectionTest.cs (.../TimeSerieCollectionTest.cs) (revision 4625) @@ -100,14 +100,14 @@ Assert.IsTrue(timeSerie.ParameterId.Equals("Cat speed", StringComparison.InvariantCultureIgnoreCase)); Assert.IsTrue(timeSerie.LocationId.Equals("LOC-04", StringComparison.InvariantCultureIgnoreCase)); - Assert.AreEqual(0, timeSerieCollection.Series.IndexOf(timeSerie)); + Assert.That(timeSerieCollection.Series.IndexOf(timeSerie), Is.EqualTo(0)); timeSerie = timeSerieCollection.FindSerie("Dog speed", "LOC-27"); Assert.IsTrue(timeSerie.ParameterId.Equals("Dog speed", StringComparison.InvariantCultureIgnoreCase)); Assert.IsTrue(timeSerie.LocationId.Equals("LOC-27", StringComparison.InvariantCultureIgnoreCase)); - Assert.AreEqual(3, timeSerieCollection.Series.IndexOf(timeSerie)); + Assert.That(timeSerieCollection.Series.IndexOf(timeSerie), Is.EqualTo(3)); timeSerie = timeSerieCollection.FindSerie("OvertoppingRate", "LOC-27"); Assert.IsTrue(timeSerie.ParameterId.Equals("OvertoppingRate", StringComparison.InvariantCultureIgnoreCase)); @@ -118,26 +118,26 @@ public void TestSeriesAtLocation() { IEnumerable serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-04"); - Assert.AreEqual(2, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(2)); serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-27"); - Assert.AreEqual(3, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(3)); serieCollection = timeSerieCollection.GetSeriesByLocationId("LOC-36"); - Assert.AreEqual(0, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(0)); } [Test] public void TestSeriesOfParameter() { IEnumerable serieCollection = timeSerieCollection.GetSeriesByParameterId("Cat Speed"); - Assert.AreEqual(3, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(3)); serieCollection = timeSerieCollection.GetSeriesByParameterId("Dog Speed"); - Assert.AreEqual(2, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(2)); serieCollection = timeSerieCollection.GetSeriesByParameterId("Bird Speed"); - Assert.AreEqual(0, serieCollection.Count()); + Assert.That(serieCollection.Count(), Is.EqualTo(0)); } [Test] @@ -160,8 +160,8 @@ timeSerie1.Entries.Add(timeSerieEntry2); collection.Series.Add(timeSerie1); collection.UpdateAllEntryValues("test", x => x + 1); - Assert.AreEqual(2, collection.Series[0].Entries[0].Value); - Assert.AreEqual(3, collection.Series[0].Entries[1].Value); + Assert.That(collection.Series[0].Entries[0].Value, Is.EqualTo(2)); + Assert.That(collection.Series[0].Entries[1].Value, Is.EqualTo(3)); } [Test] @@ -194,11 +194,11 @@ collection.Series.Add(timeSerie1); IEnumerable newCollection = collection.Map(locationId, parameterId, timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2))); - Assert.AreEqual(1, newCollection.Count()); + Assert.That(newCollection.Count(), Is.EqualTo(1)); TimeSerie newTimeSerie = newCollection.ElementAt(0); - Assert.AreEqual(2, newTimeSerie.Entries.Count); - Assert.AreEqual(2, newTimeSerie.Entries[0].Value); - Assert.AreEqual(4, newTimeSerie.Entries[1].Value); + Assert.That(newTimeSerie.Entries.Count, Is.EqualTo(2)); + Assert.That(newTimeSerie.Entries[0].Value, Is.EqualTo(2)); + Assert.That(newTimeSerie.Entries[1].Value, Is.EqualTo(4)); } [Test] @@ -231,10 +231,10 @@ collection.Series.Add(timeSerie1); IEnumerable newCollection = collection.Map(locationId1, parameterId, timeSerie => timeSerie.Map(timeSerieEntry => timeSerieEntry.Map(entry => entry.Value * 2))); - Assert.AreEqual(1, newCollection.Count()); + Assert.That(newCollection.Count(), Is.EqualTo(1)); TimeSerie newTimeSerie = newCollection.ElementAt(0); - Assert.AreEqual(1, newTimeSerie.Entries.Count); - Assert.AreEqual(2, newTimeSerie.Entries[0].Value); + Assert.That(newTimeSerie.Entries.Count, Is.EqualTo(1)); + Assert.That(newTimeSerie.Entries[0].Value, Is.EqualTo(2)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/GroupTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/GroupTest.cs (.../GroupTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/GroupTest.cs (.../GroupTest.cs) (revision 4625) @@ -68,7 +68,7 @@ Group group2 = Group.Deserialize(xml); // assert - Assert.AreEqual(group1.ID, group2.ID); + Assert.That(group2.ID, Is.EqualTo(group1.ID)); //Assert.AreEqual(group2.Selection.Count(), group2.SensorRelativeLocations.Count()); foreach (Sensor sensor in group1.Selection) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs =================================================================== diff -u -r4614 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 4614) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamCalculationBenchmarkTest.cs (.../DamCalculationBenchmarkTest.cs) (revision 4625) @@ -55,9 +55,9 @@ { using (DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename)) { - Assert.AreEqual(1, damProjectData.WaterBoard.Dikes.Count); + Assert.That(damProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = damProjectData.WaterBoard.Dikes[0]; - Assert.AreEqual(expectedLocations, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(expectedLocations)); // Specify calculation damProjectData.MaxCalculationCores = maxCores; @@ -114,9 +114,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1); Assert.IsTrue(allCalculationResults[0].IsUplift.Value); - Assert.AreEqual(1.024, allCalculationResults[0].Pl3MinUplift.Value, tolerance3Decimals); - Assert.AreEqual(49.100, allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, - tolerance3Decimals); + Assert.That(allCalculationResults[0].Pl3MinUplift.Value, Is.EqualTo(1.024).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, + Is.EqualTo(49.100).Within(tolerance3Decimals)); } /// @@ -132,9 +132,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1); Assert.IsTrue(allCalculationResults[0].IsUplift.Value); - Assert.AreEqual(0.906, allCalculationResults[0].Pl3MinUplift.Value, tolerance3Decimals); - Assert.AreEqual(-1.289, allCalculationResults[0].Pl3HeadAdjusted.Value, tolerance3Decimals); - Assert.AreEqual(49.100, allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].Pl3MinUplift.Value, Is.EqualTo(0.906).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3HeadAdjusted.Value, Is.EqualTo(-1.289).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, Is.EqualTo(49.100).Within(tolerance3Decimals)); } /// @@ -150,9 +150,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1); Assert.IsTrue(allCalculationResults[0].IsUplift.Value); - Assert.AreEqual(1.000, allCalculationResults[0].Pl3MinUplift.Value, tolerance3Decimals); - Assert.AreEqual(-1.289, allCalculationResults[0].Pl3HeadAdjusted.Value, tolerance3Decimals); - Assert.AreEqual(49.100, allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].Pl3MinUplift.Value, Is.EqualTo(1.000).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3HeadAdjusted.Value, Is.EqualTo(-1.289).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, Is.EqualTo(49.100).Within(tolerance3Decimals)); } /// @@ -168,9 +168,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cFolderName, MStabModelType.UpliftVan, 1); Assert.IsTrue(allCalculationResults[0].IsUplift.Value); - Assert.AreEqual(0.969, allCalculationResults[0].Pl3MinUplift.Value, tolerance3Decimals); - Assert.AreEqual(-1.638, allCalculationResults[0].Pl3HeadAdjusted.Value, tolerance3Decimals); - Assert.AreEqual(49.100, allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].Pl3MinUplift.Value, Is.EqualTo(0.969).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3HeadAdjusted.Value, Is.EqualTo(-1.638).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, Is.EqualTo(49.100).Within(tolerance3Decimals)); } /// @@ -187,8 +187,8 @@ bool? isUplift = allCalculationResults[0].IsUplift; Assert.IsFalse(isUplift != null && isUplift.Value); - Assert.AreEqual(null, allCalculationResults[0].Pl3MinUplift); - Assert.AreEqual(null, allCalculationResults[0].Pl3LocalLocationXMinUplift); + Assert.That(allCalculationResults[0].Pl3MinUplift, Is.EqualTo(null)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift, Is.EqualTo(null)); } /// @@ -205,9 +205,9 @@ Assert.IsTrue(allCalculationResults[0].IsUplift.Value); // Values at bottom ditch dikeside - Assert.AreEqual(0.820, allCalculationResults[0].Pl3MinUplift.Value, tolerance3Decimals); - Assert.AreEqual(-1.289, allCalculationResults[0].Pl3HeadAdjusted.Value, tolerance3Decimals); - Assert.AreEqual(49.100, allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].Pl3MinUplift.Value, Is.EqualTo(0.820).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3HeadAdjusted.Value, Is.EqualTo(-1.289).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[0].Pl3LocalLocationXMinUplift.Value, Is.EqualTo(49.100).Within(tolerance3Decimals)); } /// @@ -224,9 +224,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cDikeFolder, MStabModelType.Bishop, 1, maxCores); // Following values are just taken from the Geo Stability calculation and not manually calculated - Assert.AreEqual(0.785, allCalculationResults[0].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.998, allCalculationResults[1].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.792, allCalculationResults[2].StabilitySafetyFactor.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.785).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(0.998).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(0.792).Within(tolerance3Decimals)); } /// @@ -243,9 +243,9 @@ List allCalculationResults = ComputeStabilityInsideProject(cDikeFolder, MStabModelType.UpliftVan, 1, maxCores); // Following values are just taken from the Geo Stability calculation and not manually calculated - Assert.AreEqual(0.696, allCalculationResults[0].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.964, allCalculationResults[1].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.738, allCalculationResults[2].StabilitySafetyFactor.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.696).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(0.964).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(0.738).Within(tolerance3Decimals)); } /// @@ -263,37 +263,37 @@ List allCalculationResults = ComputeStabilityInsideProject(cDikeFolder, MStabModelType.UpliftVan, 10, maxCores); // Following values are just taken from the Geo Stability calculation and not manually calculated - Assert.AreEqual(30, allCalculationResults.Count); - Assert.AreEqual(0.696, allCalculationResults[0].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.964, allCalculationResults[1].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.738, allCalculationResults[2].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.695, allCalculationResults[3].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.962, allCalculationResults[4].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.737, allCalculationResults[5].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.694, allCalculationResults[6].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.961, allCalculationResults[7].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.734, allCalculationResults[8].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.693, allCalculationResults[9].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.960, allCalculationResults[10].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.732, allCalculationResults[11].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.692, allCalculationResults[12].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.959, allCalculationResults[13].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.732, allCalculationResults[14].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.692, allCalculationResults[15].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.959, allCalculationResults[16].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.731, allCalculationResults[17].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.690, allCalculationResults[18].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.957, allCalculationResults[19].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.729, allCalculationResults[20].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.689, allCalculationResults[21].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.957, allCalculationResults[22].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.728, allCalculationResults[23].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.688, allCalculationResults[24].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.956, allCalculationResults[25].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.726, allCalculationResults[26].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.687, allCalculationResults[27].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.954, allCalculationResults[28].StabilitySafetyFactor.Value, tolerance3Decimals); - Assert.AreEqual(0.725, allCalculationResults[29].StabilitySafetyFactor.Value, tolerance3Decimals); + Assert.That(allCalculationResults.Count, Is.EqualTo(30)); + Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.696).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[1].StabilitySafetyFactor.Value, Is.EqualTo(0.964).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[2].StabilitySafetyFactor.Value, Is.EqualTo(0.738).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[3].StabilitySafetyFactor.Value, Is.EqualTo(0.695).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[4].StabilitySafetyFactor.Value, Is.EqualTo(0.962).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[5].StabilitySafetyFactor.Value, Is.EqualTo(0.737).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[6].StabilitySafetyFactor.Value, Is.EqualTo(0.694).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[7].StabilitySafetyFactor.Value, Is.EqualTo(0.961).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[8].StabilitySafetyFactor.Value, Is.EqualTo(0.734).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[9].StabilitySafetyFactor.Value, Is.EqualTo(0.693).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[10].StabilitySafetyFactor.Value, Is.EqualTo(0.960).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[11].StabilitySafetyFactor.Value, Is.EqualTo(0.732).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[12].StabilitySafetyFactor.Value, Is.EqualTo(0.692).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[13].StabilitySafetyFactor.Value, Is.EqualTo(0.959).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[14].StabilitySafetyFactor.Value, Is.EqualTo(0.732).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[15].StabilitySafetyFactor.Value, Is.EqualTo(0.692).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[16].StabilitySafetyFactor.Value, Is.EqualTo(0.959).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[17].StabilitySafetyFactor.Value, Is.EqualTo(0.731).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[18].StabilitySafetyFactor.Value, Is.EqualTo(0.690).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[19].StabilitySafetyFactor.Value, Is.EqualTo(0.957).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[20].StabilitySafetyFactor.Value, Is.EqualTo(0.729).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[21].StabilitySafetyFactor.Value, Is.EqualTo(0.689).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[22].StabilitySafetyFactor.Value, Is.EqualTo(0.957).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[23].StabilitySafetyFactor.Value, Is.EqualTo(0.728).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[24].StabilitySafetyFactor.Value, Is.EqualTo(0.688).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[25].StabilitySafetyFactor.Value, Is.EqualTo(0.956).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[26].StabilitySafetyFactor.Value, Is.EqualTo(0.726).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[27].StabilitySafetyFactor.Value, Is.EqualTo(0.687).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[28].StabilitySafetyFactor.Value, Is.EqualTo(0.954).Within(tolerance3Decimals)); + Assert.That(allCalculationResults[29].StabilitySafetyFactor.Value, Is.EqualTo(0.725).Within(tolerance3Decimals)); } /// @@ -309,7 +309,7 @@ RemoveCalculationDirectoriesForProject(cFolderName); Assert.IsTrue(allCalculationResults[0].IsUplift.Value); - Assert.AreEqual(0.767, allCalculationResults[0].StabilitySafetyFactor.Value, tolerance3Decimals); + Assert.That(allCalculationResults[0].StabilitySafetyFactor.Value, Is.EqualTo(0.767).Within(tolerance3Decimals)); } #endregion Uplift Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/SoilGeometryTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/SoilGeometryTests.cs (.../SoilGeometryTests.cs) (revision 4625) @@ -39,17 +39,17 @@ public void CanEvaluateToSoilGeometry1D() { var soilGeometry = new SoilGeometry(new SoilProfile1D(), null); - Assert.AreEqual(SoilProfileType.SoilProfile1D, soilGeometry.SoilProfileType); + Assert.That(soilGeometry.SoilProfileType, Is.EqualTo(SoilProfileType.SoilProfile1D)); soilGeometry = new SoilGeometry(new SoilProfile1D(), "Geometry2dName"); - Assert.AreEqual(SoilProfileType.SoilProfile1D, soilGeometry.SoilProfileType); + Assert.That(soilGeometry.SoilProfileType, Is.EqualTo(SoilProfileType.SoilProfile1D)); } [Test] public void CanEvaluateToSoilGeometry2D() { var soilGeometry = new SoilGeometry(null, "Geometry2dName"); - Assert.AreEqual(SoilProfileType.SoilGeometryStiFile, soilGeometry.SoilProfileType); + Assert.That(soilGeometry.SoilProfileType, Is.EqualTo(SoilProfileType.SoilGeometryStiFile)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PLLineTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PLLineTest.cs (.../PLLineTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PLLineTest.cs (.../PLLineTest.cs) (revision 4625) @@ -89,16 +89,16 @@ }); IEnumerable result = surfaceLine.GetPointSegmentBetween(0.4, 13); - Assert.AreEqual(4, result.Count()); + Assert.That(result.Count(), Is.EqualTo(4)); result = surfaceLine.GetPointSegmentBetween(0.6, 11); - Assert.AreEqual(4, result.Count()); + Assert.That(result.Count(), Is.EqualTo(4)); result = surfaceLine.GetPointSegmentBetween(10, 10); - Assert.AreEqual(0, result.Count()); + Assert.That(result.Count(), Is.EqualTo(0)); result = surfaceLine.GetPointSegmentBetween(15, 16); - Assert.AreEqual(0, result.Count()); + Assert.That(result.Count(), Is.EqualTo(0)); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs (.../TimeSeriesAssemblerTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeriesAssemblerTest.cs (.../TimeSeriesAssemblerTest.cs) (revision 4625) @@ -178,103 +178,103 @@ XNamespace tns = assembler.ElementNamespace; // Version - Assert.AreEqual("1.2", doc.Root.AttributeAs(TimeSeriesAssembler.XmlVersionAttributeName)); + Assert.That(doc.Root.AttributeAs(TimeSeriesAssembler.XmlVersionAttributeName), Is.EqualTo("1.2")); // Time zone - Assert.AreEqual(4.75, - Double.Parse(doc.Root.Element(tns + TimeSeriesAssembler.XmlTimeZoneElementName).Value, - CultureInfo.InvariantCulture)); + Assert.That(Double.Parse(doc.Root.Element(tns + TimeSeriesAssembler.XmlTimeZoneElementName).Value, + CultureInfo.InvariantCulture), + Is.EqualTo(4.75)); // Series XElement[] serieElements = doc.Root.Elements(tns + TimeSeriesAssembler.XmlSeriesElementName).ToArray(); - Assert.AreEqual(2, serieElements.Count()); + Assert.That(serieElements.Count(), Is.EqualTo(2)); XElement headerElement = serieElements[0].Element(tns + TimeSeriesAssembler.XmlHeaderElementName); // Header (0) - Assert.AreEqual("accumulative", headerElement.Element(tns + TimeSeriesAssembler.XmlTypeElementName).Value); - Assert.AreEqual("LLANFAIR-04", - headerElement.Element(tns + TimeSeriesAssembler.XmlLocationIdElementName).Value); - Assert.AreEqual("Train speed", - headerElement.Element(tns + TimeSeriesAssembler.XmlParameterIdElementName).Value); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlTypeElementName).Value, Is.EqualTo("accumulative")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlLocationIdElementName).Value, + Is.EqualTo("LLANFAIR-04")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlParameterIdElementName).Value, + Is.EqualTo("Train speed")); XElement timeStepElement = headerElement.Element(tns + TimeSeriesAssembler.XmlTimeStepElementName); - Assert.AreEqual("hour", timeStepElement.AttributeAs(TimeSeriesAssembler.XmlUnitAttributeName)); - Assert.AreEqual(60, timeStepElement.AttributeAs(TimeSeriesAssembler.XmlDividerAttributeName)); - Assert.AreEqual(12, timeStepElement.AttributeAs(TimeSeriesAssembler.XmlMultiplierAttributeName)); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlUnitAttributeName), Is.EqualTo("hour")); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlDividerAttributeName), Is.EqualTo(60)); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlMultiplierAttributeName), Is.EqualTo(12)); XElement startDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlStartDateElementName); - Assert.AreEqual("2009-04-13", startDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("11:51:42", startDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); + Assert.That(startDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-04-13")); + Assert.That(startDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("11:51:42")); XElement endDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlEndDateElementName); - Assert.AreEqual("2009-05-18", endDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("22:04:16", endDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(82.9, - Double.Parse(headerElement.Element(tns + TimeSeriesAssembler.XmlMissValElementName).Value, - CultureInfo.InvariantCulture)); - Assert.AreEqual("Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch", - headerElement.Element(tns + TimeSeriesAssembler.XmlLongNameElementName).Value); - Assert.AreEqual("Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch Railway Station", - headerElement.Element(tns + TimeSeriesAssembler.XmlStationNameElementName).Value); - Assert.AreEqual("mph", headerElement.Element(tns + TimeSeriesAssembler.XmlUnitsElementName).Value); - Assert.AreEqual("British Rail", - headerElement.Element(tns + TimeSeriesAssembler.XmlSourceOrganisationElementName).Value); - Assert.AreEqual("British railroad system", - headerElement.Element(tns + TimeSeriesAssembler.XmlSourceSystemElementName).Value); - Assert.AreEqual("Llanfair trains", - headerElement.Element(tns + TimeSeriesAssembler.XmlFileDescriptionElementName).Value); - Assert.AreEqual("2009-06-03", - headerElement.Element(tns + TimeSeriesAssembler.XmlCreationDateElementName).Value); - Assert.AreEqual("11:54:17", - headerElement.Element(tns + TimeSeriesAssembler.XmlCreationTimeElementName).Value); - Assert.AreEqual("North Wales", headerElement.Element(tns + TimeSeriesAssembler.XmlRegionElementName).Value); + Assert.That(endDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-05-18")); + Assert.That(endDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("22:04:16")); + Assert.That(Double.Parse(headerElement.Element(tns + TimeSeriesAssembler.XmlMissValElementName).Value, + CultureInfo.InvariantCulture), + Is.EqualTo(82.9)); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlLongNameElementName).Value, + Is.EqualTo("Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlStationNameElementName).Value, + Is.EqualTo("Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch Railway Station")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlUnitsElementName).Value, Is.EqualTo("mph")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceOrganisationElementName).Value, + Is.EqualTo("British Rail")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlSourceSystemElementName).Value, + Is.EqualTo("British railroad system")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlFileDescriptionElementName).Value, + Is.EqualTo("Llanfair trains")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationDateElementName).Value, + Is.EqualTo("2009-06-03")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlCreationTimeElementName).Value, + Is.EqualTo("11:54:17")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlRegionElementName).Value, Is.EqualTo("North Wales")); // Entries (0) XElement[] entryElements = serieElements[0].Elements(tns + TimeSeriesAssembler.XmlEntryElementName).ToArray(); - Assert.AreEqual(4, entryElements.Count()); + Assert.That(entryElements.Count(), Is.EqualTo(4)); - Assert.AreEqual("2009-04-13", entryElements[0].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("11:51:42", entryElements[0].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(103.7, entryElements[0].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(0, entryElements[0].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-04-13", entryElements[1].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("12:51:42", entryElements[1].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(88.4, entryElements[1].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(1, entryElements[1].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-04-13", entryElements[2].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:51:42", entryElements[2].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(120.53, entryElements[2].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(1, entryElements[2].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-04-13", entryElements[3].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("14:51:42", entryElements[3].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(108.5, entryElements[3].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(2, entryElements[3].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-04-13")); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("11:51:42")); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(103.7)); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(0)); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-04-13")); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("12:51:42")); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(88.4)); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(1)); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-04-13")); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:51:42")); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(120.53)); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(1)); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-04-13")); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("14:51:42")); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(108.5)); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(2)); // Comment (0) - Assert.AreEqual("Who knows how to pronounce Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch?", - serieElements[0].Element(tns + TimeSeriesAssembler.XMLCommentElementName).Value); + Assert.That(serieElements[0].Element(tns + TimeSeriesAssembler.XMLCommentElementName).Value, + Is.EqualTo("Who knows how to pronounce Llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch?")); headerElement = serieElements[1].Element(tns + TimeSeriesAssembler.XmlHeaderElementName); // Header (1) - Assert.AreEqual("instantaneous", headerElement.Element(tns + TimeSeriesAssembler.XmlTypeElementName).Value); - Assert.AreEqual("GORSAF-13", headerElement.Element(tns + TimeSeriesAssembler.XmlLocationIdElementName).Value); - Assert.AreEqual("Bus speed", - headerElement.Element(tns + TimeSeriesAssembler.XmlParameterIdElementName).Value); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlTypeElementName).Value, Is.EqualTo("instantaneous")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlLocationIdElementName).Value, Is.EqualTo("GORSAF-13")); + Assert.That(headerElement.Element(tns + TimeSeriesAssembler.XmlParameterIdElementName).Value, + Is.EqualTo("Bus speed")); timeStepElement = headerElement.Element(tns + TimeSeriesAssembler.XmlTimeStepElementName); - Assert.AreEqual("minute", timeStepElement.AttributeAs(TimeSeriesAssembler.XmlUnitAttributeName)); - Assert.AreEqual(35, timeStepElement.AttributeAs(TimeSeriesAssembler.XmlDividerAttributeName)); - Assert.AreEqual(18, timeStepElement.AttributeAs(TimeSeriesAssembler.XmlMultiplierAttributeName)); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlUnitAttributeName), Is.EqualTo("minute")); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlDividerAttributeName), Is.EqualTo(35)); + Assert.That(timeStepElement.AttributeAs(TimeSeriesAssembler.XmlMultiplierAttributeName), Is.EqualTo(18)); startDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlStartDateElementName); - Assert.AreEqual("2009-03-29", startDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:04:17", startDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); + Assert.That(startDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(startDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:04:17")); endDateElement = headerElement.Element(tns + TimeSeriesAssembler.XmlEndDateElementName); - Assert.AreEqual("2009-05-04", endDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("08:52:37", endDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(109.17, - Double.Parse(headerElement.Element(tns + TimeSeriesAssembler.XmlMissValElementName).Value, - CultureInfo.InvariantCulture)); + Assert.That(endDateElement.AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-05-04")); + Assert.That(endDateElement.AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("08:52:37")); + Assert.That(Double.Parse(headerElement.Element(tns + TimeSeriesAssembler.XmlMissValElementName).Value, + CultureInfo.InvariantCulture), + Is.EqualTo(109.17)); Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlLongNameElementName)); Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlStationNameElementName)); Assert.IsNull(headerElement.Element(tns + TimeSeriesAssembler.XmlUnitsElementName)); @@ -288,32 +288,32 @@ // Entries (1) entryElements = serieElements[1].Elements(tns + TimeSeriesAssembler.XmlEntryElementName).ToArray(); - Assert.AreEqual(6, entryElements.Count()); + Assert.That(entryElements.Count(), Is.EqualTo(6)); - Assert.AreEqual("2009-03-29", entryElements[0].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:04:17", entryElements[0].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(45.7, entryElements[0].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(0, entryElements[0].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-03-29", entryElements[1].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:05:17", entryElements[1].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(55.4, entryElements[1].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(1, entryElements[1].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-03-29", entryElements[2].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:06:17", entryElements[2].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(80.57, entryElements[2].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(1, entryElements[2].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-03-29", entryElements[3].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:07:17", entryElements[3].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(120.45, entryElements[3].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(3, entryElements[3].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-03-29", entryElements[4].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:08:17", entryElements[4].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(108.45, entryElements[4].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(1, entryElements[4].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); - Assert.AreEqual("2009-03-29", entryElements[5].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName)); - Assert.AreEqual("13:09:17", entryElements[5].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName)); - Assert.AreEqual(115.6, entryElements[5].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName)); - Assert.AreEqual(2, entryElements[5].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName)); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:04:17")); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(45.7)); + Assert.That(entryElements[0].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(0)); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:05:17")); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(55.4)); + Assert.That(entryElements[1].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(1)); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:06:17")); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(80.57)); + Assert.That(entryElements[2].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(1)); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:07:17")); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(120.45)); + Assert.That(entryElements[3].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(3)); + Assert.That(entryElements[4].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[4].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:08:17")); + Assert.That(entryElements[4].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(108.45)); + Assert.That(entryElements[4].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(1)); + Assert.That(entryElements[5].AttributeAs(TimeSeriesAssembler.XmlDateAttributeName), Is.EqualTo("2009-03-29")); + Assert.That(entryElements[5].AttributeAs(TimeSeriesAssembler.XmlTimeAttributeName), Is.EqualTo("13:09:17")); + Assert.That(entryElements[5].AttributeAs(TimeSeriesAssembler.XmlValueAttributeName), Is.EqualTo(115.6)); + Assert.That(entryElements[5].AttributeAs(TimeSeriesAssembler.XmlFlagAttributeName), Is.EqualTo(2)); // Comment (1) Assert.IsNull(serieElements[1].Element(tns + TimeSeriesAssembler.XMLCommentElementName)); @@ -338,40 +338,40 @@ Assert.IsNotNull(timeSerieCollection); // TimeSeries itself - Assert.AreEqual("1.2", timeSerieCollection.Version, "Version"); + Assert.That(timeSerieCollection.Version, Is.EqualTo("1.2"), "Version"); - Assert.AreEqual(0.0, timeSerieCollection.TimeZone, "TimeZone", Precision); + Assert.That(timeSerieCollection.TimeZone, Is.EqualTo(0.0), $"TimeZone"); // Number of series - Assert.AreEqual(8, timeSerieCollection.Series.Count, "Number of series"); + Assert.That(timeSerieCollection.Series.Count, Is.EqualTo(8), "Number of series"); TimeSerie timeSerie = timeSerieCollection.Series[0]; // TimeSerie - Assert.AreEqual("instantaneous", timeSerie.Type); - Assert.AreEqual("LOC1", timeSerie.LocationId); - Assert.AreEqual("Waterlevel", timeSerie.ParameterId); - Assert.AreEqual("second", timeSerie.TimeStep.Unit.ToString().ToLower()); - Assert.AreEqual(1, timeSerie.TimeStep.Divider); - Assert.AreEqual(3600, timeSerie.TimeStep.Multiplier); - Assert.AreEqual("2009-06-17 08:00:00", timeSerie.StartDateTime.ToString("yyyy-MM-dd HH:mm:ss")); - Assert.AreEqual("2009-06-18 08:00:00", timeSerie.EndDateTime.ToString("yyyy-MM-dd HH:mm:ss")); - Assert.AreEqual(-999.0, timeSerie.MissVal); + Assert.That(timeSerie.Type, Is.EqualTo("instantaneous")); + Assert.That(timeSerie.LocationId, Is.EqualTo("LOC1")); + Assert.That(timeSerie.ParameterId, Is.EqualTo("Waterlevel")); + Assert.That(timeSerie.TimeStep.Unit.ToString().ToLower(), Is.EqualTo("second")); + Assert.That(timeSerie.TimeStep.Divider, Is.EqualTo(1)); + Assert.That(timeSerie.TimeStep.Multiplier, Is.EqualTo(3600)); + Assert.That(timeSerie.StartDateTime.ToString("yyyy-MM-dd HH:mm:ss"), Is.EqualTo("2009-06-17 08:00:00")); + Assert.That(timeSerie.EndDateTime.ToString("yyyy-MM-dd HH:mm:ss"), Is.EqualTo("2009-06-18 08:00:00")); + Assert.That(timeSerie.MissVal, Is.EqualTo(-999.0)); Assert.IsNull(timeSerie.LongName); - Assert.AreEqual("point 1", timeSerie.StationName); - Assert.AreEqual("m", timeSerie.Units); + Assert.That(timeSerie.StationName, Is.EqualTo("point 1")); + Assert.That(timeSerie.Units, Is.EqualTo("m")); Assert.IsNull(timeSerie.SourceOrganisation); Assert.IsNull(timeSerie.SourceSystem); Assert.IsNull(timeSerie.FileDescription); Assert.IsNull(timeSerie.CreationDateTime); Assert.IsNull(timeSerie.Region); // Number of entries - Assert.AreEqual(25, timeSerie.Entries.Count, "Number of entries"); + Assert.That(timeSerie.Entries.Count, Is.EqualTo(25), "Number of entries"); - Assert.AreEqual("2009-06-17 08:00:00", timeSerie.Entries[0].DateTime.ToString("yyyy-MM-dd HH:mm:ss")); - Assert.AreEqual(2.32, timeSerie.Entries[0].Value, tolerance); - Assert.AreEqual(0, timeSerie.Entries[0].Flag); + Assert.That(timeSerie.Entries[0].DateTime.ToString("yyyy-MM-dd HH:mm:ss"), Is.EqualTo("2009-06-17 08:00:00")); + Assert.That(timeSerie.Entries[0].Value, Is.EqualTo(2.32).Within(tolerance)); + Assert.That(timeSerie.Entries[0].Flag, Is.EqualTo(0)); // Comment Assert.IsNull(timeSerie.Comment); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/FailureMechanismTests.cs (.../FailureMechanismTests.cs) (revision 4625) @@ -44,53 +44,53 @@ var projectFilename = @"..\..\..\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design.damx"; List allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 19); - Assert.AreEqual(1, allCalculationresults.Count); + Assert.That(allCalculationresults.Count, Is.EqualTo(1)); // Results as found with Dam Classic. These should be reproduced in the first place, however wrong these might be ;-) - Assert.AreEqual("DWP_1", allCalculationresults[0].LocationName); - Assert.AreEqual(CalculationResult.Succeeded, allCalculationresults[0].CalculationResult); - Assert.AreEqual(99718.000, allCalculationresults[0].X); - Assert.AreEqual(437106.000, allCalculationresults[0].Y); - Assert.AreEqual(AnalysisType.NoAdaption, allCalculationresults[0].AnalysisType); - Assert.AreEqual(false, allCalculationresults[0].IsUplift); - Assert.AreEqual("DWP_1.sti", allCalculationresults[0].ProfileName); - Assert.AreEqual(100, allCalculationresults[0].ProfileProbability); - Assert.AreEqual(MStabModelType.Bishop, allCalculationresults[0].StabilityModel); + Assert.That(allCalculationresults[0].LocationName, Is.EqualTo("DWP_1")); + Assert.That(allCalculationresults[0].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(allCalculationresults[0].X, Is.EqualTo(99718.000)); + Assert.That(allCalculationresults[0].Y, Is.EqualTo(437106.000)); + Assert.That(allCalculationresults[0].AnalysisType, Is.EqualTo(AnalysisType.NoAdaption)); + Assert.That(allCalculationresults[0].IsUplift, Is.EqualTo(false)); + Assert.That(allCalculationresults[0].ProfileName, Is.EqualTo("DWP_1.sti")); + Assert.That(allCalculationresults[0].ProfileProbability, Is.EqualTo(100)); + Assert.That(allCalculationresults[0].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); Assert.That(allCalculationresults[0].SafetyFactor, Is.EqualTo(1.545).Within(diff)); Assert.That(allCalculationresults[0].ShoulderHeight, Is.Null); Assert.That(allCalculationresults[0].ToeAtPolderX, Is.Null); Assert.That(allCalculationresults[0].ToeAtPolderZ, Is.Null); - Assert.AreEqual(1.170, allCalculationresults[0].RequiredSafetyFactor); - Assert.AreEqual(4.4, allCalculationresults[0].RiverLevel); - Assert.AreEqual(0.63, allCalculationresults[0].RiverLevelLow); - Assert.AreEqual(4.900, allCalculationresults[0].DikeTableHeight); - Assert.AreEqual(0.000, allCalculationresults[0].SlopeDampingPiezometricHeightPolderSide); - Assert.AreEqual(36.150, allCalculationresults[0].DikeLength); + Assert.That(allCalculationresults[0].RequiredSafetyFactor, Is.EqualTo(1.170)); + Assert.That(allCalculationresults[0].RiverLevel, Is.EqualTo(4.4)); + Assert.That(allCalculationresults[0].RiverLevelLow, Is.EqualTo(0.63)); + Assert.That(allCalculationresults[0].DikeTableHeight, Is.EqualTo(4.900)); + Assert.That(allCalculationresults[0].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].DikeLength, Is.EqualTo(36.150)); Assert.That(allCalculationresults[0].Pl3MinUplift, Is.EqualTo(1.837).Within(diff)); - Assert.AreEqual(1.60, allCalculationresults[0].Pl3HeadAdjusted); + Assert.That(allCalculationresults[0].Pl3HeadAdjusted, Is.EqualTo(1.60)); Assert.That(allCalculationresults[0].Pl3LocalLocationXMinUplift, Is.EqualTo(106).Within(diff)); Assert.That(allCalculationresults[0].Pl3LocationXMinUplift, Is.EqualTo(114.42).Within(diff)); - Assert.AreEqual(0.000, allCalculationresults[0].Pl3LocationYMinUplift); - Assert.AreEqual(0.000, allCalculationresults[0].Pl4MinUplift); - Assert.AreEqual(0.000, allCalculationresults[0].Pl4HeadAdjusted); - Assert.AreEqual(0.000, allCalculationresults[0].Pl4LocalLocationXMinUplift); - Assert.AreEqual(8.420, allCalculationresults[0].Pl4LocationXMinUplift); - Assert.AreEqual(0.000, allCalculationresults[0].Pl4LocationYMinUplift); + Assert.That(allCalculationresults[0].Pl3LocationYMinUplift, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].Pl4MinUplift, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].Pl4HeadAdjusted, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].Pl4LocalLocationXMinUplift, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].Pl4LocationXMinUplift, Is.EqualTo(8.420)); + Assert.That(allCalculationresults[0].Pl4LocationYMinUplift, Is.EqualTo(0.000)); Assert.That(allCalculationresults[0].LocalPipingEntryPointX, Is.EqualTo(16.190).Within(diff)); Assert.That(allCalculationresults[0].PipingEntryPointX, Is.EqualTo(24.610).Within(diff)); - Assert.AreEqual(0.000, allCalculationresults[0].PipingEntryPointY); - Assert.AreEqual(null, allCalculationresults[0].LocalPipingExitPointX); - Assert.AreEqual(null, allCalculationresults[0].PipingExitPointX); - Assert.AreEqual(null, allCalculationresults[0].PipingExitPointY); - Assert.AreEqual(null, allCalculationresults[0].SeepageLength); - Assert.AreEqual("", allCalculationresults[0].ResultMessage); - Assert.AreEqual(null, allCalculationresults[0].HeaveFactor); - Assert.AreEqual("", allCalculationresults[0].Notes); + Assert.That(allCalculationresults[0].PipingEntryPointY, Is.EqualTo(0.000)); + Assert.That(allCalculationresults[0].LocalPipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationresults[0].PipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationresults[0].PipingExitPointY, Is.EqualTo(null)); + Assert.That(allCalculationresults[0].SeepageLength, Is.EqualTo(null)); + Assert.That(allCalculationresults[0].ResultMessage, Is.EqualTo("")); + Assert.That(allCalculationresults[0].HeaveFactor, Is.EqualTo(null)); + Assert.That(allCalculationresults[0].Notes, Is.EqualTo("")); // * Number of iterations = 0 - Assert.AreEqual(0, allCalculationresults[0].NumberOfIterations); + Assert.That(allCalculationresults[0].NumberOfIterations, Is.EqualTo(0)); // * Evaluation = not evaluated - Assert.AreEqual(ResultEvaluation.NotEvaluated, allCalculationresults[0].ResultEvaluation); + Assert.That(allCalculationresults[0].ResultEvaluation, Is.EqualTo(ResultEvaluation.NotEvaluated)); // * 1 leeg veld (Uplift Factor) - Assert.AreEqual(null, allCalculationresults[0].UpliftFactor); + Assert.That(allCalculationresults[0].UpliftFactor, Is.EqualTo(null)); } [Test] @@ -102,62 +102,62 @@ var projectFilename = @"..\..\..\data\DamEngineTestProjects\Actualisatie\Actualisatie.damx"; List allCalculationresults = ComputeStabilityOutsideProjectUsingClassic(projectFilename, 56); - Assert.AreEqual(36, allCalculationresults.Count); + Assert.That(allCalculationresults.Count, Is.EqualTo(36)); // Results for calc 2 (results[1]) as found with Dam Classic. These should be reproduced in the first place, however wrong these might be ;-) - Assert.AreEqual("RK210-560", allCalculationresults[1].LocationName); - Assert.AreEqual(CalculationResult.Succeeded, allCalculationresults[1].CalculationResult); - Assert.AreEqual(88218.047, allCalculationresults[1].X, diff); - Assert.AreEqual(448871.233, allCalculationresults[1].Y, diff); - Assert.AreEqual(AnalysisType.NoAdaption, allCalculationresults[1].AnalysisType); - Assert.AreEqual(false, allCalculationresults[1].IsUplift); - Assert.AreEqual("Segment_1_1D2", allCalculationresults[1].ProfileName); - Assert.AreEqual(2.43, allCalculationresults[1].ProfileProbability); - Assert.AreEqual(MStabModelType.Bishop, allCalculationresults[1].StabilityModel); + Assert.That(allCalculationresults[1].LocationName, Is.EqualTo("RK210-560")); + Assert.That(allCalculationresults[1].CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); + Assert.That(allCalculationresults[1].X, Is.EqualTo(88218.047).Within(diff)); + Assert.That(allCalculationresults[1].Y, Is.EqualTo(448871.233).Within(diff)); + Assert.That(allCalculationresults[1].AnalysisType, Is.EqualTo(AnalysisType.NoAdaption)); + Assert.That(allCalculationresults[1].IsUplift, Is.EqualTo(false)); + Assert.That(allCalculationresults[1].ProfileName, Is.EqualTo("Segment_1_1D2")); + Assert.That(allCalculationresults[1].ProfileProbability, Is.EqualTo(2.43)); + Assert.That(allCalculationresults[1].StabilityModel, Is.EqualTo(MStabModelType.Bishop)); Assert.That(allCalculationresults[1].SafetyFactor, Is.EqualTo(1.079).Within(diff)); - Assert.AreEqual(null, allCalculationresults[1].ShoulderHeight); - Assert.AreEqual(null, allCalculationresults[1].ToeAtPolderX); - Assert.AreEqual(null, allCalculationresults[1].ToeAtPolderZ); - Assert.AreEqual(0.900, allCalculationresults[1].RequiredSafetyFactor); - Assert.AreEqual(-2.090, allCalculationresults[1].RiverLevel); - Assert.AreEqual(-2.520, allCalculationresults[1].RiverLevelLow); + Assert.That(allCalculationresults[1].ShoulderHeight, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].ToeAtPolderX, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].ToeAtPolderZ, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].RequiredSafetyFactor, Is.EqualTo(0.900)); + Assert.That(allCalculationresults[1].RiverLevel, Is.EqualTo(-2.090)); + Assert.That(allCalculationresults[1].RiverLevelLow, Is.EqualTo(-2.520)); Assert.That(allCalculationresults[1].DikeTableHeight, Is.EqualTo(-2.000).Within(diff)); - Assert.AreEqual(0.000, allCalculationresults[1].SlopeDampingPiezometricHeightPolderSide); + Assert.That(allCalculationresults[1].SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(0.000)); Assert.That(allCalculationresults[1].DikeLength, Is.EqualTo(14.12).Within(diff * 10)); // * PL3 Min uplift = null - Assert.AreEqual(null, allCalculationresults[1].Pl3MinUplift); + Assert.That(allCalculationresults[1].Pl3MinUplift, Is.EqualTo(null)); // * PL3 Head adjusted = null - Assert.AreEqual(null, allCalculationresults[1].Pl3HeadAdjusted); + Assert.That(allCalculationresults[1].Pl3HeadAdjusted, Is.EqualTo(null)); // * PL3 Min uplift (X local) = null - Assert.AreEqual(null, allCalculationresults[1].Pl3LocalLocationXMinUplift); + Assert.That(allCalculationresults[1].Pl3LocalLocationXMinUplift, Is.EqualTo(null)); // * PL3 Min uplift (X global) = null - Assert.AreEqual(null, allCalculationresults[1].Pl3LocationXMinUplift); + Assert.That(allCalculationresults[1].Pl3LocationXMinUplift, Is.EqualTo(null)); // * PL3 Min uplift (Y global) = null - Assert.AreEqual(null, allCalculationresults[1].Pl3LocationYMinUplift); + Assert.That(allCalculationresults[1].Pl3LocationYMinUplift, Is.EqualTo(null)); // * PL4 Min uplift = null - Assert.AreEqual(null, allCalculationresults[1].Pl4MinUplift); + Assert.That(allCalculationresults[1].Pl4MinUplift, Is.EqualTo(null)); // * PL4 Head adjusted = null - Assert.AreEqual(null, allCalculationresults[1].Pl4HeadAdjusted); + Assert.That(allCalculationresults[1].Pl4HeadAdjusted, Is.EqualTo(null)); // * PL4 Min uplift (X local) = null - Assert.AreEqual(null, allCalculationresults[1].Pl4LocalLocationXMinUplift); + Assert.That(allCalculationresults[1].Pl4LocalLocationXMinUplift, Is.EqualTo(null)); // * PL4 Min uplift (X global) = null - Assert.AreEqual(null, allCalculationresults[1].Pl4LocationXMinUplift); + Assert.That(allCalculationresults[1].Pl4LocationXMinUplift, Is.EqualTo(null)); // * PL4 Min uplift (Y global) = null - Assert.AreEqual(null, allCalculationresults[1].Pl4LocationYMinUplift); + Assert.That(allCalculationresults[1].Pl4LocationYMinUplift, Is.EqualTo(null)); Assert.That(allCalculationresults[1].LocalPipingEntryPointX, Is.EqualTo(9.798).Within(diff)); Assert.That(allCalculationresults[1].PipingEntryPointX, Is.EqualTo(88216.844).Within(diff)); Assert.That(allCalculationresults[1].PipingEntryPointY, Is.EqualTo(448870.287).Within(diff)); - Assert.AreEqual(null, allCalculationresults[1].LocalPipingExitPointX); - Assert.AreEqual(null, allCalculationresults[1].PipingExitPointX); - Assert.AreEqual(null, allCalculationresults[1].PipingExitPointY); - Assert.AreEqual(null, allCalculationresults[1].SeepageLength); - Assert.AreEqual("", allCalculationresults[1].ResultMessage); - Assert.AreEqual(null, allCalculationresults[1].HeaveFactor); - Assert.AreEqual("", allCalculationresults[1].Notes); - Assert.AreEqual(0, allCalculationresults[1].NumberOfIterations); - Assert.AreEqual(ResultEvaluation.NotEvaluated, allCalculationresults[1].ResultEvaluation); - Assert.AreEqual(null, allCalculationresults[1].UpliftFactor); + Assert.That(allCalculationresults[1].LocalPipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].PipingExitPointX, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].PipingExitPointY, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].SeepageLength, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].ResultMessage, Is.EqualTo("")); + Assert.That(allCalculationresults[1].HeaveFactor, Is.EqualTo(null)); + Assert.That(allCalculationresults[1].Notes, Is.EqualTo("")); + Assert.That(allCalculationresults[1].NumberOfIterations, Is.EqualTo(0)); + Assert.That(allCalculationresults[1].ResultEvaluation, Is.EqualTo(ResultEvaluation.NotEvaluated)); + Assert.That(allCalculationresults[1].UpliftFactor, Is.EqualTo(null)); } /// @@ -170,9 +170,9 @@ // Read dikering using (DamProjectData damProjectData = ProjectLoader.LoadProjectData(projectFilename)) { - Assert.AreEqual(1, damProjectData.WaterBoard.Dikes.Count); + Assert.That(damProjectData.WaterBoard.Dikes.Count, Is.EqualTo(1)); Dike dike = damProjectData.WaterBoard.Dikes[0]; - Assert.AreEqual(expectedLocations, dike.Locations.Count); + Assert.That(dike.Locations.Count, Is.EqualTo(expectedLocations)); damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.Bishop; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition = MStabGridPosition.Left; damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationPropertyImporterTest.cs (.../LocationPropertyImporterTest.cs) (revision 4625) @@ -54,7 +54,7 @@ const string attributeId = "head_pl3"; bool actualValue = LocationShapeFileAttributeMap.IsAttributeIdSupported(attributeId); - Assert.AreEqual(expectedValue, actualValue); + Assert.That(actualValue, Is.EqualTo(expectedValue)); } [Test] @@ -235,61 +235,61 @@ mockImporter.Import(null); - Assert.AreEqual(stringTestValue, location.SegmentId); - Assert.AreEqual(doubleTestValue, location.DampingFactorPl3); - Assert.AreEqual(doubleTestValue, location.DampingFactorPl4); - Assert.AreEqual(stringTestValue, location.DikeEmbankmentMaterial); - Assert.AreEqual(doubleTestValue, location.DistanceToEntryPoint); - Assert.AreEqual(doubleTestValue, location.HeadPl2); - Assert.AreEqual(doubleTestValue, location.HeadPl3); - Assert.AreEqual(doubleTestValue, location.HeadPl4); - Assert.AreEqual(doubleTestValue, location.MinimalCircleDepth); - Assert.AreEqual(doubleTestValue, location.PenetrationLength); - Assert.AreEqual(doubleTestValue, location.PolderLevel); - Assert.AreEqual(plLineCreationMethodTestValue, location.PLLineCreationMethod); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(doubleTestValue, location.TrafficLoad); - Assert.AreEqual(doubleTestValue, location.TL_DegreeOfConsolidation); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorPiping); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(stringTestValue, location.ShoulderEmbankmentMaterial); - Assert.AreEqual(doubleTestValue, location.StabilityShoulderGrowSlope); - Assert.AreEqual(doubleTestValue, location.StabilityShoulderGrowDeltaX); - Assert.AreEqual(doubleTestValue, location.StabilitySlopeAdaptionDeltaX); - Assert.AreEqual(doubleTestValue, location.UpliftCriterionPiping); - Assert.AreEqual(doubleTestValue, location.UpliftCriterionStability); - Assert.AreEqual(doubleTestValue, location.XSoilGeometry2DOrigin); - Assert.AreEqual(mstabZonesTypeTestValue, location.StabilityZoneType); - Assert.AreEqual(doubleTestValue, location.ForbiddenZoneFactor); - Assert.AreEqual(boolTestValue, location.UseNewDikeTopWidth); - Assert.AreEqual(doubleTestValue, location.NewDikeTopWidth); - Assert.AreEqual(boolTestValue, location.UseNewDikeSlopeInside); - Assert.AreEqual(doubleTestValue, location.NewDikeSlopeInside); - Assert.AreEqual(boolTestValue, location.UseNewDikeSlopeOutside); - Assert.AreEqual(doubleTestValue, location.NewDikeSlopeOutside); - Assert.AreEqual(boolTestValue, location.UseNewShoulderTopSlope); - Assert.AreEqual(doubleTestValue, location.NewShoulderTopSlope); - Assert.AreEqual(boolTestValue, location.UseNewShoulderBaseSlope); - Assert.AreEqual(doubleTestValue, location.NewShoulderBaseSlope); - Assert.AreEqual(boolTestValue, location.UseNewMaxHeightShoulderAsFraction); - Assert.AreEqual(doubleTestValue, location.NewMaxHeightShoulderAsFraction); - Assert.AreEqual(boolTestValue, location.UseNewMinDistanceDikeToeStartDitch); - Assert.AreEqual(doubleTestValue, location.NewMinDistanceDikeToeStartDitch); - Assert.AreEqual(boolTestValue, location.UseNewDitchDefinition); - Assert.AreEqual(doubleTestValue, location.NewWidthDitchBottom); - Assert.AreEqual(doubleTestValue, location.NewDepthDitch); - Assert.AreEqual(doubleTestValue, location.NewSlopeAngleDitch); - Assert.AreEqual(stabilityDesignMethodTestValue, location.StabilityDesignMethod); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStartCotangent); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionEndCotangent); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStepCotangent); - Assert.AreEqual(doubleTestValue, location.DikeTableHeight); - Assert.AreEqual(doubleTestValue, location.RiverLevel); - Assert.AreEqual(doubleTestValue, location.RiverLevelLow); + Assert.That(location.SegmentId, Is.EqualTo(stringTestValue)); + Assert.That(location.DampingFactorPl3, Is.EqualTo(doubleTestValue)); + Assert.That(location.DampingFactorPl4, Is.EqualTo(doubleTestValue)); + Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue)); + Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue)); + Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue)); + Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue)); + Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue)); + Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue)); + Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue)); + Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue)); + Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue)); + Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue)); + Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue)); + Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue)); + Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue)); + Assert.That(location.ForbiddenZoneFactor, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewDikeTopWidth, Is.EqualTo(boolTestValue)); + Assert.That(location.NewDikeTopWidth, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewDikeSlopeInside, Is.EqualTo(boolTestValue)); + Assert.That(location.NewDikeSlopeInside, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewDikeSlopeOutside, Is.EqualTo(boolTestValue)); + Assert.That(location.NewDikeSlopeOutside, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewShoulderTopSlope, Is.EqualTo(boolTestValue)); + Assert.That(location.NewShoulderTopSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewShoulderBaseSlope, Is.EqualTo(boolTestValue)); + Assert.That(location.NewShoulderBaseSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewMaxHeightShoulderAsFraction, Is.EqualTo(boolTestValue)); + Assert.That(location.NewMaxHeightShoulderAsFraction, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewMinDistanceDikeToeStartDitch, Is.EqualTo(boolTestValue)); + Assert.That(location.NewMinDistanceDikeToeStartDitch, Is.EqualTo(doubleTestValue)); + Assert.That(location.UseNewDitchDefinition, Is.EqualTo(boolTestValue)); + Assert.That(location.NewWidthDitchBottom, Is.EqualTo(doubleTestValue)); + Assert.That(location.NewDepthDitch, Is.EqualTo(doubleTestValue)); + Assert.That(location.NewSlopeAngleDitch, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue)); + Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue)); + Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue)); + Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue)); mocks.VerifyAll(); } @@ -455,43 +455,43 @@ mockImporter.RegisterCrossSectionAttribute(crossSectionMapping.Name, crossSectionMapping.File); mockImporter.Import(null); - Assert.AreEqual(stringTestValue, location.SegmentId); - Assert.AreEqual(dampingPl3Value, location.DampingFactorPl3); - Assert.AreEqual(0, location.DampingFactorPl4); // as testvalue is beyond the limits, its reset to 0 - Assert.AreEqual(stringTestValue, location.DikeEmbankmentMaterial); - Assert.AreEqual(doubleTestValue, location.DistanceToEntryPoint); - Assert.AreEqual(doubleTestValue, location.HeadPl2); - Assert.AreEqual(doubleTestValue, location.HeadPl3); - Assert.AreEqual(doubleTestValue, location.HeadPl4); - Assert.AreEqual(doubleTestValue, location.MinimalCircleDepth); - Assert.AreEqual(doubleTestValue, location.PenetrationLength); - Assert.AreEqual(doubleTestValue, location.PolderLevel); - Assert.AreEqual(plLineCreationMethodTestValue, location.PLLineCreationMethod); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(doubleTestValue, location.PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(doubleTestValue, location.TrafficLoad); - Assert.AreEqual(doubleTestValue, location.TL_DegreeOfConsolidation); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorPiping); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorStabilityInnerSlope); - Assert.AreEqual(doubleTestValue, location.RequiredSafetyFactorStabilityOuterSlope); - Assert.AreEqual(stringTestValue, location.ShoulderEmbankmentMaterial); - Assert.AreEqual(doubleTestValue, location.StabilityShoulderGrowSlope); - Assert.AreEqual(doubleTestValue, location.StabilityShoulderGrowDeltaX); - Assert.AreEqual(doubleTestValue, location.StabilitySlopeAdaptionDeltaX); - Assert.AreEqual(doubleTestValue, location.UpliftCriterionPiping); - Assert.AreEqual(doubleTestValue, location.UpliftCriterionStability); - Assert.AreEqual(doubleTestValue, location.XSoilGeometry2DOrigin); - Assert.AreEqual(mstabZonesTypeTestValue, location.StabilityZoneType); - Assert.AreEqual(doubleTestValue, location.SlopeDampingPiezometricHeightPolderSide); - Assert.AreEqual(stabilityDesignMethodTestValue, location.StabilityDesignMethod); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStartCotangent); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionEndCotangent); - Assert.AreEqual(doubleTestValue, location.SlopeAdaptionStepCotangent); - Assert.AreEqual(doubleTestValue, location.DikeTableHeight); - Assert.AreEqual(doubleTestValue, location.RiverLevel); - Assert.AreEqual(doubleTestValue, location.RiverLevelLow); + Assert.That(location.SegmentId, Is.EqualTo(stringTestValue)); + Assert.That(location.DampingFactorPl3, Is.EqualTo(dampingPl3Value)); + Assert.That(location.DampingFactorPl4, Is.EqualTo(0)); // as testvalue is beyond the limits, its reset to 0 + Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo(stringTestValue)); + Assert.That(location.DistanceToEntryPoint, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl2, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl3, Is.EqualTo(doubleTestValue)); + Assert.That(location.HeadPl4, Is.EqualTo(doubleTestValue)); + Assert.That(location.MinimalCircleDepth, Is.EqualTo(doubleTestValue)); + Assert.That(location.PenetrationLength, Is.EqualTo(doubleTestValue)); + Assert.That(location.PolderLevel, Is.EqualTo(doubleTestValue)); + Assert.That(location.PLLineCreationMethod, Is.EqualTo(plLineCreationMethodTestValue)); + Assert.That(location.PlLineOffsetBelowDikeTopAtRiver, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowDikeTopAtPolder, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowShoulderBaseInside, Is.EqualTo(doubleTestValue)); + Assert.That(location.PlLineOffsetBelowDikeToeAtPolder, Is.EqualTo(doubleTestValue)); + Assert.That(location.TrafficLoad, Is.EqualTo(doubleTestValue)); + Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorPiping, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorStabilityInnerSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.RequiredSafetyFactorStabilityOuterSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo(stringTestValue)); + Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(doubleTestValue)); + Assert.That(location.UpliftCriterionPiping, Is.EqualTo(doubleTestValue)); + Assert.That(location.UpliftCriterionStability, Is.EqualTo(doubleTestValue)); + Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityZoneType, Is.EqualTo(mstabZonesTypeTestValue)); + Assert.That(location.SlopeDampingPiezometricHeightPolderSide, Is.EqualTo(doubleTestValue)); + Assert.That(location.StabilityDesignMethod, Is.EqualTo(stabilityDesignMethodTestValue)); + Assert.That(location.SlopeAdaptionStartCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.SlopeAdaptionEndCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.SlopeAdaptionStepCotangent, Is.EqualTo(doubleTestValue)); + Assert.That(location.DikeTableHeight, Is.EqualTo(doubleTestValue)); + Assert.That(location.RiverLevel, Is.EqualTo(doubleTestValue)); + Assert.That(location.RiverLevelLow, Is.EqualTo(doubleTestValue)); mocks.VerifyAll(); } @@ -665,7 +665,7 @@ }; importer.DataFileLocation = DirectoryWithDataShapeFiles; importer.RegisterAttributeMapping("someattributeid", "test", TestShapeFile); - Assert.AreEqual(1, importer.ImproperAttributeMessages.Count); + Assert.That(importer.ImproperAttributeMessages.Count, Is.EqualTo(1)); } [Test] @@ -716,7 +716,7 @@ importer.RegisterAttributeMapping(LocationShapeFileAttributeMap.TrafficLoadAttributeId, TestShapeFile); importer.Import(null); - Assert.AreEqual(trafLoadValueInShapeFile, location.TrafficLoad); + Assert.That(location.TrafficLoad, Is.EqualTo(trafLoadValueInShapeFile)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs (.../ScenarioTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/ScenarioTest.cs (.../ScenarioTest.cs) (revision 4625) @@ -42,7 +42,7 @@ Assert.IsInstanceOf(scenario); Assert.IsInstanceOf(scenario); - Assert.AreEqual(0, scenario.PolderLevel); + Assert.That(scenario.PolderLevel, Is.EqualTo(0)); Assert.IsNull(scenario.HeadPl2); } @@ -67,7 +67,7 @@ { NumberDecimalSeparator = "." }); - Assert.AreEqual(expectedValue, pairValue); + Assert.That(pairValue, Is.EqualTo(expectedValue)); } [Test] @@ -89,7 +89,7 @@ scenario.SetParameterFromNameValuePair(polderLevelName, stringValue); // Assert - Assert.AreEqual(numericValue, scenario.PolderLevel); + Assert.That(scenario.PolderLevel, Is.EqualTo(numericValue)); } [Test] @@ -116,7 +116,7 @@ { NumberDecimalSeparator = "." }); - Assert.AreEqual(expectedValue, pairValue); + Assert.That(pairValue, Is.EqualTo(expectedValue)); } [Test] @@ -157,7 +157,7 @@ scenario.SetParameterFromNameValuePair(headPL2Name, stringValue); // Assert - Assert.AreEqual(numericValue, scenario.HeadPl2); + Assert.That(scenario.HeadPl2, Is.EqualTo(numericValue)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs =================================================================== diff -u -r4609 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 4609) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/StiImporter/SoilProfile2DImporterTest.cs (.../SoilProfile2DImporterTest.cs) (revision 4625) @@ -100,22 +100,22 @@ SoilProfile2D soilProfileOne = soilProfiles.ElementAt(0); Assert.That(soilProfileOne.Name, Is.EqualTo(profileOneName)); - CollectionAssert.AreEqual(new[] + Assert.That(soilProfileOne.Surfaces.Select(s => s.Name), Is.EqualTo(new[] { "Soft Clay", "Muck" - }, soilProfileOne.Surfaces.Select(s => s.Name)); + }).AsCollection); AssertSoilLayerProperties(soilProfileOne.Surfaces); SoilProfile2D soilProfileTwo = soilProfiles.ElementAt(1); Assert.That(soilProfileTwo.Name, Is.EqualTo(profileTwoName)); - CollectionAssert.AreEquivalent(new[] + Assert.That(soilProfileTwo.Surfaces.Select(s => s.Name), Is.EquivalentTo(new[] { "Soft Clay", "Sand", "Peat", "Soft Clay" - }, soilProfileTwo.Surfaces.Select(s => s.Name)); // Check only whether all the surfaces are present as the order differs on different machines. + })); // Check only whether all the surfaces are present as the order differs on different machines. AssertSoilLayerProperties(soilProfileTwo.Surfaces); } @@ -146,22 +146,22 @@ SoilProfile2D soilProfileOne = soilProfiles.ElementAt(0); Assert.That(soilProfileOne.Name, Is.EqualTo(profileOneFileName)); - CollectionAssert.AreEqual(new[] + Assert.That(soilProfileOne.Surfaces.Select(s => s.Name), Is.EqualTo(new[] { "Soft Clay", "Muck" - }, soilProfileOne.Surfaces.Select(s => s.Name)); + }).AsCollection); AssertSoilLayerProperties(soilProfileOne.Surfaces); SoilProfile2D soilProfileTwo = soilProfiles.ElementAt(1); Assert.That(soilProfileTwo.Name, Is.EqualTo(profileTwoFileName)); - CollectionAssert.AreEquivalent(new[] + Assert.That(soilProfileTwo.Surfaces.Select(s => s.Name), Is.EquivalentTo(new[] { "Soft Clay", "Sand", "Peat", "Soft Clay" - }, soilProfileTwo.Surfaces.Select(s => s.Name)); // Check only whether all the surfaces are present as the order differs on different machines. + })); // Check only whether all the surfaces are present as the order differs on different machines. AssertSoilLayerProperties(soilProfileTwo.Surfaces); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeries/TimeSeriesProcessorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeries/TimeSeriesProcessorTest.cs (.../TimeSeriesProcessorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TimeSeries/TimeSeriesProcessorTest.cs (.../TimeSeriesProcessorTest.cs) (revision 4625) @@ -76,11 +76,11 @@ // asserts Assert.IsNotNull(processor.OutputTimeSeriesCollection); - Assert.AreEqual(1, processor.OutputTimeSeriesCollection.Series.Count); - Assert.AreEqual(2, processor.OutputTimeSeriesCollection.Series[0].Entries.Count); - Assert.AreEqual(expectedLocationID, processor.OutputTimeSeriesCollection.Series[0].LocationId); - Assert.AreEqual(expectedParameterID, processor.OutputTimeSeriesCollection.Series[0].ParameterId); - Assert.AreEqual(0, processor.OutputTimeSeriesCollection.Series[0].Entries[0].Value); + Assert.That(processor.OutputTimeSeriesCollection.Series.Count, Is.EqualTo(1)); + Assert.That(processor.OutputTimeSeriesCollection.Series[0].Entries.Count, Is.EqualTo(2)); + Assert.That(processor.OutputTimeSeriesCollection.Series[0].LocationId, Is.EqualTo(expectedLocationID)); + Assert.That(processor.OutputTimeSeriesCollection.Series[0].ParameterId, Is.EqualTo(expectedParameterID)); + Assert.That(processor.OutputTimeSeriesCollection.Series[0].Entries[0].Value, Is.EqualTo(0)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs (.../LocationShapeFileImporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs (.../LocationShapeFileImporterTest.cs) (revision 4625) @@ -93,7 +93,7 @@ importer.Import(); - Assert.AreEqual(4, importer.ImportedItems.Count()); + Assert.That(importer.ImportedItems.Count(), Is.EqualTo(4)); } [Test] @@ -144,11 +144,11 @@ // This will cause that the importer overriders the existing location // because of having the same name (id) // Total should be 2 - Assert.AreEqual(2, importer.ImportedItems.Count()); + Assert.That(importer.ImportedItems.Count(), Is.EqualTo(2)); CsvImporterLocations.LocationRecord location2 = importer.ImportedItems.Single(l => l.LocationId == "loc3"); - Assert.AreEqual(location2.GeoX, loc3.Geometry.Coordinate.X); - Assert.AreEqual(location2.GeoY, loc3.Geometry.Coordinate.Y); + Assert.That(loc3.Geometry.Coordinate.X, Is.EqualTo(location2.GeoX)); + Assert.That(loc3.Geometry.Coordinate.Y, Is.EqualTo(location2.GeoY)); } #region Setup/Teardown Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r4555 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 4555) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 4625) @@ -125,39 +125,39 @@ } } - Assert.AreEqual(5547, damProjectData.WaterBoard.Dikes[0].Locations.Count); - Assert.AreEqual(306, damProjectData.WaterBoard.Segments.Count); - Assert.AreEqual(3874, damProjectData.WaterBoard.Dikes[0].SoilProfiles.Count); // ca. 6 layers per profile. kan dus kloppen! - Assert.AreEqual(8, damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers.Count); - Assert.AreEqual("HHNK1_kade", damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Soil.Name); - Assert.AreEqual("Layer0", damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Name); - Assert.AreEqual(30.0, damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].TopLevel); - Assert.AreEqual(3, damProjectData.WaterBoard.Dikes[0].SurfaceLines2.Count); + Assert.That(damProjectData.WaterBoard.Dikes[0].Locations.Count, Is.EqualTo(5547)); + Assert.That(damProjectData.WaterBoard.Segments.Count, Is.EqualTo(306)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles.Count, Is.EqualTo(3874)); // ca. 6 layers per profile. kan dus kloppen! + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers.Count, Is.EqualTo(8)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Soil.Name, Is.EqualTo("HHNK1_kade")); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Name, Is.EqualTo("Layer0")); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].TopLevel, Is.EqualTo(30.0)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SurfaceLines2.Count, Is.EqualTo(3)); // Test import of scenarios Location loc = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(x => x.Name.Equals("TPL_BALGZANDKANAAL_0110")); - Assert.AreEqual(8, loc.Scenarios.Count); + Assert.That(loc.Scenarios.Count, Is.EqualTo(8)); loc = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(x => x.Name.Equals("TPL_BALGZANDKANAAL_0180")); - Assert.AreEqual(6, loc.Scenarios.Count); + Assert.That(loc.Scenarios.Count, Is.EqualTo(6)); // Following location has double entries in CSV file; check if this is handled correctly loc = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(x => x.Name.Equals("TPL_SCHERMER_BUITEN_WEST_0490")); - Assert.AreEqual(6, loc.Scenarios.Count); + Assert.That(loc.Scenarios.Count, Is.EqualTo(6)); // Total number of scenarios - Assert.AreEqual(19652, damProjectData.WaterBoard.Dikes[0].Scenarios.Count); + Assert.That(damProjectData.WaterBoard.Dikes[0].Scenarios.Count, Is.EqualTo(19652)); // Check if all soilprobabbilites are read Segment segment = damProjectData.WaterBoard.Segments.FirstOrDefault(s => s.Name.Equals("2")); var stabilityProbabilities = new List(segment.SoilProfileProbabilities.Where( p => ((p.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityInside) || (p.SegmentFailureMechanismType == FailureMechanismSystemType.StabilityOutside) || (p.SegmentFailureMechanismType == null)))); - Assert.AreEqual(3, stabilityProbabilities.Count); + Assert.That(stabilityProbabilities.Count, Is.EqualTo(3)); var pipingProbabilities = new List(segment.SoilProfileProbabilities.Where( p => ((p.SegmentFailureMechanismType == FailureMechanismSystemType.Piping) || (p.SegmentFailureMechanismType == null)))); - Assert.AreEqual(3, pipingProbabilities.Count); - Assert.AreEqual(3530, LogManager.Messages.Count); + Assert.That(pipingProbabilities.Count, Is.EqualTo(3)); + Assert.That(LogManager.Messages.Count, Is.EqualTo(3530)); // Check time needed to read TimeSpan maxTime = TimeSpan.FromSeconds(80); // This is the time on the buildserver; local time was 25 seconds @@ -208,63 +208,63 @@ } } - Assert.AreEqual(2, damProjectData.WaterBoard.Dikes[0].Locations.Count); - Assert.AreEqual(2, damProjectData.WaterBoard.Segments.Count); - Assert.AreEqual(23, damProjectData.WaterBoard.Dikes[0].SoilProfiles.Count); - Assert.AreEqual(4, damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers.Count); - Assert.AreEqual("kade", damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Soil.Name); - Assert.AreEqual("Layer0", damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Name); - Assert.AreEqual(60.0, damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].TopLevel); - Assert.AreEqual(2, damProjectData.WaterBoard.Dikes[0].SurfaceLines2.Count); + Assert.That(damProjectData.WaterBoard.Dikes[0].Locations.Count, Is.EqualTo(2)); + Assert.That(damProjectData.WaterBoard.Segments.Count, Is.EqualTo(2)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles.Count, Is.EqualTo(23)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers.Count, Is.EqualTo(4)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Soil.Name, Is.EqualTo("kade")); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].Name, Is.EqualTo("Layer0")); + Assert.That(damProjectData.WaterBoard.Dikes[0].SoilProfiles[0].Layers[0].TopLevel, Is.EqualTo(60.0)); + Assert.That(damProjectData.WaterBoard.Dikes[0].SurfaceLines2.Count, Is.EqualTo(2)); // Check soil data Soil soil = damProjectData.WaterBoard.Dikes[0].SoilList.Soils.FirstOrDefault(s => s.Name == "CCC"); Assert.IsTrue(soil != null); - Assert.AreEqual(ShearStrengthModel.StressTable, soil.ShearStrengthModel); - Assert.AreEqual("CurveKlei", soil.StressTable.Name); + Assert.That(soil.ShearStrengthModel, Is.EqualTo(ShearStrengthModel.StressTable)); + Assert.That(soil.StressTable.Name, Is.EqualTo("CurveKlei")); // Check location specific data Location location = damProjectData.WaterBoard.Dikes[0].Locations.FirstOrDefault(s => s.Name.Equals("25-2-2-A-1-A")); Assert.IsTrue(location != null); - Assert.AreEqual("25-2-2-A-1-A", location.Name); + Assert.That(location.Name, Is.EqualTo("25-2-2-A-1-A")); //Assert.AreEqual("25-2-2-A-1-A", location.SurfaceLine.Name); //Assert.AreEqual("106", location.Segment.Name); - Assert.AreEqual(66586.0, location.XRd, tolerance); - Assert.AreEqual(424173.0, location.YRd, tolerance); - Assert.AreEqual(2.0, location.XSoilGeometry2DOrigin, tolerance); + Assert.That(location.XRd, Is.EqualTo(66586.0).Within(tolerance)); + Assert.That(location.YRd, Is.EqualTo(424173.0).Within(tolerance)); + Assert.That(location.XSoilGeometry2DOrigin, Is.EqualTo(2.0).Within(tolerance)); //Assert.AreEqual("25-2-2-A-1-A", location.PL1Line.Name); - Assert.AreEqual("klei", location.DikeEmbankmentMaterial); - Assert.AreEqual("klei2", location.ShoulderEmbankmentMaterial); - Assert.AreEqual(1.3, location.PenetrationLength, tolerance); - Assert.AreEqual(10, location.TrafficLoad, tolerance); + Assert.That(location.DikeEmbankmentMaterial, Is.EqualTo("klei")); + Assert.That(location.ShoulderEmbankmentMaterial, Is.EqualTo("klei2")); + Assert.That(location.PenetrationLength, Is.EqualTo(1.3).Within(tolerance)); + Assert.That(location.TrafficLoad, Is.EqualTo(10).Within(tolerance)); Assert.That(location.TL_DegreeOfConsolidation, Is.EqualTo(22.44).Within(tolerance)); - Assert.AreEqual(1.5, location.MinimalCircleDepth, tolerance); - Assert.AreEqual(0.3, location.DampingFactorPL3, tolerance); - Assert.AreEqual(0.4, location.DampingFactorPL4, tolerance); - Assert.AreEqual(PLLineCreationMethod.ExpertKnowledgeRRD, location.PLLineCreationMethod); - Assert.AreEqual(2.1, location.DistanceToEntryPoint, tolerance); - Assert.AreEqual(2.0, location.StabilityShoulderGrowSlope, tolerance); - Assert.AreEqual(0.2, location.StabilityShoulderGrowDeltaX, tolerance); - Assert.AreEqual(0.5, location.StabilitySlopeAdaptionDeltaX, tolerance); + Assert.That(location.MinimalCircleDepth, Is.EqualTo(1.5).Within(tolerance)); + Assert.That(location.DampingFactorPL3, Is.EqualTo(0.3).Within(tolerance)); + Assert.That(location.DampingFactorPL4, Is.EqualTo(0.4).Within(tolerance)); + Assert.That(location.PLLineCreationMethod, Is.EqualTo(PLLineCreationMethod.ExpertKnowledgeRRD)); + Assert.That(location.DistanceToEntryPoint, Is.EqualTo(2.1).Within(tolerance)); + Assert.That(location.StabilityShoulderGrowSlope, Is.EqualTo(2.0).Within(tolerance)); + Assert.That(location.StabilityShoulderGrowDeltaX, Is.EqualTo(0.2).Within(tolerance)); + Assert.That(location.StabilitySlopeAdaptionDeltaX, Is.EqualTo(0.5).Within(tolerance)); // Assert that the scenarios are set correctly for this location List scenarios = location.Scenarios; - Assert.AreEqual(2, scenarios.Count); - CollectionAssert.AreEqual(new[] + Assert.That(scenarios.Count, Is.EqualTo(2)); + Assert.That(scenarios.Select(sc => sc.LocationScenarioID), Is.EqualTo(new[] { "1", "10" - }, scenarios.Select(sc => sc.LocationScenarioID)); - CollectionAssert.AreEqual(new[] + }).AsCollection); + Assert.That(scenarios.Select(sc => sc.DikeTableHeight), Is.EqualTo(new[] { 4.01, 7.02 - }, scenarios.Select(sc => sc.DikeTableHeight)); - CollectionAssert.AreEqual(new[] + }).AsCollection); + Assert.That(scenarios.Select(sc => sc.RequiredSafetyFactorStabilityInnerSlope), Is.EqualTo(new[] { 1.08, 1.45 - }, scenarios.Select(sc => sc.RequiredSafetyFactorStabilityInnerSlope)); + }).AsCollection); Assert.IsTrue(scenarios.All(sc => Math.Abs(sc.PolderLevel + 0.25) < tolerance)); Assert.IsTrue(scenarios.All(sc => Math.Abs(sc.HeadPl2.Value - 0.8727) < tolerance)); } @@ -288,8 +288,8 @@ CharacteristicPointType point2; bool doNotCoincide = combineImportedData.CheckCharacteristicPointsForCoincidingLocations(surfaceLine, out point1, out point2); Assert.IsFalse(doNotCoincide); - Assert.AreEqual(CharacteristicPointType.DikeTopAtPolder, point1); - Assert.AreEqual(CharacteristicPointType.ShoulderBaseInside, point2); + Assert.That(point1, Is.EqualTo(CharacteristicPointType.DikeTopAtPolder)); + Assert.That(point2, Is.EqualTo(CharacteristicPointType.ShoulderBaseInside)); } [Test] @@ -309,7 +309,7 @@ combineImportedData.ErrorMessages.Clear(); bool doNotCoincide = combineImportedData.CheckOnCoincidingPoints(surfaceLine); Assert.IsFalse(doNotCoincide); - Assert.AreEqual(1, combineImportedData.ErrorMessages.Count); + Assert.That(combineImportedData.ErrorMessages.Count, Is.EqualTo(1)); Assert.IsTrue(combineImportedData.ErrorMessages[0].Message.Contains(CharacteristicPointType.DikeTopAtPolder.ToString())); Assert.IsTrue(combineImportedData.ErrorMessages[0].Message.Contains(CharacteristicPointType.ShoulderBaseInside.ToString())); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/FeatureTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/FeatureTest.cs (.../FeatureTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Domain/FeatureTest.cs (.../FeatureTest.cs) (revision 4625) @@ -38,11 +38,11 @@ const string geometryWkt = "POINT (0.1 0.2)"; feature = Feature.Create(geometryWkt); Assert.IsNotNull(feature); - Assert.AreEqual(geometryWkt, feature.WktFormat); + Assert.That(feature.WktFormat, Is.EqualTo(geometryWkt)); feature = Feature.Create(geometryWkt); Assert.IsNotNull(feature); - Assert.AreEqual(geometryWkt, feature.WktFormat); + Assert.That(feature.WktFormat, Is.EqualTo(geometryWkt)); Assert.IsInstanceOf(typeof(Point), feature.Geometry); } @@ -80,7 +80,7 @@ const string geometryWkt = "MULTIPOINT (0.0 0.1,0.2 0.3)"; feature = Feature.Create(geometryWkt); Assert.IsNotNull(feature); - Assert.AreEqual(geometryWkt, feature.WktFormat); + Assert.That(feature.WktFormat, Is.EqualTo(geometryWkt)); Assert.IsInstanceOf(typeof(MultiPoint), feature.Geometry); }; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs (.../GeometryFileTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/GeometryFileTest.cs (.../GeometryFileTest.cs) (revision 4625) @@ -37,41 +37,41 @@ const string fileName = "test.tst"; var file = new MockFile("", fileName); string expected = Path.Combine(Directory.GetCurrentDirectory(), fileName); - Assert.AreEqual(expected, file.FullPath); + Assert.That(file.FullPath, Is.EqualTo(expected)); file = new MockFile(fileName); - Assert.AreEqual(expected, file.FullPath); + Assert.That(file.FullPath, Is.EqualTo(expected)); } [Test] public void FileReturnsTheFileNameWithoutExtension() { var file = new MockFile(string.Empty, "test.tst"); - Assert.AreEqual("test", file.NameWithoutExtension); + Assert.That(file.NameWithoutExtension, Is.EqualTo("test")); } [Test] public void FileReturnsOnlyTheLocation() { var file = new MockFile("", "test.tst"); - Assert.AreEqual(Directory.GetCurrentDirectory(), file.DirectoryName); + Assert.That(file.DirectoryName, Is.EqualTo(Directory.GetCurrentDirectory())); } [Test] public void FileReturnsOnlyTheExtension() { var file = new MockFile(string.Empty, "test.tst"); - Assert.AreEqual(".tst", file.FileExtension); + Assert.That(file.FileExtension, Is.EqualTo(".tst")); } [Test] public void FileReturnsOnlyTheName() { var file = new MockFile("", "test.tst"); - Assert.AreEqual("test.tst", file.FileName); + Assert.That(file.FileName, Is.EqualTo("test.tst")); file = new MockFile("test.tst"); - Assert.AreEqual("test.tst", file.FileName); + Assert.That(file.FileName, Is.EqualTo("test.tst")); } [Test] @@ -96,15 +96,15 @@ { string location = Directory.GetCurrentDirectory(); var file = new MockFile(location, existingFile); - Assert.AreEqual(location + "\\" + existingFile, file.FullPath); + Assert.That(file.FullPath, Is.EqualTo(location + "\\" + existingFile)); } [Test] public void FileReturnsCorrectFullPathOnExistingFileUsingToString() { string location = Directory.GetCurrentDirectory(); var file = new MockFile(location, existingFile); - Assert.AreEqual(location + "\\" + existingFile, file.ToString()); + Assert.That(file.ToString(), Is.EqualTo(location + "\\" + existingFile)); } [Test] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileCreatorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileCreatorTest.cs (.../ShapeFileCreatorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/ShapeFileCreatorTest.cs (.../ShapeFileCreatorTest.cs) (revision 4625) @@ -83,7 +83,7 @@ IFeatureRepository retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile); Assert.IsNotNull(retrievedRepository); Assert.IsTrue(retrievedRepository.Count == 1); - Assert.AreEqual("LineString", repository.Features.ElementAt(0).Geometry.GeometryType); + Assert.That(repository.Features.ElementAt(0).Geometry.GeometryType, Is.EqualTo("LineString")); } [Test] @@ -117,7 +117,7 @@ IFeatureRepository retrievedRepository = FeatureRepository.CreateFromShapeFile(shapeFile); Assert.IsNotNull(retrievedRepository); Assert.IsTrue(retrievedRepository.Count == 1); - Assert.AreEqual("GeometryPoint", repository.Features.ElementAt(0).Geometry.GeometryType); + Assert.That(repository.Features.ElementAt(0).Geometry.GeometryType, Is.EqualTo("GeometryPoint")); } /* [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs (.../LocationTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LocationTest.cs (.../LocationTest.cs) (revision 4625) @@ -46,8 +46,8 @@ actualLocation.SetParameterFromNameValuePair(soilDetail.Key, soilDetail.Value); } - Assert.AreEqual(expectedLocation.DampingFactorPL3, actualLocation.DampingFactorPL3, - cTolerance); + Assert.That(actualLocation.DampingFactorPL3, + Is.EqualTo(expectedLocation.DampingFactorPL3).Within(cTolerance)); } } @@ -67,15 +67,15 @@ var actualLocation = new Location(); // assert - Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated); - Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength); - Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad); - Assert.AreEqual(null, actualLocation.TL_DegreeOfConsolidation); - Assert.AreEqual(plLineCreationMethod, actualLocation.PLLineCreationMethod); - Assert.AreEqual(IntrusionVerticalWaterPressureType.Standard, actualLocation.IntrusionVerticalWaterPressure); - Assert.AreEqual(stabilityShoulderGrowSlope, actualLocation.StabilityShoulderGrowSlope, 1e-12); - Assert.AreEqual(stabilityShoulderGrowDeltaX, actualLocation.StabilityShoulderGrowDeltaX); - Assert.AreEqual(stabilitySlopeAdaptionDeltaX, actualLocation.StabilitySlopeAdaptionDeltaX); + Assert.That(actualLocation.AreLocalXZObjectsCreated, Is.EqualTo(areLocalXzObjectsCreated)); + Assert.That(actualLocation.PenetrationLength, Is.EqualTo(penetrationLength)); + Assert.That(actualLocation.TrafficLoad, Is.EqualTo(trafficLoad)); + Assert.That(actualLocation.TL_DegreeOfConsolidation, Is.EqualTo(null)); + Assert.That(actualLocation.PLLineCreationMethod, Is.EqualTo(plLineCreationMethod)); + Assert.That(actualLocation.IntrusionVerticalWaterPressure, Is.EqualTo(IntrusionVerticalWaterPressureType.Standard)); + Assert.That(actualLocation.StabilityShoulderGrowSlope, Is.EqualTo(stabilityShoulderGrowSlope).Within(1e-12)); + Assert.That(actualLocation.StabilityShoulderGrowDeltaX, Is.EqualTo(stabilityShoulderGrowDeltaX)); + Assert.That(actualLocation.StabilitySlopeAdaptionDeltaX, Is.EqualTo(stabilitySlopeAdaptionDeltaX)); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ShapeFileExporterTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ShapeFileExporterTest.cs (.../ShapeFileExporterTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/ShapeFileExporterTest.cs (.../ShapeFileExporterTest.cs) (revision 4625) @@ -67,7 +67,7 @@ Assert.IsNotNull(retrievedRepository); IFeature retrievedFeature = retrievedRepository.Features.ElementAt(0); - Assert.AreEqual(1.7, retrievedFeature.Attributes[attrName]); + Assert.That(retrievedFeature.Attributes[attrName], Is.EqualTo(1.7)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 4625) @@ -42,15 +42,15 @@ [TestCase(InputDamProjectType.Operational, DamProjectType.Calamity)] 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.Calamity, InputDamProjectType.Operational)] public void CanConvertToInputDamProjectType(DamProjectType damProjectType, InputDamProjectType inputDamProjectType) { - Assert.AreEqual(inputDamProjectType, ConversionHelper.ConvertToInputDamProjectType(damProjectType)); + Assert.That(ConversionHelper.ConvertToInputDamProjectType(damProjectType), Is.EqualTo(inputDamProjectType)); } [Test] @@ -61,7 +61,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] @@ -72,7 +72,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] @@ -83,7 +83,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] @@ -94,7 +94,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] @@ -118,7 +118,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] @@ -142,7 +142,7 @@ [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] @@ -157,7 +157,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] @@ -172,31 +172,31 @@ [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] [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] [TestCase(SoilProfileType.SoilProfile1D, 0)] [TestCase(SoilProfileType.SoilGeometryStiFile, 2)] public void CanConvertToInputSoilGeometryType(SoilProfileType soilProfileType, int inputSoilGeometryType) { - Assert.AreEqual(inputSoilGeometryType, ConversionHelper.ConvertToInputSoilProfileType(soilProfileType)); + Assert.That(ConversionHelper.ConvertToInputSoilProfileType(soilProfileType), Is.EqualTo(inputSoilGeometryType)); } [Test] [TestCase(0, SoilProfileType.SoilProfile1D)] [TestCase(2, SoilProfileType.SoilGeometryStiFile)] public void CanConvertToSoilGeometryType(int inputSoilGeometryType, SoilProfileType soilProfileType) { - Assert.AreEqual(soilProfileType, ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryType)); + Assert.That(ConversionHelper.ConvertToSoilProfileType(inputSoilGeometryType), Is.EqualTo(soilProfileType)); } [Test] @@ -205,7 +205,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] @@ -214,7 +214,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,47 +223,47 @@ [TestCase(FailureMechanismSystemType.Piping, ConversionHelper.InputSegmentFailureMechanismPiping)] public void CanConvertToInputSegmentFailureMechanismType(FailureMechanismSystemType failureMechanismSystemType, int inputFailureMechanismSystemType) { - Assert.AreEqual(inputFailureMechanismSystemType, ConversionHelper.ConvertToInputSegmentFailureMechanismType(failureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToInputSegmentFailureMechanismType(failureMechanismSystemType), Is.EqualTo(inputFailureMechanismSystemType)); } [Test] [TestCase(ConversionHelper.InputSegmentFailureMechanismStability, FailureMechanismSystemType.StabilityInside)] [TestCase(ConversionHelper.InputSegmentFailureMechanismPiping, FailureMechanismSystemType.Piping)] public void CanConvertToSegmentFailureMechanismType(int inputFailureMechanismSystemType, FailureMechanismSystemType failureMechanismSystemType) { - Assert.AreEqual(failureMechanismSystemType, ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType)); + Assert.That(ConversionHelper.ConvertToSegmentFailureMechanismType(inputFailureMechanismSystemType), Is.EqualTo(failureMechanismSystemType)); } [Test] [TestCase(InputAnalysisType.AdaptGeometry, AnalysisType.AdaptGeometry)] [TestCase(InputAnalysisType.NoAdaption, AnalysisType.NoAdaption)] public void CanConvertToInputAnalysisType(AnalysisType analysisType, InputAnalysisType inputAnalysisType) { - Assert.AreEqual(inputAnalysisType, ConversionHelper.ConvertToInputAnalysisType(analysisType)); + Assert.That(ConversionHelper.ConvertToInputAnalysisType(analysisType), Is.EqualTo(inputAnalysisType)); } [Test] [TestCase(AnalysisType.AdaptGeometry, InputAnalysisType.AdaptGeometry)] [TestCase(AnalysisType.NoAdaption, InputAnalysisType.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] [TestCase(ConversionHelper.InputZoneTypeNoZones, MStabZonesType.NoZones)] [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] @@ -275,7 +275,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] @@ -284,7 +284,7 @@ [TestCase(MessageMessageType.Warning, LogMessageType.Warning)] public void CanConvertToMessageType(MessageMessageType messageType, LogMessageType logMessageType) { - Assert.AreEqual(logMessageType, ConversionHelper.ConvertToMessageType(messageType)); + Assert.That(ConversionHelper.ConvertToMessageType(messageType), Is.EqualTo(logMessageType)); } [Test] @@ -293,7 +293,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] @@ -302,55 +302,55 @@ [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] [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] [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundatyLines)] [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)] public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) { - Assert.AreEqual(inputTangentLineType, ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType)); + Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); } [Test] [TestCase(ConversionHelper.InputTangentLinesOnBoundatyLines, TangentLinesDefinition.OnBoundaryLines)] [TestCase(ConversionHelper.InputTangentLinesSpecified, TangentLinesDefinition.Specified)] public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) { - Assert.AreEqual(tangentLineType, ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType)); + Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); } [Test] [TestCase(ShearStrengthModel.CPhi, SoilShearStrengthModel.CPhi)] [TestCase(ShearStrengthModel.CuCalculated, SoilShearStrengthModel.SuCalculated)] public void CanConvertToSoilShearStrengthModel(ShearStrengthModel shearStrengthModel, SoilShearStrengthModel soilShearStrengthModel) { - Assert.AreEqual(soilShearStrengthModel, ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel)); + Assert.That(ConversionHelper.ConvertToSoilShearStrengthModel(shearStrengthModel), Is.EqualTo(soilShearStrengthModel)); } [Test] [TestCase(SoilShearStrengthModel.CPhi, ShearStrengthModel.CPhi)] [TestCase(SoilShearStrengthModel.SuCalculated, ShearStrengthModel.CuCalculated)] public void CanConvertToShearStrengthModel(SoilShearStrengthModel soilShearStrengthModel, ShearStrengthModel shearStrengthModel) { - Assert.AreEqual(shearStrengthModel, ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel)); + Assert.That(ConversionHelper.ConvertToShearStrengthModel(soilShearStrengthModel), Is.EqualTo(shearStrengthModel)); } [Test] @@ -359,7 +359,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] @@ -368,55 +368,55 @@ [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] [TestCase(LoadSituation.Dry, ConversionHelper.LoadSituationDry)] [TestCase(LoadSituation.Wet, ConversionHelper.LoadSituationWet)] public void CanConvertToOutputLoadSituation(LoadSituation loadSituation, int outputLoadSituation) { - Assert.AreEqual(outputLoadSituation, ConversionHelper.ConvertToOutputLoadSituation(loadSituation)); + Assert.That(ConversionHelper.ConvertToOutputLoadSituation(loadSituation), Is.EqualTo(outputLoadSituation)); } [Test] [TestCase(ConversionHelper.LoadSituationDry, LoadSituation.Dry)] [TestCase(ConversionHelper.LoadSituationWet, LoadSituation.Wet)] public void CanConvertToLoadSituation(int outputLoadSituation, LoadSituation loadSituation) { - Assert.AreEqual(loadSituation, ConversionHelper.ConvertToLoadSituation(outputLoadSituation)); + Assert.That(ConversionHelper.ConvertToLoadSituation(outputLoadSituation), Is.EqualTo(loadSituation)); } [Test] [TestCase(UpliftType.Uplift, ConversionHelper.UpliftTypeUplift)] [TestCase(UpliftType.NoUplift, ConversionHelper.UpliftTypeNoUplift)] public void CanConvertToOutputUpliftType(UpliftType upliftType, int outputUpliftType) { - Assert.AreEqual(outputUpliftType, ConversionHelper.ConvertToOutputUpliftType(upliftType)); + Assert.That(ConversionHelper.ConvertToOutputUpliftType(upliftType), Is.EqualTo(outputUpliftType)); } [Test] [TestCase(ConversionHelper.UpliftTypeUplift, UpliftType.Uplift)] [TestCase(ConversionHelper.UpliftTypeNoUplift, UpliftType.NoUplift)] public void CanConvertToUpliftType(int outputUpliftType, UpliftType upliftType) { - Assert.AreEqual(upliftType, ConversionHelper.ConvertToUpliftType(outputUpliftType)); + Assert.That(ConversionHelper.ConvertToUpliftType(outputUpliftType), Is.EqualTo(upliftType)); } [Test] @@ -429,7 +429,7 @@ [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { - Assert.AreEqual(outputMStabModelType, ConversionHelper.ConvertToOutputMStabModelType(mStabModelType)); + Assert.That(ConversionHelper.ConvertToOutputMStabModelType(mStabModelType), Is.EqualTo(outputMStabModelType)); } [Test] @@ -442,7 +442,7 @@ [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { - Assert.AreEqual(mStabModelType, ConversionHelper.ConvertToMStabModelType(outputMStabModelType)); + Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); } [Test] @@ -452,7 +452,7 @@ public void CanConvertToOutputStabilityModelType(DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType, MStabModelType stabilityModelType) { - Assert.AreEqual(outputStabilityModelType, ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType)); + Assert.That(ConversionHelper.ConvertToOutputStabilityModelType(stabilityModelType), Is.EqualTo(outputStabilityModelType)); } [Test] @@ -462,7 +462,7 @@ public void CanConvertToStabilityModelType(MStabModelType stabilityModelType, DesignResultStabilityDesignResultsStabilityModelType outputStabilityModelType) { - Assert.AreEqual(stabilityModelType, ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType)); + Assert.That(ConversionHelper.ConvertToStabilityModelType(outputStabilityModelType), Is.EqualTo(stabilityModelType)); } [Test] @@ -476,7 +476,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] @@ -490,7 +490,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.InputSegmentFailureMechanismAll)] @@ -505,7 +505,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)] @@ -514,39 +514,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("Sand", SoilType.Sand)] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PolyLineTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PolyLineTest.cs (.../PolyLineTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/PolyLineTest.cs (.../PolyLineTest.cs) (revision 4625) @@ -102,17 +102,17 @@ { const double cTolerance = 0.0001; PolyLine polyLine = CreateStrictAscendingPolyLine(); - Assert.AreEqual(5.0, polyLine.YFromX(1.0), cTolerance); - Assert.AreEqual(9.0, polyLine.YFromX(4.0), cTolerance); + Assert.That(polyLine.YFromX(1.0), Is.EqualTo(5.0).Within(cTolerance)); + Assert.That(polyLine.YFromX(4.0), Is.EqualTo(9.0).Within(cTolerance)); } [Test] public void CheckIfYFromXEvaluatesCorrectlyWithOutOfBoundsXValues() { const double cTolerance = 0.0001; PolyLine polyLine = CreateStrictAscendingPolyLine(); - Assert.AreEqual(0.0, polyLine.YFromX(-3.0), cTolerance); - Assert.AreEqual(7.0, polyLine.YFromX(10.0), cTolerance); + Assert.That(polyLine.YFromX(-3.0), Is.EqualTo(0.0).Within(cTolerance)); + Assert.That(polyLine.YFromX(10.0), Is.EqualTo(7.0).Within(cTolerance)); } /// @@ -123,8 +123,8 @@ { const double cTolerance = 0.0001; PolyLine polyLine = CreateNotStrictAscendingPolyLine(); - Assert.AreEqual(5.0, polyLine.YFromX(1.0), cTolerance); - Assert.AreEqual(10.0, polyLine.YFromX(3.0), cTolerance); + Assert.That(polyLine.YFromX(1.0), Is.EqualTo(5.0).Within(cTolerance)); + Assert.That(polyLine.YFromX(3.0), Is.EqualTo(10.0).Within(cTolerance)); } /// @@ -148,7 +148,7 @@ polyLine1.Points.Add(polyLine1.Points[0]); int currentLength = polyLine1.Points.Count; polyLine1.DeleteCoinsidingPoints(); - Assert.AreEqual(currentLength - 1, polyLine1.Points.Count); + Assert.That(polyLine1.Points.Count, Is.EqualTo(currentLength - 1)); } /// @@ -176,8 +176,8 @@ }; IList intersectionPoints = polyLine1.IntersectionPointsXzWithLineXz(line); Assert.IsTrue(intersectionPoints.Count == 1); - Assert.AreEqual(1.0, intersectionPoints[0].X, GeometryPoint.Precision); - Assert.AreEqual(-1.0, intersectionPoints[0].Z, GeometryPoint.Precision); + Assert.That(intersectionPoints[0].X, Is.EqualTo(1.0).Within(GeometryPoint.Precision)); + Assert.That(intersectionPoints[0].Z, Is.EqualTo(-1.0).Within(GeometryPoint.Precision)); } [Test] @@ -204,10 +204,10 @@ }; IList intersectionPoints = polyLine1.IntersectionPointsXzWithLineXz(line); Assert.IsTrue(intersectionPoints.Count == 2); - Assert.AreEqual(1.0, intersectionPoints[0].X, GeometryPoint.Precision); - Assert.AreEqual(-1.0, intersectionPoints[0].Z, GeometryPoint.Precision); - Assert.AreEqual(11.0, intersectionPoints[1].X, GeometryPoint.Precision); - Assert.AreEqual(-1.0, intersectionPoints[1].Z, GeometryPoint.Precision); + Assert.That(intersectionPoints[0].X, Is.EqualTo(1.0).Within(GeometryPoint.Precision)); + Assert.That(intersectionPoints[0].Z, Is.EqualTo(-1.0).Within(GeometryPoint.Precision)); + Assert.That(intersectionPoints[1].X, Is.EqualTo(11.0).Within(GeometryPoint.Precision)); + Assert.That(intersectionPoints[1].Z, Is.EqualTo(-1.0).Within(GeometryPoint.Precision)); } private PolyLine CreateStrictAscendingPolyLine() Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 4625) @@ -116,52 +116,52 @@ const string inputFilename = "OutputFilePiping.xml"; DamProjectData combinedDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output); - Assert.AreEqual(4, combinedDamProjectData.DesignCalculations.Count); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[2].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[3].Scenario); + Assert.That(combinedDamProjectData.DesignCalculations.Count, Is.EqualTo(4)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[2].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[3].Scenario, Is.Not.EqualTo(null)); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].ProfileName); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[0].ProfileName); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].Calculation); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[0].Calculation); - Assert.AreEqual(PipingModelType.Bligh, combinedDamProjectData.DesignCalculations[0].PipingModel); - Assert.AreEqual(0, combinedDamProjectData.DesignCalculations[0].SafetyFactor); - Assert.AreEqual(34.21, combinedDamProjectData.DesignCalculations[0].PipingExitPointX); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].PipingExitPointY); - Assert.AreEqual(100.0, combinedDamProjectData.DesignCalculations[0].PipingEntryPointX); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].PipingEntryPointY); - Assert.AreEqual(100, combinedDamProjectData.DesignCalculations[0].DikeToeAtRiverXrd); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[0].PipingToeAtPolderZ); - StringAssert.Contains(combinedDamProjectData.DesignCalculations[0].BaseFileName + ".prxml", combinedDamProjectData.DesignCalculations[0].PipingResultFile); + Assert.That(combinedDamProjectData.DesignCalculations[0].ProfileName, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].ProfileName, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingModel, Is.EqualTo(PipingModelType.Bligh)); + Assert.That(combinedDamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingExitPointX, Is.EqualTo(34.21)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingExitPointY, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingEntryPointX, Is.EqualTo(100.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingEntryPointY, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].DikeToeAtRiverXrd, Is.EqualTo(100)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingToeAtPolderZ, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].PipingResultFile, Does.Contain(combinedDamProjectData.DesignCalculations[0].BaseFileName + ".prxml")); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].ProfileName); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[1].ProfileName); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].Calculation); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[1].Calculation); - Assert.AreEqual(PipingModelType.Bligh, combinedDamProjectData.DesignCalculations[1].PipingModel); - Assert.AreEqual(1.03, combinedDamProjectData.DesignCalculations[1].SafetyFactor); - Assert.AreEqual(34.21, combinedDamProjectData.DesignCalculations[1].PipingExitPointX); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[1].PipingExitPointY); - Assert.AreEqual(100.0, combinedDamProjectData.DesignCalculations[1].PipingEntryPointX); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[1].PipingEntryPointY); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[1].PipingToeAtPolderX); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[1].PipingToeAtPolderZ); - Assert.AreEqual(0.2, combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted); - Assert.AreEqual(0.7, combinedDamProjectData.DesignCalculations[1].Pl3MinUplift); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[1].Pl3LocationYMinUplift); - StringAssert.Contains(combinedDamProjectData.DesignCalculations[1].BaseFileName + ".prxml", combinedDamProjectData.DesignCalculations[1].PipingResultFile); + Assert.That(combinedDamProjectData.DesignCalculations[1].ProfileName, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].ProfileName, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingModel, Is.EqualTo(PipingModelType.Bligh)); + Assert.That(combinedDamProjectData.DesignCalculations[1].SafetyFactor, Is.EqualTo(1.03)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingExitPointX, Is.EqualTo(34.21)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingExitPointY, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingEntryPointX, Is.EqualTo(100.0)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingEntryPointY, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingToeAtPolderX, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingToeAtPolderZ, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted, Is.EqualTo(0.2)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3MinUplift, Is.EqualTo(0.7)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3LocationYMinUplift, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[1].PipingResultFile, Does.Contain(combinedDamProjectData.DesignCalculations[1].BaseFileName + ".prxml")); DamXmlSerialization.SaveOutputAsXmlFile(inputFilename, output); output = DamXmlSerialization.LoadOutputFromXmlFile(inputFilename); DamProjectData actualDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output); CompareDamProjectData(actualDamProjectData, combinedDamProjectData); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].CalculationResult, actualDamProjectData.DesignCalculations[0].CalculationResult); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].SafetyFactor, actualDamProjectData.DesignCalculations[0].SafetyFactor); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].LocationName, actualDamProjectData.DesignCalculations[0].LocationName); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].StabilityModel, actualDamProjectData.DesignCalculations[0].StabilityModel); + Assert.That(actualDamProjectData.DesignCalculations[0].CalculationResult, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].CalculationResult)); + Assert.That(actualDamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].SafetyFactor)); + Assert.That(actualDamProjectData.DesignCalculations[0].LocationName, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].LocationName)); + Assert.That(actualDamProjectData.DesignCalculations[0].StabilityModel, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].StabilityModel)); Assert.IsNotNull(actualDamProjectData.DesignCalculations[0].RedesignedSurfaceLine2); } @@ -175,49 +175,49 @@ DamProjectData combinedDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output); - Assert.AreEqual(4, combinedDamProjectData.DesignCalculations.Count); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[2].Scenario); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[3].Scenario); + Assert.That(combinedDamProjectData.DesignCalculations.Count, Is.EqualTo(4)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[2].Scenario, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[3].Scenario, Is.Not.EqualTo(null)); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].ProfileName); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[0].ProfileName); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[0].Calculation); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[0].Calculation); - Assert.AreEqual(mStabModelType, combinedDamProjectData.DesignCalculations[0].StabilityModel); - Assert.AreEqual(0, combinedDamProjectData.DesignCalculations[0].SafetyFactor); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[0].StabilityShoulderHeight); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[0].DikeLength); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3HeadAdjusted); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3MinUplift); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[0].Pl3LocationYMinUplift); - Assert.AreEqual(0, combinedDamProjectData.DesignCalculations[0].NumberOfIterations); - StringAssert.Contains(combinedDamProjectData.DesignCalculations[0].BaseFileName + ".rsxml", - combinedDamProjectData.DesignCalculations[0].GetDesignResultFile()); + Assert.That(combinedDamProjectData.DesignCalculations[0].ProfileName, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].ProfileName, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Calculation, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[0].StabilityModel, Is.EqualTo(mStabModelType)); + Assert.That(combinedDamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].StabilityShoulderHeight, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].DikeLength, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Pl3HeadAdjusted, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Pl3MinUplift, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].Pl3LocationYMinUplift, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].NumberOfIterations, Is.EqualTo(0)); + Assert.That(combinedDamProjectData.DesignCalculations[0].GetDesignResultFile(), + Does.Contain(combinedDamProjectData.DesignCalculations[0].BaseFileName + ".rsxml")); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].ProfileName); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[1].ProfileName); - Assert.AreNotEqual(null, combinedDamProjectData.DesignCalculations[1].Calculation); - Assert.AreNotEqual("", combinedDamProjectData.DesignCalculations[1].Calculation); - Assert.AreEqual(mStabModelType, combinedDamProjectData.DesignCalculations[1].StabilityModel); - Assert.AreEqual(1.2, combinedDamProjectData.DesignCalculations[1].SafetyFactor); - Assert.AreEqual(null, combinedDamProjectData.DesignCalculations[1].StabilityShoulderHeight); - Assert.AreEqual(0.2, combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted); - Assert.AreEqual(0.7, combinedDamProjectData.DesignCalculations[1].Pl3MinUplift); - Assert.AreEqual(0.0, combinedDamProjectData.DesignCalculations[1].Pl3LocationYMinUplift); - Assert.AreEqual(1, combinedDamProjectData.DesignCalculations[1].NumberOfIterations); - StringAssert.Contains(combinedDamProjectData.DesignCalculations[1].BaseFileName + ".rsxml", - combinedDamProjectData.DesignCalculations[1].GetDesignResultFile()); + Assert.That(combinedDamProjectData.DesignCalculations[1].ProfileName, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].ProfileName, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Calculation, Is.Not.EqualTo("")); + Assert.That(combinedDamProjectData.DesignCalculations[1].StabilityModel, Is.EqualTo(mStabModelType)); + Assert.That(combinedDamProjectData.DesignCalculations[1].SafetyFactor, Is.EqualTo(1.2)); + Assert.That(combinedDamProjectData.DesignCalculations[1].StabilityShoulderHeight, Is.EqualTo(null)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3HeadAdjusted, Is.EqualTo(0.2)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3MinUplift, Is.EqualTo(0.7)); + Assert.That(combinedDamProjectData.DesignCalculations[1].Pl3LocationYMinUplift, Is.EqualTo(0.0)); + Assert.That(combinedDamProjectData.DesignCalculations[1].NumberOfIterations, Is.EqualTo(1)); + Assert.That(combinedDamProjectData.DesignCalculations[1].GetDesignResultFile(), + Does.Contain(combinedDamProjectData.DesignCalculations[1].BaseFileName + ".rsxml")); DamXmlSerialization.SaveOutputAsXmlFile(inputFilename, output); output = DamXmlSerialization.LoadOutputFromXmlFile(inputFilename); DamProjectData actualDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(inputProjectData, output); CompareDamProjectData(actualDamProjectData, combinedDamProjectData); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].CalculationResult, actualDamProjectData.DesignCalculations[0].CalculationResult); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].SafetyFactor, actualDamProjectData.DesignCalculations[0].SafetyFactor); - Assert.AreEqual(combinedDamProjectData.DesignCalculations[0].LocationName, actualDamProjectData.DesignCalculations[0].LocationName); + Assert.That(actualDamProjectData.DesignCalculations[0].CalculationResult, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].CalculationResult)); + Assert.That(actualDamProjectData.DesignCalculations[0].SafetyFactor, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].SafetyFactor)); + Assert.That(actualDamProjectData.DesignCalculations[0].LocationName, Is.EqualTo(combinedDamProjectData.DesignCalculations[0].LocationName)); Assert.IsNotNull(actualDamProjectData.DesignCalculations[0].RedesignedSurfaceLine2); } @@ -620,7 +620,7 @@ "MapForSoilGeometries2D" }; ComparisonResult result = compare.Compare(expected, actual); - Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Input object"); + Assert.That(result.Differences.Count, Is.EqualTo(0), "Differences found read/write Input object"); } } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs (.../AuthorizationTestBase.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/AuthorizationTestBase.cs (.../AuthorizationTestBase.cs) (revision 4625) @@ -41,7 +41,7 @@ var asm = Assembly.GetAssembly(typeof(DAuthClient)); byte[] pktb = asm.GetName().GetPublicKeyToken(); string pkt = BitConverter.ToString(pktb).Replace("-", "").ToLowerInvariant(); - Assert.AreEqual(expected, pkt); + Assert.That(pkt, Is.EqualTo(expected)); } [Test] @@ -94,7 +94,7 @@ { var awres = ""; Assert.IsTrue(aw.GetVendor(GetFeature(), ref awres)); - Assert.AreEqual("Deltares", awres); + Assert.That(awres, Is.EqualTo("Deltares")); } } @@ -105,7 +105,7 @@ { var awres = ""; Assert.IsTrue(aw.GetDistributor(GetFeature(), ref awres)); - Assert.AreEqual("Deltares", awres); + Assert.That(awres, Is.EqualTo("Deltares")); } } @@ -116,7 +116,7 @@ { String awres = null; Assert.IsTrue(aw.GetNotice(GetFeature(), ref awres)); - Assert.AreEqual("This product is licensed to Stichting Deltares.", awres); + Assert.That(awres, Is.EqualTo("This product is licensed to Stichting Deltares.")); } } @@ -127,7 +127,7 @@ { String awres = null; Assert.IsTrue(aw.GetUsername(GetFeature(), ref awres)); - Assert.AreEqual("Stichting Deltares", awres); + Assert.That(awres, Is.EqualTo("Stichting Deltares")); } } @@ -142,10 +142,10 @@ Assert.IsTrue(aw.CheckOut(GetFeature(), GetSupportedFeatureVersions().First())); int secondCount = -1; aw.GetCount(GetFeature(), ref secondCount); - Assert.AreEqual(firstCount + 1, secondCount); + Assert.That(secondCount, Is.EqualTo(firstCount + 1)); Assert.IsTrue(aw.CheckIn(GetFeature())); aw.GetCount(GetFeature(), ref secondCount); - Assert.AreEqual(firstCount, secondCount); + Assert.That(secondCount, Is.EqualTo(firstCount)); } } @@ -156,7 +156,7 @@ { var expiration = new DateTime(1900, 1, 1, 0, 0, 0); aw.GetExpiration(GetFeature(), ref expiration); - Assert.AreEqual(2000, expiration.Year); + Assert.That(expiration.Year, Is.EqualTo(2000)); } } @@ -184,11 +184,11 @@ int count = -1; string feature = GetFeature(); Assert.IsTrue(aw.GetUsedLicenses(feature, Environment.UserName, ref count)); - Assert.AreEqual(0, count); + Assert.That(count, Is.EqualTo(0)); Assert.IsTrue(aw.CheckOut(feature, GetSupportedFeatureVersions().First())); Assert.IsTrue(aw.GetUsedLicenses(feature, Environment.UserName, ref count)); - Assert.AreEqual(1, count); + Assert.That(count, Is.EqualTo(1)); Assert.IsTrue(aw.CheckIn(feature)); } } @@ -200,7 +200,7 @@ { var count = 0; Assert.IsTrue(aw.GetAvailableLicenses(GetFeature(), ref count)); - Assert.AreEqual(500, count); + Assert.That(count, Is.EqualTo(500)); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/ObjectLeakMonitorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/ObjectLeakMonitorTest.cs (.../ObjectLeakMonitorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/ObjectLeakMonitorTest.cs (.../ObjectLeakMonitorTest.cs) (revision 4625) @@ -54,7 +54,7 @@ Type type = monitor.MonitoredObjectType; // assert - Assert.AreEqual(objectToMonitor.GetType(), type); + Assert.That(type, Is.EqualTo(objectToMonitor.GetType())); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 4625) @@ -103,12 +103,12 @@ Sensor sensor2 = Sensor.Deserialize(xml); // assert - Assert.AreEqual(sensor1.ID, sensor2.ID); - Assert.AreEqual(sensor1.Name, sensor2.Name); - Assert.AreEqual(sensor1.Depth, sensor2.Depth); - Assert.AreEqual(sensor1.Type, sensor2.Type); - Assert.AreEqual(sensor1.XRd, sensor2.XRd); - Assert.AreEqual(sensor1.YRd, sensor2.YRd); + Assert.That(sensor2.ID, Is.EqualTo(sensor1.ID)); + Assert.That(sensor2.Name, Is.EqualTo(sensor1.Name)); + Assert.That(sensor2.Depth, Is.EqualTo(sensor1.Depth)); + Assert.That(sensor2.Type, Is.EqualTo(sensor1.Type)); + Assert.That(sensor2.XRd, Is.EqualTo(sensor1.XRd)); + Assert.That(sensor2.YRd, Is.EqualTo(sensor1.YRd)); foreach (PLLineType plLineType in sensor1.PLLineMappings) { Assert.Contains(plLineType, sensor2.PLLineMappings); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs (.../CsvParserTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/CsvParserTest.cs (.../CsvParserTest.cs) (revision 4625) @@ -86,17 +86,17 @@ public void CanParseHeaderWithSemicolonSeparatedItems() { string[] items = CsvParser.ParseHeader("header1;header 2", new Regex(CsvParser.CsvSplitPatternSemicolonOnly)); - Assert.AreEqual(2, items.Length); - Assert.AreEqual("header1", items[0]); - Assert.AreEqual("header 2", items[1]); + Assert.That(items.Length, Is.EqualTo(2)); + Assert.That(items[0], Is.EqualTo("header1")); + Assert.That(items[1], Is.EqualTo("header 2")); } [Test] public void CannotParseHeaderWithCommaSeparatedItems() { string[] items = CsvParser.ParseHeader("header1,header 2", new Regex(CsvParser.CsvSplitPatternSemicolonOnly)); - Assert.AreEqual(1, items.Length); - Assert.AreEqual("header1,header 2", items[0]); + Assert.That(items.Length, Is.EqualTo(1)); + Assert.That(items[0], Is.EqualTo("header1,header 2")); } [Test] @@ -179,9 +179,9 @@ loader.Add("name", (entity, value) => entity.Name = value); loader.Add("age", (entity, value) => entity.Age = int.Parse(value)); List items = loader.LoadFromCsvFile(testFile).ToList(); - Assert.AreEqual(4, items.Count); - Assert.AreEqual("Tom", items.ElementAt(2).Name); - Assert.AreEqual(48, items.ElementAt(2).Age); + Assert.That(items.Count, Is.EqualTo(4)); + Assert.That(items.ElementAt(2).Name, Is.EqualTo("Tom")); + Assert.That(items.ElementAt(2).Age, Is.EqualTo(48)); } private class Foo Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UpliftFactorToBetaCalculatorTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UpliftFactorToBetaCalculatorTest.cs (.../UpliftFactorToBetaCalculatorTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/UpliftFactorToBetaCalculatorTest.cs (.../UpliftFactorToBetaCalculatorTest.cs) (revision 4625) @@ -34,29 +34,29 @@ [Test] public void UpliftFactorsBelowLowerBoundaryComputedCorrectly() { - Assert.AreEqual(CBetaMin, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.4), CTolerance); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.4), Is.EqualTo(CBetaMin).Within(CTolerance)); Assert.IsTrue(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.2) < CBetaMin); Assert.IsTrue(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.0) < CBetaMin); } [Test] public void UpliftFactorsAboveUpperBoundaryComputedCorrectly() { - Assert.AreEqual(CBetaMax, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(2.0), CTolerance); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(2.0), Is.EqualTo(CBetaMax).Within(CTolerance)); Assert.IsTrue(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(3.0) > CBetaMax); } [Test] public void UpliftFactorsWithinNormalRangeComputedCorrectly() { - Assert.AreEqual(-7.2, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.6), CTolerance); - Assert.AreEqual(-3.6, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.8), CTolerance); - Assert.AreEqual(-1.8, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.9), CTolerance); - Assert.AreEqual(-0.36, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.98), CTolerance); - Assert.AreEqual(0.0, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.0), CTolerance); - Assert.AreEqual(1.8, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.1), CTolerance); - Assert.AreEqual(3.6, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.2), CTolerance); - Assert.AreEqual(14.4, UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.8), CTolerance); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.6), Is.EqualTo(-7.2).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.8), Is.EqualTo(-3.6).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.9), Is.EqualTo(-1.8).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(0.98), Is.EqualTo(-0.36).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.0), Is.EqualTo(0.0).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.1), Is.EqualTo(1.8).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.2), Is.EqualTo(3.6).Within(CTolerance)); + Assert.That(UpliftFactorToBetaCalculator.ComputeBetaFromUpliftFactor(1.8), Is.EqualTo(14.4).Within(CTolerance)); } [Test] Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorRepositoryTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorRepositoryTest.cs (.../SensorRepositoryTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Sensors/SensorRepositoryTest.cs (.../SensorRepositoryTest.cs) (revision 4625) @@ -43,7 +43,7 @@ // assert Assert.IsNotNull(sensor); Assert.IsFalse(sensor.IsTransient(), "The sensor ID is transient. This should not be the case when added to the repository"); - Assert.AreEqual(1, repository.Sensors.Count()); + Assert.That(repository.Sensors.Count(), Is.EqualTo(1)); } } @@ -127,7 +127,7 @@ // assert Assert.IsNotEmpty(xml); - Assert.AreEqual(repository.Sensors.Count(), newRepo.Sensors.Count()); + Assert.That(newRepo.Sensors.Count(), Is.EqualTo(repository.Sensors.Count())); Assert.IsTrue(repository.Sensors.Any(s => s.Name == testSensorXyz && s.ID == 1 && s.PLLineMappings.Any(p => p == PLLineType.PL1))); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs =================================================================== diff -u -r4618 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4618) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4625) @@ -129,8 +129,8 @@ using (var newDike = new Dike()) { // assert - Assert.AreEqual(0, newDike.SurfaceLines2.Count); - Assert.AreEqual(0, newDike.Locations.Count); + Assert.That(newDike.SurfaceLines2.Count, Is.EqualTo(0)); + Assert.That(newDike.Locations.Count, Is.EqualTo(0)); } } @@ -139,7 +139,7 @@ { Assert.IsNotNull(dike); - Assert.AreEqual("Dike", dike.Name); + Assert.That(dike.Name, Is.EqualTo("Dike")); //Assert.IsNotNull(this.dike.Segments); Assert.IsNotNull(dike.Locations); Assert.IsNotNull(dike.SurfaceLines2); @@ -162,9 +162,9 @@ { Assert.IsNotNull(location1); - Assert.AreEqual(1, dike.Locations.Count); - Assert.AreEqual(location1, dike.Locations[0]); - Assert.AreEqual("Location1", location1.Name); + Assert.That(dike.Locations.Count, Is.EqualTo(1)); + Assert.That(dike.Locations[0], Is.EqualTo(location1)); + Assert.That(location1.Name, Is.EqualTo("Location1")); } [Test] @@ -173,59 +173,59 @@ Assert.IsNotNull(surfaceLine1); Assert.IsNotNull(surfaceLine1.Geometry.Points); - Assert.AreEqual(1, dike.SurfaceLines2.Count); - Assert.AreEqual(surfaceLine1, dike.SurfaceLines2[0]); - Assert.AreEqual("SurfaceLine1", surfaceLine1.Name); + Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(1)); + Assert.That(dike.SurfaceLines2[0], Is.EqualTo(surfaceLine1)); + Assert.That(surfaceLine1.Name, Is.EqualTo("SurfaceLine1")); } [Test] public void TestDikeSoilProfiles() { Assert.IsNotNull(soilProfile); - Assert.AreEqual(1, dike.SoilProfiles.Count); - Assert.AreEqual(soilProfile, dike.SoilProfiles[0]); - Assert.AreEqual("SoilProfile1", soilProfile.Name); + Assert.That(dike.SoilProfiles.Count, Is.EqualTo(1)); + Assert.That(dike.SoilProfiles[0], Is.EqualTo(soilProfile)); + Assert.That(soilProfile.Name, Is.EqualTo("SoilProfile1")); } [Test] public void TestDikeLocationSegments() { Assert.IsNotNull(location1.Segment); - Assert.AreEqual(segment1, location1.Segment); + Assert.That(location1.Segment, Is.EqualTo(segment1)); } [Test] public void TestDikeLocationSurfaceLines() { Assert.IsNotNull(location1.SurfaceLine2); - Assert.AreEqual(surfaceLine1, location1.SurfaceLine2); + Assert.That(location1.SurfaceLine2, Is.EqualTo(surfaceLine1)); } [Test] public void TestDikeSegmentsSoilProfileProbabilities() { - Assert.AreEqual(100, segment1.GetSoilProfileProbability(soilProfile, FailureMechanismSystemType.StabilityInside)); + Assert.That(segment1.GetSoilProfileProbability(soilProfile, FailureMechanismSystemType.StabilityInside), Is.EqualTo(100)); } [Test] public void TestDikeSegmentsSurfaceLinePoints() { IList points = surfaceLine1.Geometry.Points; - Assert.AreEqual(6, points.Count); + Assert.That(points.Count, Is.EqualTo(6)); - Assert.AreEqual(15.3, points[0].X); - Assert.AreEqual(-3.52, points[0].Z); - Assert.AreEqual(19.4, points[1].X); - Assert.AreEqual(-1.46, points[1].Z); + Assert.That(points[0].X, Is.EqualTo(15.3)); + Assert.That(points[0].Z, Is.EqualTo(-3.52)); + Assert.That(points[1].X, Is.EqualTo(19.4)); + Assert.That(points[1].Z, Is.EqualTo(-1.46)); - Assert.AreEqual(points[1], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver)); - Assert.AreEqual(points[2], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); - Assert.AreEqual(points[3], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder)); - Assert.AreEqual(points[4], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); + Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver), Is.EqualTo(points[1])); + Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver), Is.EqualTo(points[2])); + Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder), Is.EqualTo(points[3])); + Assert.That(surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder), Is.EqualTo(points[4])); - Assert.AreEqual(0, surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None)); - Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, surfaceLine1.GetCharacteristicPoints(points[1]).First()); + Assert.That(surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None), Is.EqualTo(0)); + Assert.That(surfaceLine1.GetCharacteristicPoints(points[1]).First(), Is.EqualTo(CharacteristicPointType.DikeToeAtRiver)); Assert.IsTrue(surfaceLine1.HasDike()); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs (.../FeatueRepositoryExtensionsTest.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps.Tests/Services/FeatueRepositoryExtensionsTest.cs (.../FeatueRepositoryExtensionsTest.cs) (revision 4625) @@ -68,15 +68,15 @@ IEnumerable> results = rep1.GetIntersectionPoints(rep2); Assert.IsNotNull(results); - Assert.AreEqual(2, results.Count()); + Assert.That(results.Count(), Is.EqualTo(2)); Assert.IsTrue(results.Any(r => r.Key == 1)); Assert.IsTrue(results.Any(r => r.Key == 0)); IntersectionResult result = results.GetResultsHavingCount(1).Single(); - Assert.AreEqual(result.Source.Id, geom1.Id); - Assert.AreEqual(result.Target.Id, dikeGeom.Id); - Assert.AreEqual(-2, result.IntersectionPoints.ElementAt(0).X, 0.0001); - Assert.AreEqual(1, result.IntersectionPoints.ElementAt(0).Y, 0.0001); + Assert.That(geom1.Id, Is.EqualTo(result.Source.Id)); + Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id)); + Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001)); + Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001)); } [Test] @@ -112,15 +112,15 @@ IEnumerable> results = rep1.GetIntersectionPoints(rep2); Assert.IsNotNull(results); - Assert.AreEqual(1, results.Count()); + Assert.That(results.Count(), Is.EqualTo(1)); Assert.IsTrue(results.Any(r => r.Key == 1)); - Assert.AreEqual(2, results.GetResultsHavingCount(1).Count()); + Assert.That(results.GetResultsHavingCount(1).Count(), Is.EqualTo(2)); IntersectionResult result = results.ElementAt(0).First(); - Assert.AreEqual(result.Source.Id, geom1.Id); - Assert.AreEqual(result.Target.Id, dikeGeom.Id); - Assert.AreEqual(-2, result.IntersectionPoints.ElementAt(0).X, 0.0001); - Assert.AreEqual(1, result.IntersectionPoints.ElementAt(0).Y, 0.0001); + Assert.That(geom1.Id, Is.EqualTo(result.Source.Id)); + Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id)); + Assert.That(result.IntersectionPoints.ElementAt(0).X, Is.EqualTo(-2).Within(0.0001)); + Assert.That(result.IntersectionPoints.ElementAt(0).Y, Is.EqualTo(1).Within(0.0001)); } [Test] @@ -148,11 +148,11 @@ IEnumerable> results = rep1.GetIntersectionPoints(rep2); Assert.IsNotNull(results); - Assert.AreEqual(1, results.Count()); - Assert.AreEqual(1, results.GetResultsHavingCount(2).Count()); + Assert.That(results.Count(), Is.EqualTo(1)); + Assert.That(results.GetResultsHavingCount(2).Count(), Is.EqualTo(1)); IntersectionResult result = results.ElementAt(0).First(); - Assert.AreEqual(result.Source.Id, geom1.Id); - Assert.AreEqual(result.Target.Id, dikeGeom.Id); + Assert.That(geom1.Id, Is.EqualTo(result.Source.Id)); + Assert.That(dikeGeom.Id, Is.EqualTo(result.Target.Id)); } [Test] @@ -180,8 +180,8 @@ IEnumerable> results = rep1.GetIntersectionPoints(rep2); Assert.IsNotNull(results); - Assert.AreEqual(1, results.Count()); - Assert.AreEqual(1, results.GetResultsHavingCount(0).Count()); + Assert.That(results.Count(), Is.EqualTo(1)); + Assert.That(results.GetResultsHavingCount(0).Count(), Is.EqualTo(1)); } #region Setup Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs =================================================================== diff -u -r4539 -r4625 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs (.../LocationShapeFileImporterDotSpatialTests.cs) (revision 4539) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterDotSpatialTests.cs (.../LocationShapeFileImporterDotSpatialTests.cs) (revision 4625) @@ -59,7 +59,7 @@ } int count = locationRecords.Count; - Assert.AreEqual(5547, count); + Assert.That(count, Is.EqualTo(5547)); } } } \ No newline at end of file