Index: Ringtoets/Common/src/Ringtoets.Common.Data/StructureCollection.cs =================================================================== diff -u -r16a70f4e510b2667a5fcea88d6a34c410d18e168 -r7aa336d8c0d38c5af631d480da9c8c62a7f4e261 --- Ringtoets/Common/src/Ringtoets.Common.Data/StructureCollection.cs (.../StructureCollection.cs) (revision 16a70f4e510b2667a5fcea88d6a34c410d18e168) +++ Ringtoets/Common/src/Ringtoets.Common.Data/StructureCollection.cs (.../StructureCollection.cs) (revision 7aa336d8c0d38c5af631d480da9c8c62a7f4e261) @@ -28,7 +28,7 @@ /// A collection of . The ids of the /// are unique within the collection. /// - /// A structure. + /// The type of structure used in the collection. public class StructureCollection : ObservableUniqueItemCollectionWithSourcePath where TStructure : StructureBase { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileCollectionTest.cs =================================================================== diff -u -ra588b2fbca3ea7073fa3aa30bde0bd59393ff994 -r7aa336d8c0d38c5af631d480da9c8c62a7f4e261 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileCollectionTest.cs (.../DikeProfileCollectionTest.cs) (revision a588b2fbca3ea7073fa3aa30bde0bd59393ff994) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/DikeProfileCollectionTest.cs (.../DikeProfileCollectionTest.cs) (revision 7aa336d8c0d38c5af631d480da9c8c62a7f4e261) @@ -48,9 +48,8 @@ protected override IEnumerable SingleNonUniqueElements() { const string someId = "Dike profile"; - const string name = "Standard Dike Profile Name"; - yield return new TestDikeProfile(name, someId); - yield return new TestDikeProfile(name, someId); + yield return new TestDikeProfile("Standard Dike Profile Name", someId); + yield return new TestDikeProfile("Other Dike Profile Name", someId); } protected override void AssertSingleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd) @@ -63,12 +62,11 @@ { const string someId = "Dike profile"; const string someotherId = "Other dike profile"; - const string name = "Some Dike profile Name"; - yield return new TestDikeProfile(name, someId); - yield return new TestDikeProfile(name, someId); - yield return new TestDikeProfile(name, someotherId); - yield return new TestDikeProfile(name, someotherId); + yield return new TestDikeProfile("Dike profile Name 1", someId); + yield return new TestDikeProfile("Dike profile Name 2", someId); + yield return new TestDikeProfile("Dike profile Name 3", someotherId); + yield return new TestDikeProfile("Dike profile Name 4", someotherId); } protected override void AssertMultipleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd) Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs =================================================================== diff -u -r5f48c2f099a9ffd0e55b86aea0b356a226a1918f -r7aa336d8c0d38c5af631d480da9c8c62a7f4e261 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 5f48c2f099a9ffd0e55b86aea0b356a226a1918f) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 7aa336d8c0d38c5af631d480da9c8c62a7f4e261) @@ -67,7 +67,7 @@ { structureUpdateStrategy.UpdateStructuresWithImportedData(ImportTarget, CreateHeightStructures(structureLocations.ToList(), - groupedStructureParameterRows).ToArray(), + groupedStructureParameterRows), FilePath); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineCollectionTest.cs =================================================================== diff -u -r33e8882a46b193286ebf3eeec73e81b7c5921489 -r7aa336d8c0d38c5af631d480da9c8c62a7f4e261 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineCollectionTest.cs (.../RingtoetsPipingSurfaceLineCollectionTest.cs) (revision 33e8882a46b193286ebf3eeec73e81b7c5921489) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/RingtoetsPipingSurfaceLineCollectionTest.cs (.../RingtoetsPipingSurfaceLineCollectionTest.cs) (revision 7aa336d8c0d38c5af631d480da9c8c62a7f4e261) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Primitives; @@ -35,43 +34,6 @@ CustomObservableUniqueItemCollectionWithSourcePathTestFixtureBase< ObservableUniqueItemCollectionWithSourcePath, RingtoetsPipingSurfaceLine> { - [Test] - public void AddRange_MultipleSurfaceLinesWithSameNames_ThrowsArgumentException() - { - // Setup - const string duplicateNameOne = "Duplicate name it is"; - const string duplicateNameTwo = "Duplicate name again"; - var surfaceLinesToAdd = new[] - { - new RingtoetsPipingSurfaceLine - { - Name = duplicateNameOne - }, - new RingtoetsPipingSurfaceLine - { - Name = duplicateNameOne - }, - new RingtoetsPipingSurfaceLine - { - Name = duplicateNameTwo - }, - new RingtoetsPipingSurfaceLine - { - Name = duplicateNameTwo - } - }; - - var collection = new RingtoetsPipingSurfaceLineCollection(); - - // Call - TestDelegate call = () => collection.AddRange(surfaceLinesToAdd, "path"); - - // Assert - string message = $"Profielschematisaties moeten een unieke naam hebben. Gevonden dubbele elementen: {duplicateNameOne}, " + - $"{duplicateNameTwo}."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message); - } - protected override ObservableUniqueItemCollectionWithSourcePath CreateCollection() { return new RingtoetsPipingSurfaceLineCollection(); @@ -114,17 +76,16 @@ { const string duplicateNameOne = "Duplicate name it is"; const string duplicateNameTwo = "Duplicate name again"; - yield return - new RingtoetsPipingSurfaceLine - { - Name = duplicateNameOne - }; yield return new RingtoetsPipingSurfaceLine { Name = duplicateNameOne }; yield return new RingtoetsPipingSurfaceLine { + Name = duplicateNameOne + }; + yield return new RingtoetsPipingSurfaceLine + { Name = duplicateNameTwo }; yield return new RingtoetsPipingSurfaceLine