Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs =================================================================== diff -u -r62fd869059a7705683e46d4bf9c6566fa7d66218 -rc4ef31979d7db1dd44795fa134a753dbff2a2444 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs (.../HeightStructurePermutationHelperTest.cs) (revision 62fd869059a7705683e46d4bf9c6566fa7d66218) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs (.../HeightStructurePermutationHelperTest.cs) (revision c4ef31979d7db1dd44795fa134a753dbff2a2444) @@ -32,20 +32,19 @@ public void DifferentHeightStructures_ReturnsExpectedTestCaseData() { // Setup + const string targetName = "A"; + const string testResultDescription = "B"; var referenceStructure = new TestHeightStructure(); var differentStructures = new List(); // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructures("A", "B").ToList(); + List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructures(targetName, testResultDescription).ToList(); + // Assert Assert.AreEqual(17, testCaseDatas.Count); - IEnumerable testNames = testCaseDatas - .Select(tcd => tcd.TestName) - .ToList(); - Assert.AreEqual(17, testNames.Distinct().Count()); - Assert.IsTrue(testNames.All(tn => tn.StartsWith("A_"))); - Assert.IsTrue(testNames.All(tn => tn.EndsWith("_B"))); + AssertTestNames(testCaseDatas, targetName, testResultDescription); + IEnumerable structures = testCaseDatas .Select(tcd => tcd.Arguments[0]) .OfType() @@ -75,20 +74,18 @@ public void DifferentHeightStructuresWithSameId_ReturnsExpectedTestCaseData() { // Setup + const string targetName = "C"; + const string testResultDescription = "D"; var referenceStructure = new TestHeightStructure(); var differentStructures = new List(); // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameId("A", "B").ToList(); + List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameId(targetName, testResultDescription).ToList(); // Assert Assert.AreEqual(16, testCaseDatas.Count); - IEnumerable testNames = testCaseDatas - .Select(tcd => tcd.TestName) - .ToList(); - Assert.AreEqual(16, testNames.Distinct().Count()); - Assert.IsTrue(testNames.All(tn => tn.StartsWith("A_"))); - Assert.IsTrue(testNames.All(tn => tn.EndsWith("_B"))); + AssertTestNames(testCaseDatas, targetName, testResultDescription); + IEnumerable structures = testCaseDatas .Select(tcd => tcd.Arguments[0]) .OfType() @@ -118,20 +115,18 @@ public void DifferentHeightStructuresWithSameIdNameAndLocation_ReturnsExpectedTestCaseData() { // Setup + const string targetName = "E"; + const string testResultDescription = "F"; var referenceStructure = new TestHeightStructure(); var differentStructures = new List(); // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameIdNameAndLocation("C", "D").ToList(); + List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); // Assert Assert.AreEqual(14, testCaseDatas.Count); - IEnumerable testNames = testCaseDatas - .Select(tcd => tcd.TestName) - .ToList(); - Assert.AreEqual(14, testNames.Distinct().Count()); - Assert.IsTrue(testNames.All(tn => tn.StartsWith("C_"))); - Assert.IsTrue(testNames.All(tn => tn.EndsWith("_D"))); + AssertTestNames(testCaseDatas, targetName, testResultDescription); + IEnumerable structures = testCaseDatas .Select(tcd => tcd.Arguments[0]) .OfType() @@ -156,5 +151,15 @@ differentStructures.Add(structures.Single(s => !s.StructureNormalOrientation.Equals(referenceStructure.StructureNormalOrientation))); Assert.AreEqual(14, differentStructures.Distinct().Count()); } + + private static void AssertTestNames(ICollection testCaseDatas, string targetName, string testResultDescription) + { + IEnumerable testNames = testCaseDatas + .Select(tcd => tcd.TestName) + .ToList(); + Assert.AreEqual(testCaseDatas.Count, testNames.Distinct().Count()); + Assert.IsTrue(testNames.All(tn => tn.StartsWith($"{targetName}_"))); + Assert.IsTrue(testNames.All(tn => tn.EndsWith($"_{testResultDescription}"))); + } } } \ No newline at end of file