Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs =================================================================== diff -u -r09d20758dff97aed16e0d04399c803097eb1d28c -r221d46d0b48516760c6a1a2a2e70bbe84365a3b3 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 09d20758dff97aed16e0d04399c803097eb1d28c) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/FailureMechanismSectionsImporterTest.cs (.../FailureMechanismSectionsImporterTest.cs) (revision 221d46d0b48516760c6a1a2a2e70bbe84365a3b3) @@ -103,9 +103,7 @@ Path.Combine("FailureMechanismSections", sectionsFileName)); ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - - var failureMechanism = new Simple(); - + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); // Call @@ -130,7 +128,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", importReferenceLine.Points)); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -156,7 +154,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -184,7 +182,7 @@ var progressChangeNotifications = new List(); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps))); @@ -215,7 +213,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -241,7 +239,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -269,7 +267,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -299,7 +297,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -329,7 +327,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -356,7 +354,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -383,7 +381,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); @@ -406,7 +404,7 @@ string sectionsFilePath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, Path.Combine("FailureMechanismSections", "vakindeling_Empty_Name_Value.shp")); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, new ReferenceLine(), sectionsFilePath); @@ -433,7 +431,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); importer.SetProgressChanged((description, step, steps) => @@ -466,7 +464,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); importer.SetProgressChanged((description, step, steps) => @@ -499,7 +497,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); importer.SetProgressChanged((description, step, steps) => @@ -532,7 +530,7 @@ ReferenceLine importReferenceLine = ImportReferenceLine(referenceLineFilePath); - var failureMechanism = new Simple(); + var failureMechanism = new SimpleFailureMechanism(); var importer = new FailureMechanismSectionsImporter(failureMechanism, importReferenceLine, sectionsFilePath); importer.SetProgressChanged((description, step, steps) => importer.Cancel()); @@ -664,9 +662,9 @@ } } - private class Simple : FailureMechanismBase + private class SimpleFailureMechanism : FailureMechanismBase { - public Simple() : base("Stubbed name", "Stubbed code") {} + public SimpleFailureMechanism() : base("Stubbed name", "Stubbed code") {} public override IEnumerable Calculations {