Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -70,7 +70,7 @@ BreakWater = breakWater; Id = properties.Id; - Name = properties.Name ?? properties.Id; + Name = string.IsNullOrWhiteSpace(properties.Name) ? properties.Id : properties.Name; WorldReferencePoint = worldCoordinate; X0 = properties.X0; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/DikeProfilesImporter.cs (.../DikeProfilesImporter.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -105,7 +105,7 @@ new DikeProfile.ConstructionProperties { Id = dikeProfileData.Id, - Name = dikeProfileData.Id, + Name = dikeProfileLocation.Name, X0 = dikeProfileLocation.Offset, Orientation = dikeProfileData.Orientation, DikeHeight = dikeProfileData.DikeHeight Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/ForeshoreProfilesImporter.cs (.../ForeshoreProfilesImporter.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -105,7 +105,7 @@ new ForeshoreProfile.ConstructionProperties { Id = dikeProfileData.Id, - Name = dikeProfileData.Id, + Name = dikeProfileLocation.Name, X0 = dikeProfileLocation.Offset, Orientation = dikeProfileData.Orientation }); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileTest.cs (.../DikeProfileTest.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -203,7 +203,7 @@ } [Test] - [TestCase("")] + [TestCase("It has a name")] [TestCase("Cool new name!")] public void Name_SetNameDifferentFromId_GetsGivenNameValue(string name) { @@ -220,6 +220,27 @@ } [Test] + [TestCase("")] + [TestCase(" ")] + [TestCase(null)] + public void Constructor_NullOrWhitespaceName_NameSetToId(string name) + { + // Setup + var id = "id"; + + // Call + var foreshoreProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0], + null, new DikeProfile.ConstructionProperties + { + Id = id, + Name = name + }); + + // Assert + Assert.AreEqual(id, foreshoreProfile.Name); + } + + [Test] public void BreakWater_SetToNull_GetsNewlySetNull() { // Call Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs (.../ForeshoreProfileTest.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/ForeshoreProfileTest.cs (.../ForeshoreProfileTest.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -158,9 +158,9 @@ } [Test] - [TestCase("")] + [TestCase("It has a name")] [TestCase("Cool new name!")] - public void Name_SetNameDifferentFromId_GetsGivenNameValue(string name) + public void Constructor_NonEmptyOrWhitespaceNameDifferentFromId_NameValueSet(string name) { // Call var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], @@ -175,6 +175,26 @@ } [Test] + [TestCase("")] + [TestCase(" ")] + [TestCase(null)] + public void Constructor_NullOrWhitespaceName_NameSetToId(string name) + { + // Setup + var id = "id"; + + // Call + var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new Point2D[0], null, new ForeshoreProfile.ConstructionProperties + { + Id = id, + Name = name + }); + + // Assert + Assert.AreEqual(id, foreshoreProfile.Name); + } + + [Test] public void BreakWater_SetToNull_GetsNewlySetNull() { // Call Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -232,13 +232,34 @@ dikeProfilesImporter.Import(); // Assert - DikeProfile dikeProfile = dikeProfiles[4]; - Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), dikeProfile.WorldReferencePoint); - Assert.AreEqual("profiel005", dikeProfile.Name); - Assert.AreEqual(15.56165507, dikeProfile.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), dikeProfile.Orientation); - Assert.IsTrue(dikeProfile.HasBreakWater); - Assert.AreEqual(new RoundedDouble(2, 6.0), dikeProfile.DikeHeight); + DikeProfile dikeProfile1 = dikeProfiles[0]; + Assert.AreEqual("profiel001", dikeProfile1.Id); + Assert.AreEqual("profiel001", dikeProfile1.Name); + + DikeProfile dikeProfile2 = dikeProfiles[1]; + Assert.AreEqual("profiel002", dikeProfile2.Id); + Assert.AreEqual("profiel002", dikeProfile2.Name); + + DikeProfile dikeProfile3 = dikeProfiles[2]; + Assert.AreEqual("profiel003", dikeProfile3.Id); + Assert.AreEqual("profiel003", dikeProfile3.Name); + + DikeProfile dikeProfile4 = dikeProfiles[3]; + Assert.AreEqual(new Point2D(136432.12250000238, 538235.26300000318), dikeProfile4.WorldReferencePoint); + Assert.AreEqual("profiel004", dikeProfile4.Id); + Assert.AreEqual("Valide naam", dikeProfile4.Name); + Assert.AreEqual(-17.93475471, dikeProfile4.X0); + Assert.AreEqual(new RoundedDouble(2, 330.0), dikeProfile4.Orientation); + Assert.IsFalse(dikeProfile4.HasBreakWater); + + DikeProfile dikeProfile5 = dikeProfiles[4]; + Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), dikeProfile5.WorldReferencePoint); + Assert.AreEqual("profiel005", dikeProfile5.Id); + Assert.AreEqual("Heeeeeeeeeeeeeeeeeeeeeeeele laaaaaaaaaaaaaaaaaaaange naaaaaaaaaaam", dikeProfile5.Name); + Assert.AreEqual(15.56165507, dikeProfile5.X0); + Assert.AreEqual(new RoundedDouble(2, 330.0), dikeProfile5.Orientation); + Assert.IsTrue(dikeProfile5.HasBreakWater); + Assert.AreEqual(new RoundedDouble(2, 6.0), dikeProfile5.DikeHeight); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs =================================================================== diff -u -ra666c7d6aa029937de402e181f119c72707bfb73 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision a666c7d6aa029937de402e181f119c72707bfb73) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ForeshoreProfilesImporterTest.cs (.../ForeshoreProfilesImporterTest.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -259,15 +259,39 @@ foreshoreProfilesImporter.Import(); // Assert - ForeshoreProfile foreshoreProfile = foreshoreProfiles[4]; - Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), foreshoreProfile.WorldReferencePoint); - Assert.AreEqual("profiel005", foreshoreProfile.Name); - Assert.AreEqual(15.56165507, foreshoreProfile.X0); - Assert.AreEqual(new RoundedDouble(2, 330.0), foreshoreProfile.Orientation); - Assert.IsTrue(foreshoreProfile.HasBreakWater); + ForeshoreProfile foreshoreProfile1 = foreshoreProfiles[0]; + Assert.AreEqual("profiel001", foreshoreProfile1.Id); + Assert.AreEqual("profiel001", foreshoreProfile1.Name); + + ForeshoreProfile foreshoreProfile2 = foreshoreProfiles[1]; + Assert.AreEqual("profiel002", foreshoreProfile2.Id); + Assert.AreEqual("profiel002", foreshoreProfile2.Name); + + ForeshoreProfile foreshoreProfile3 = foreshoreProfiles[2]; + Assert.AreEqual("profiel003", foreshoreProfile3.Id); + Assert.AreEqual("profiel003", foreshoreProfile3.Name); + + ForeshoreProfile foreshoreProfile4 = foreshoreProfiles[3]; + Assert.AreEqual(new Point2D(136432.12250000238, 538235.26300000318), foreshoreProfile4.WorldReferencePoint); + Assert.AreEqual("profiel004", foreshoreProfile4.Id); + Assert.AreEqual("Valide naam", foreshoreProfile4.Name); + Assert.AreEqual(-17.93475471, foreshoreProfile4.X0); + Assert.AreEqual(new RoundedDouble(2, 330.0), foreshoreProfile4.Orientation); + Assert.IsFalse(foreshoreProfile4.HasBreakWater); + + ForeshoreProfile foreshoreProfile5 = foreshoreProfiles[4]; + Assert.AreEqual(new Point2D(136039.49100000039, 533920.28050000477), foreshoreProfile5.WorldReferencePoint); + Assert.AreEqual("profiel005", foreshoreProfile5.Id); + Assert.AreEqual("Heeeeeeeeeeeeeeeeeeeeeeeele laaaaaaaaaaaaaaaaaaaange naaaaaaaaaaam", foreshoreProfile5.Name); + Assert.AreEqual(15.56165507, foreshoreProfile5.X0); + Assert.AreEqual(new RoundedDouble(2, 330.0), foreshoreProfile5.Orientation); + Assert.IsTrue(foreshoreProfile5.HasBreakWater); + mockRepository.VerifyAll(); // 'observer' should not be notified } + + [Test] public void Import_AllDamTypes_TrueAndLogMessagesAndFiveForeshoreProfiles() { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/DikeProfiles/AllOkTestData/Voorlanden 12-2.dbf =================================================================== diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -r1f549a37af503f5da697652b5e5199f8d29ac0fe Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/DikeProfiles/AllOkTestData/Voorlanden 12-2.prj =================================================================== diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/DikeProfiles/AllOkTestData/Voorlanden 12-2.prj (.../Voorlanden 12-2.prj) (revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/DikeProfiles/AllOkTestData/Voorlanden 12-2.prj (.../Voorlanden 12-2.prj) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -1 +1 @@ -PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs =================================================================== diff -u -re60dbf2fd41434270cad4efba20446e19ede0d2e -r1f549a37af503f5da697652b5e5199f8d29ac0fe --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision e60dbf2fd41434270cad4efba20446e19ede0d2e) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsScenariosViewIntegrationTest.cs (.../GrassCoverErosionInwardsScenariosViewIntegrationTest.cs) (revision 1f549a37af503f5da697652b5e5199f8d29ac0fe) @@ -129,7 +129,7 @@ DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); - Assert.AreEqual("profiel63p1ID", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); + Assert.AreEqual("profiel63p1Naam", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); } } @@ -184,7 +184,7 @@ DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(2, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); - Assert.AreEqual("profiel63p1ID_changed", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); + Assert.AreEqual("profiel63p1Naam_changed", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); } } @@ -236,8 +236,8 @@ DataGridViewCell dataGridViewCell = dataGridView.Rows[13].Cells[1]; Assert.AreEqual(3, ((DataGridViewComboBoxCell) dataGridViewCell).Items.Count); Assert.AreEqual("", ((DataGridViewComboBoxCell) dataGridViewCell).Items[0].ToString()); - Assert.AreEqual("profiel63p1IDCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); - Assert.AreEqual("profiel63p2IDCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[2].ToString()); + Assert.AreEqual("profiel63p1NaamCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[1].ToString()); + Assert.AreEqual("profiel63p2NaamCalculation", ((DataGridViewComboBoxCell) dataGridViewCell).Items[2].ToString()); DataGridViewCell dataGridViewCellWithRemovedCalculation = dataGridView.Rows[56].Cells[1]; Assert.AreEqual(1, ((DataGridViewComboBoxCell) dataGridViewCellWithRemovedCalculation).Items.Count);