Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -r8d6dc1b515f16b85b465b2686ea109f27c599c4b -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 8d6dc1b515f16b85b465b2686ea109f27c599c4b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6) @@ -39,7 +39,7 @@ public class DikeProfilesImporterTest { [Test] - public void ParameterdConstructor_ExpectedValues() + public void Constructor_WithValidParameters_ReturnsNewInstance() { // Setup var importTarget = new ObservableList(); @@ -53,7 +53,7 @@ } [Test] - public void ParameterdConstructor_ImportTargetNull_ThrowArgumentNullException() + public void Constructor_ImportTargetNull_ThrowArgumentNullException() { // Call TestDelegate call = () => new DikeProfilesImporter(null, new ReferenceLine(), ""); @@ -64,7 +64,7 @@ } [Test] - public void ParameterdConstructor_ReferenceLineNull_ThrowArgumentNullException() + public void Constructor_ReferenceLineNull_ThrowArgumentNullException() { // Call TestDelegate call = () => new DikeProfilesImporter(new ObservableList(), null, ""); @@ -75,7 +75,7 @@ } [Test] - public void ParameterdConstructor_FilePathNull_ThrowArgumentNullException() + public void Constructor_FilePathNull_ThrowArgumentNullException() { // Call TestDelegate call = () => new DikeProfilesImporter(new ObservableList(), new ReferenceLine(), null); @@ -89,18 +89,16 @@ public void Import_FromFileWithUnmatchableId_TrueAndLogError() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "IpflWithUnmatchableId", "Voorlanden_12-2_UnmatchableId.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var dikeProfilesImporter = new DikeProfilesImporter(failureMechanism.DikeProfiles, referenceLine, filePath); - //Precondition - var importResult = true; - // Call + var importResult = true; Action call = () => importResult = dikeProfilesImporter.Import(); // Assert @@ -117,7 +115,7 @@ public void Import_OneDikeProfileLocationNotCloseEnoughToReferenceLine_TrueAndLogErrorAndFourDikeProfiles() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -134,10 +132,8 @@ var dikeProfilesImporter = new DikeProfilesImporter(failureMechanism.DikeProfiles, referenceLine, filePath); - //Precondition - var importResult = true; - // Call + var importResult = true; Action call = () => importResult = dikeProfilesImporter.Import(); // Assert @@ -150,7 +146,7 @@ public void Import_AllOkTestData_TrueAndLogMessagesAndFiveDikeProfiles() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); @@ -189,7 +185,7 @@ public void Import_AllOkTestData_CorrectDikeProfileProperties() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); @@ -214,7 +210,7 @@ public void Import_AllDamTypes_TrueAndLogMessagesAndFiveDikeProfiles() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllDamTypes", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); @@ -254,7 +250,7 @@ public void Import_CancelOfImportToValidTargetWithValidFile_CancelImportAndLog() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine(); @@ -264,9 +260,9 @@ // Precondition dikeProfilesImporter.Cancel(); - bool importResult = true; // Call + bool importResult = true; Action call = () => importResult = dikeProfilesImporter.Import(); // Assert @@ -278,7 +274,7 @@ public void Import_ReuseOfCancelledImportToValidTargetWithValidFile_TrueAndLogMessagesAndFiveDikeProfiles() { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.GrassCoverErosionInwards.IO, + string filePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("DikeProfiles", "AllOkTestData", "Voorlanden 12-2.shp")); ReferenceLine referenceLine = CreateMatchingReferenceLine();