Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Helpers/UniqueIdentifierGenerator.cs =================================================================== diff -u -r46e5f7ff312bd021b35238b01104364ed0944eea -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Helpers/UniqueIdentifierGenerator.cs (.../UniqueIdentifierGenerator.cs) (revision 46e5f7ff312bd021b35238b01104364ed0944eea) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Helpers/UniqueIdentifierGenerator.cs (.../UniqueIdentifierGenerator.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; namespace Ringtoets.Integration.IO.Helpers { @@ -28,14 +29,14 @@ /// public class UniqueIdentifierGenerator { - private int currentId; + private readonly Dictionary idLookup; /// /// Creates a new instance of . /// public UniqueIdentifierGenerator() { - currentId = 0; + idLookup = new Dictionary(); } /// @@ -52,7 +53,13 @@ throw new ArgumentException($@"'{nameof(prefix)}' is null, empty or consists of whitespace.", nameof(prefix)); } - return $"{prefix}.{currentId++}"; + if (idLookup.ContainsKey(prefix)) + { + return $"{prefix}.{idLookup[prefix]++}"; + } + + idLookup[prefix] = 0; + return $"{prefix}.{idLookup[prefix]++}"; } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs =================================================================== diff -u -r7ad21c69dd74f12a4b17ff15217bf8c135cc06aa -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision 7ad21c69dd74f12a4b17ff15217bf8c135cc06aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -109,29 +109,27 @@ Assert.AreEqual(totalAssemblyResult.Id, serializableFailureMechanismSectionCollection.TotalAssemblyResultId); Assert.IsNull(serializableFailureMechanismSectionCollection.FailureMechanismId); - AssertCombinedFailureMechanismSectionAssemblies(1, - combinedSectionAssemblies, + AssertCombinedFailureMechanismSectionAssemblies(combinedSectionAssemblies, serializableFailureMechanismSectionCollection, totalAssemblyResult, aggregate.FailureMechanismSections, aggregate.CombinedFailureMechanismSectionAssemblies); } - private static void AssertCombinedFailureMechanismSectionAssemblies( - int idStartIndex, - IEnumerable expectedCombinedSectionAssemblies, - SerializableFailureMechanismSectionCollection expectedSerializableFailureMechanismSectionCollection, - SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult, - IEnumerable serializableFailureMechanismSections, - IEnumerable serializableFailureMechanismSectionAssemblies) + private static void AssertCombinedFailureMechanismSectionAssemblies(IEnumerable expectedCombinedSectionAssemblies, + SerializableFailureMechanismSectionCollection expectedSerializableFailureMechanismSectionCollection, + SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult, + IEnumerable serializableFailureMechanismSections, + IEnumerable serializableFailureMechanismSectionAssemblies) { IEnumerable expectedSections = expectedCombinedSectionAssemblies.Select(csar => csar.Section); int expectedNrOfSections = expectedSections.Count(); Assert.AreEqual(expectedNrOfSections, serializableFailureMechanismSections.Count()); Assert.AreEqual(expectedCombinedSectionAssemblies.Count(), serializableFailureMechanismSectionAssemblies.Count()); - int expectedIdIndex = idStartIndex; + var sectionId = 0; + var combinedSectionId = 0; for (var i = 0; i < expectedNrOfSections; i++) { ExportableCombinedFailureMechanismSection expectedSection = expectedSections.ElementAt(i); @@ -140,10 +138,10 @@ SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(expectedSection, expectedSerializableFailureMechanismSectionCollection, actualSection, - expectedIdIndex++); + sectionId++); SerializableCombinedFailureMechanismSectionAssembly actualSectionAssemblyResult = serializableFailureMechanismSectionAssemblies.ElementAt(i); - Assert.AreEqual($"Gto.{expectedIdIndex++}", actualSectionAssemblyResult.Id); + Assert.AreEqual($"Gto.{combinedSectionId++}", actualSectionAssemblyResult.Id); Assert.AreEqual(actualSection.Id, actualSectionAssemblyResult.FailureMechanismSectionId); Assert.AreEqual(expectedSerializableTotalAssemblyResult.Id, actualSectionAssemblyResult.TotalAssemblyResultId); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs =================================================================== diff -u -r7ad21c69dd74f12a4b17ff15217bf8c135cc06aa -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs) (revision 7ad21c69dd74f12a4b17ff15217bf8c135cc06aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssemblyCreatorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -130,7 +130,7 @@ serializableFailureMechanismSection); SerializableCombinedFailureMechanismSectionAssembly serializableCombinedFailureMechanismSectionAssembly = aggregate.CombinedFailureMechanismSectionAssembly; - Assert.AreEqual("Gto.1", serializableCombinedFailureMechanismSectionAssembly.Id); + Assert.AreEqual("Gto.0", serializableCombinedFailureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanismSection.Id, serializableCombinedFailureMechanismSectionAssembly.FailureMechanismSectionId); Assert.AreEqual(serializableTotalAssembly.Id, serializableCombinedFailureMechanismSectionAssembly.TotalAssemblyResultId); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs =================================================================== diff -u -r7ad21c69dd74f12a4b17ff15217bf8c135cc06aa -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 7ad21c69dd74f12a4b17ff15217bf8c135cc06aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -155,11 +155,10 @@ serializableFailureMechanism.FailureMechanismAssemblyResult); SerializableFailureMechanismSectionCollection serializableFailureMechanismSectionCollection = aggregatedFailureMechanism.FailureMechanismSectionCollection; - Assert.AreEqual("Vi.1", serializableFailureMechanismSectionCollection.Id); + Assert.AreEqual("Vi.0", serializableFailureMechanismSectionCollection.Id); Assert.AreEqual(serializableFailureMechanism.Id, serializableFailureMechanismSectionCollection.FailureMechanismId); - AssertFailureMechanismSectionAssemblies(2, - failureMechanism, + AssertFailureMechanismSectionAssemblies(failureMechanism, serializableFailureMechanismSectionCollection, serializableFailureMechanism, aggregatedFailureMechanism.FailureMechanismSections, @@ -282,11 +281,10 @@ serializableFailureMechanism.FailureMechanismAssemblyResult); SerializableFailureMechanismSectionCollection serializableFailureMechanismSectionCollection = aggregatedFailureMechanism.FailureMechanismSectionCollection; - Assert.AreEqual("Vi.1", serializableFailureMechanismSectionCollection.Id); + Assert.AreEqual("Vi.0", serializableFailureMechanismSectionCollection.Id); Assert.AreEqual(serializableFailureMechanism.Id, serializableFailureMechanismSectionCollection.FailureMechanismId); - AssertFailureMechanismSectionAssemblies(2, - failureMechanism, + AssertFailureMechanismSectionAssemblies(failureMechanism, serializableFailureMechanismSectionCollection, serializableFailureMechanism, aggregatedFailureMechanism.FailureMechanismSections, @@ -295,7 +293,6 @@ } private static void AssertFailureMechanismSectionAssemblies( - int idStartIndex, ExportableFailureMechanism expectedFailureMechanism, SerializableFailureMechanismSectionCollection expectedSerializableFailureMechanismSectionCollection, SerializableFailureMechanism expectedSerializableFailureMechanism, @@ -311,7 +308,8 @@ IEnumerable expectedSectionAssemblyResults = expectedFailureMechanism.SectionAssemblyResults; Assert.AreEqual(expectedSectionAssemblyResults.Count(), serializableFailureMechanismSectionAssemblies.Count()); - int expectedIdIndex = idStartIndex; + var sectionId = 0; + var sectionAssemblyId = 0; for (var i = 0; i < expectedNrOfSections; i++) { ExportableFailureMechanismSection expectedSection = expectedSections.ElementAt(i); @@ -320,10 +318,10 @@ SerializableFailureMechanismSectionTestHelper.AssertFailureMechanismSection(expectedSection, expectedSerializableFailureMechanismSectionCollection, actualSection, - expectedIdIndex++); + sectionId++); SerializableFailureMechanismSectionAssembly actualSectionAssemblyResult = serializableFailureMechanismSectionAssemblies.ElementAt(i); - Assert.AreEqual($"T.{expectedIdIndex++}", actualSectionAssemblyResult.Id); + Assert.AreEqual($"T.{sectionAssemblyId++}", actualSectionAssemblyResult.Id); Assert.AreEqual(expectedSerializableFailureMechanism.Id, actualSectionAssemblyResult.FailureMechanismId); Assert.AreEqual(actualSection.Id, actualSectionAssemblyResult.FailureMechanismSectionId); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs =================================================================== diff -u -r7ad21c69dd74f12a4b17ff15217bf8c135cc06aa -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision 7ad21c69dd74f12a4b17ff15217bf8c135cc06aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs (.../AggregatedSerializableFailureMechanismSectionAssemblyCreatorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -138,7 +138,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; @@ -200,7 +200,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; @@ -337,7 +337,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; @@ -399,7 +399,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; @@ -532,7 +532,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; @@ -587,7 +587,7 @@ // Assert SerializableFailureMechanismSectionAssembly failureMechanismSectionAssembly = aggregatedSectionAssembly.FailureMechanismSectionAssembly; - Assert.AreEqual("T.1", failureMechanismSectionAssembly.Id); + Assert.AreEqual("T.0", failureMechanismSectionAssembly.Id); Assert.AreEqual(serializableFailureMechanism.Id, failureMechanismSectionAssembly.FailureMechanismId); SerializableFailureMechanismSectionAssemblyResult[] serializedSectionResults = failureMechanismSectionAssembly.SectionResults; Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs =================================================================== diff -u -r7ad21c69dd74f12a4b17ff15217bf8c135cc06aa -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision 7ad21c69dd74f12a4b17ff15217bf8c135cc06aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs (.../SerializableAssemblyCreatorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -104,26 +104,26 @@ var serializableAssessmentSection = (SerializableAssessmentSection) serializableAssemblyFeatureMembers[0]; AssertSerializableAssessmentSection($"Wks.{assessmentSectionId}", assessmentSectionName, geometry, serializableAssessmentSection); var serializableAssessmentProcess = (SerializableAssessmentProcess) serializableAssemblyFeatureMembers[1]; - AssertSerializableAssessmentProcess("Bp.1", serializableAssessmentSection, serializableAssessmentProcess); + AssertSerializableAssessmentProcess("Bp.0", serializableAssessmentSection, serializableAssessmentProcess); var serializableTotalAssemblyResult = (SerializableTotalAssemblyResult) serializableAssemblyFeatureMembers[2]; - AssertSerializableTotalAssemblyResult("Vo.2", + AssertSerializableTotalAssemblyResult("Vo.0", failureMechanismAssemblyResultWithoutProbability, failureMechanismAssemblyResultWithProbability, assessmentSectionAssembly, serializableAssessmentProcess, serializableTotalAssemblyResult); - AssertFailureMechanismConnections(3, 3, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); - AssertFailureMechanismConnections(4, 7, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); - AssertFailureMechanismConnections(5, 11, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); - AssertFailureMechanismConnections(6, 15, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertFailureMechanismConnections(3, 0, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertFailureMechanismConnections(4, 1, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertFailureMechanismConnections(5, 2, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertFailureMechanismConnections(6, 3, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); var combinedFailureMechanismSectionCollection = (SerializableFailureMechanismSectionCollection) serializableAssemblyFeatureMembers[17]; - AssertSerializableFailureMechanismSectionCollection("Vi.19", + AssertSerializableFailureMechanismSectionCollection("Vi.4", serializableTotalAssemblyResult, combinedFailureMechanismSectionCollection); - AssertCombinedFailureMechanismSectionAssemblyConnections(11, 20, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); - AssertCombinedFailureMechanismSectionAssemblyConnections(12, 22, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertCombinedFailureMechanismSectionAssemblyConnections(11, 4, 0, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); + AssertCombinedFailureMechanismSectionAssemblyConnections(12, 5, 1, combinedFailureMechanismSectionCollection, serializableTotalAssemblyResult, serializableAssemblyFeatureMembers); } #region Test Helpers: Factory Methods @@ -302,25 +302,25 @@ #region Failure mechanisms private static void AssertFailureMechanismConnections(int indexSerializableFailureMechanism, - int startId, + int expectedId, SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult, SerializableFeatureMember[] serializableAssemblyFeatureMembers) { - var failureMechanismWithProbability1 = (SerializableFailureMechanism) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism]; - AssertSerializableFailureMechanism($"Ts.{startId++}", + var failureMechanismWithProbability = (SerializableFailureMechanism) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism]; + AssertSerializableFailureMechanism($"Ts.{expectedId}", expectedSerializableTotalAssemblyResult, - failureMechanismWithProbability1); - var failureMechanismSectionCollection1 = (SerializableFailureMechanismSectionCollection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 10]; - AssertSerializableFailureMechanismSectionCollection($"Vi.{startId++}", - failureMechanismWithProbability1, - failureMechanismSectionCollection1); - var serializableFailureMechanismSection1 = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 15]; - AssertSerializableFailureMechanismSection($"Wks.{startId++}", - failureMechanismSectionCollection1, - serializableFailureMechanismSection1); - AssertSerializableFailureMechanismSectionAssembly($"T.{startId}", - failureMechanismWithProbability1, - serializableFailureMechanismSection1, + failureMechanismWithProbability); + var failureMechanismSectionCollection = (SerializableFailureMechanismSectionCollection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 10]; + AssertSerializableFailureMechanismSectionCollection($"Vi.{expectedId}", + failureMechanismWithProbability, + failureMechanismSectionCollection); + var serializableFailureMechanismSection = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 15]; + AssertSerializableFailureMechanismSection($"Wks.{expectedId}", + failureMechanismSectionCollection, + serializableFailureMechanismSection); + AssertSerializableFailureMechanismSectionAssembly($"T.{expectedId}", + failureMechanismWithProbability, + serializableFailureMechanismSection, (SerializableFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[indexSerializableFailureMechanism + 4]); } @@ -356,18 +356,19 @@ #region Combined failure mechanism sections private static void AssertCombinedFailureMechanismSectionAssemblyConnections(int indexSerializableCombinedSectionAssembly, - int startId, + int expectedSectionId, + int expectedCombinedSectionAssemblyId, SerializableFailureMechanismSectionCollection expectedCombinedFailureMechanismSectionCollection, SerializableTotalAssemblyResult expectedSerializableTotalAssemblyResult, SerializableFeatureMember[] serializableAssemblyFeatureMembers) { - var combinedFailureMechanismSection1 = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly + 11]; - AssertSerializableFailureMechanismSection($"Wks.{startId++}", + var combinedFailureMechanismSection = (SerializableFailureMechanismSection) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly + 11]; + AssertSerializableFailureMechanismSection($"Wks.{expectedSectionId}", expectedCombinedFailureMechanismSectionCollection, - combinedFailureMechanismSection1); - AssertSerializableCombinedFailureMechanismSectionAssembly($"Gto.{startId}", + combinedFailureMechanismSection); + AssertSerializableCombinedFailureMechanismSectionAssembly($"Gto.{expectedCombinedSectionAssemblyId}", expectedSerializableTotalAssemblyResult, - combinedFailureMechanismSection1, + combinedFailureMechanismSection, (SerializableCombinedFailureMechanismSectionAssembly) serializableAssemblyFeatureMembers[indexSerializableCombinedSectionAssembly]); } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Helpers/UniqueIdentifierGeneratorTest.cs =================================================================== diff -u -r46e5f7ff312bd021b35238b01104364ed0944eea -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Helpers/UniqueIdentifierGeneratorTest.cs (.../UniqueIdentifierGeneratorTest.cs) (revision 46e5f7ff312bd021b35238b01104364ed0944eea) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Helpers/UniqueIdentifierGeneratorTest.cs (.../UniqueIdentifierGeneratorTest.cs) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -61,7 +61,7 @@ } [Test] - public void GivenGeneratedId_WhenGetNewIdCalled_ThenNewIdGenerated() + public void GivenGeneratedId_WhenGetNewIdCalledWithSamePrefix_ThenNewIdGenerated() { // Given const string prefix = "prefix"; @@ -85,5 +85,25 @@ $"{prefix}.2" }, generatedIds); } + + [Test] + public void GivenGeneratedId_WhenGetNewIdCalledWithDifferentPrefix_ThenNewIdGenerated() + { + // Given + const string prefix = "prefix"; + var generator = new UniqueIdentifierGenerator(); + generator.GetNewId(prefix); + + // Precondition + Assert.AreEqual($"{prefix}.1", generator.GetNewId(prefix)); + + const string newPrefix = "NewPrefix"; + + // When + string newPrefixId = generator.GetNewId(newPrefix); + + // Then + Assert.AreEqual($"{newPrefix}.0", newPrefixId); + } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml =================================================================== diff -u -ref362ecdfec2d2c0efb1696ba1bba1d731a66256 -r3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision ef362ecdfec2d2c0efb1696ba1bba1d731a66256) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/AssemblyExporter/ExpectedGml.gml (.../ExpectedGml.gml) (revision 3756c7b2ee1e2f71e8fc471b4dfc4ba4285189f1) @@ -17,11 +17,11 @@ 1.4142135623730952 Dijktraject - + 2017 2023 - + WBI-2C-1 A @@ -39,7 +39,7 @@ VOLLDG - + STPH GEDSPROBEX DIRECT @@ -50,7 +50,7 @@ VOLLDG - + STBI GEDSPROBEX DIRECT @@ -61,7 +61,7 @@ VOLLDG - + GEKB GEDPROB DIRECT @@ -72,7 +72,7 @@ VOLLDG - + HTKW GEDPROB DIRECT @@ -83,7 +83,7 @@ VOLLDG - + BSKW GEDPROB DIRECT @@ -94,7 +94,7 @@ VOLLDG - + STKWp GEDPROB DIRECT @@ -105,7 +105,7 @@ VOLLDG - + ZST GEDSPROB DIRECT @@ -115,7 +115,7 @@ VOLLDG - + AGK GEDSPROB DIRECT @@ -125,7 +125,7 @@ VOLLDG - + GEBU GEDSPROB DIRECT @@ -135,7 +135,7 @@ VOLLDG - + DA GEDSPROB DIRECT @@ -145,7 +145,7 @@ VOLLDG - + STBU GEEN DIRECT @@ -155,7 +155,7 @@ VOLLDG - + STMI GEEN DIRECT @@ -165,7 +165,7 @@ VOLLDG - + GABU GEEN DIRECT @@ -175,7 +175,7 @@ VOLLDG - + GABI GEEN DIRECT @@ -185,7 +185,7 @@ VOLLDG - + PKW GEEN DIRECT @@ -195,7 +195,7 @@ VOLLDG - + AWO GEEN DIRECT @@ -205,7 +205,7 @@ VOLLDG - + STKWl GEEN DIRECT @@ -215,7 +215,7 @@ VOLLDG - + INN GEEN DIRECT @@ -225,7 +225,7 @@ VOLLDG - + WBI-0A-1 GECBNTR @@ -251,7 +251,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -277,7 +277,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -303,7 +303,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -329,7 +329,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -355,7 +355,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -381,7 +381,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -407,7 +407,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -433,7 +433,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -459,7 +459,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -485,7 +485,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -511,7 +511,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -537,7 +537,7 @@ 1 - + WBI-0A-1 GECBNTR @@ -559,7 +559,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -581,7 +581,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -603,7 +603,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -625,7 +625,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -647,7 +647,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -669,7 +669,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -691,7 +691,7 @@ VI-vak - + WBI-0A-1 GECBNTR @@ -713,7 +713,7 @@ VI-vak - + WBI-0A-1 GECBNTR @@ -735,7 +735,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -757,7 +757,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -779,7 +779,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -801,7 +801,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -823,7 +823,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -845,7 +845,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -867,7 +867,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -889,7 +889,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -906,7 +906,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -923,7 +923,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -940,7 +940,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -957,7 +957,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -974,7 +974,7 @@ I-vak - + WBI-0A-1 GECBNTR @@ -991,7 +991,7 @@ I-vak - + WBI-3C-1 GECBNTR @@ -1106,26 +1106,26 @@ VOLLDG - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 0 11.313708498984761 @@ -1136,7 +1136,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1147,7 +1147,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1158,7 +1158,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1169,7 +1169,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1180,7 +1180,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1191,7 +1191,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1202,7 +1202,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1213,7 +1213,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1224,7 +1224,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1235,7 +1235,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1246,7 +1246,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1257,7 +1257,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1268,7 +1268,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1279,7 +1279,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1290,7 +1290,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1301,7 +1301,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1312,7 +1312,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1323,7 +1323,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1334,7 +1334,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1345,7 +1345,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1356,7 +1356,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1367,7 +1367,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1378,7 +1378,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1389,7 +1389,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1400,7 +1400,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1411,7 +1411,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1422,7 +1422,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1433,7 +1433,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1444,7 +1444,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1455,7 +1455,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1466,7 +1466,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1477,7 +1477,7 @@ 11.313708498984761 TOETSSSTE - + 0 11.313708498984761 @@ -1488,7 +1488,7 @@ 11.313708498984761 TOETSSSTE - + 11.313708498984761 22.627416997969522 @@ -1499,7 +1499,7 @@ 11.313708498984761 TOETSSSTE - + 0 1