Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r26f49ad2e6873ad9dace912e6d40b32fd8e89e6d -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 26f49ad2e6873ad9dace912e6d40b32fd8e89e6d) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Importers/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -128,17 +128,17 @@ return false; } - private bool TryReadDikeProfile(string dikeProfileName, GrassCoverErosionInwardsCalculation calculation) + private bool TryReadDikeProfile(string dikeProfileId, GrassCoverErosionInwardsCalculation calculation) { - if (dikeProfileName != null) + if (dikeProfileId != null) { - DikeProfile dikeProfile = availableDikeProfiles.FirstOrDefault(fp => fp.Name == dikeProfileName); + DikeProfile dikeProfile = availableDikeProfiles.FirstOrDefault(fp => fp.Id == dikeProfileId); if (dikeProfile == null) { Log.LogCalculationConversionError(string.Format( Resources.GrassCoverErosionInwardsCalculationConfigurationImporter_ReadDikeProfile_DikeProfile_0_does_not_exist, - dikeProfileName), + dikeProfileId), calculation.Name); return false; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -rde6048a31dbe63930a6ea68b04a4f37879333106 -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision de6048a31dbe63930a6ea68b04a4f37879333106) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Importers/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -125,7 +125,7 @@ Enumerable.Empty(), new[] { - new TestDikeProfile("Dijkprofiel") + new TestDikeProfile("Dijkprofiel", "Dijkprofiel ID") }, new GrassCoverErosionInwardsFailureMechanism()); @@ -329,7 +329,7 @@ string filePath = Path.Combine(path, "validConfigurationCalculationUseForeshoreWithoutGeometry.xml"); var calculationGroup = new CalculationGroup(); - var dikeProfile = new TestDikeProfile("Dijkprofiel"); + var dikeProfile = new TestDikeProfile("Dijkprofiel", "Dijkprofiel ID"); var importer = new GrassCoverErosionInwardsCalculationConfigurationImporter( filePath, calculationGroup, @@ -345,7 +345,7 @@ Action call = () => successful = importer.Import(); // Assert - const string expectedMessage = "Het opgegeven dijkprofiel 'Dijkprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; + const string expectedMessage = "Het opgegeven dijkprofiel 'Dijkprofiel ID' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); @@ -359,7 +359,7 @@ var calculationGroup = new CalculationGroup(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "HRlocatie", 10, 20); - var dikeProfile = new TestDikeProfile("Dijkprofiel"); + var dikeProfile = new TestDikeProfile("Dijkprofiel", "Dijkprofiel ID"); var importer = new GrassCoverErosionInwardsCalculationConfigurationImporter( filePath, @@ -517,7 +517,7 @@ new Point2D(6, 5) }, new BreakWater(BreakWaterType.Caisson, 0), new DikeProfile.ConstructionProperties { - Id = "id", + Id = "Dijkprofiel ID", Name = "Dijkprofiel", DikeHeight = 3.45 }); @@ -581,14 +581,15 @@ failureMechanism.AddSection(new FailureMechanismSection("name", new[] { - new Point2D(0,0), new Point2D(10,10) + new Point2D(0, 0), + new Point2D(10, 10) })); var calculation = new GrassCoverErosionInwardsCalculation { InputParameters = { - DikeProfile = new TestDikeProfile(new Point2D(5,5)) + DikeProfile = new TestDikeProfile(new Point2D(5, 5)) } }; failureMechanism.CalculationsGroup.Children.Add( Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationNotUseForeshoreWithoutGeometry.xml =================================================================== diff -u -r69c1988e3c492c44148e112151efb3c04a853fcc -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationNotUseForeshoreWithoutGeometry.xml (.../validConfigurationCalculationNotUseForeshoreWithoutGeometry.xml) (revision 69c1988e3c492c44148e112151efb3c04a853fcc) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationNotUseForeshoreWithoutGeometry.xml (.../validConfigurationCalculationNotUseForeshoreWithoutGeometry.xml) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -1,7 +1,7 @@ - Dijkprofiel + Dijkprofiel ID false Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml =================================================================== diff -u -r69c1988e3c492c44148e112151efb3c04a853fcc -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreWithoutGeometry.xml) (revision 69c1988e3c492c44148e112151efb3c04a853fcc) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml (.../validConfigurationCalculationUseForeshoreWithoutGeometry.xml) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -1,7 +1,7 @@ - Dijkprofiel + Dijkprofiel ID true Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -r5657884548510b3c293e6e37de2b042cfaace67f -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 5657884548510b3c293e6e37de2b042cfaace67f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -2,7 +2,7 @@ HRlocatie - Dijkprofiel + Dijkprofiel ID 5.5 3.45 norm Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml =================================================================== diff -u -rad17f1b8f41d6b4b75c9f39b427dddf31b47cef0 -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml (.../validConfigurationOrientationOutOfRange.xml) (revision ad17f1b8f41d6b4b75c9f39b427dddf31b47cef0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationOrientationOutOfRange.xml (.../validConfigurationOrientationOutOfRange.xml) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) @@ -1,7 +1,7 @@ - Dijkprofiel + Dijkprofiel ID 380