Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs =================================================================== diff -u -r1e5300a95a25677488384a87ac159288529f3751 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs (.../HeightStructurePermutationHelperTest.cs) (revision 1e5300a95a25677488384a87ac159288529f3751) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/HeightStructurePermutationHelperTest.cs (.../HeightStructurePermutationHelperTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -37,12 +37,12 @@ // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructures(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = HeightStructurePermutationHelper.DifferentHeightStructures(targetName, testResultDescription); // Assert - Assert.AreEqual(17, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, true, true, true); + Assert.AreEqual(17, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, true, true, true); } [Test] @@ -53,12 +53,12 @@ const string testResultDescription = "D"; // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameId(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameId(targetName, testResultDescription); // Assert - Assert.AreEqual(16, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, true, true); + Assert.AreEqual(16, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, false, true, true); } [Test] @@ -69,35 +69,36 @@ const string testResultDescription = "F"; // Call - List testCaseDatas = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = HeightStructurePermutationHelper.DifferentHeightStructuresWithSameIdNameAndLocation(targetName, testResultDescription); // Assert - Assert.AreEqual(14, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, false, false); + Assert.AreEqual(14, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, false, false, false); } - private static void AssertTestNames(ICollection testCaseDatas, string targetName, string testResultDescription) + private static void AssertTestNames(IEnumerable testCaseData, string targetName, string testResultDescription) { - IEnumerable testNames = testCaseDatas + IEnumerable testNames = testCaseData .Select(tcd => tcd.TestName) - .ToList(); - Assert.AreEqual(testCaseDatas.Count, testNames.Distinct().Count()); + .ToArray(); + Assert.AreEqual(testCaseData.Count(), testNames.Distinct().Count()); Assert.IsTrue(testNames.All(tn => tn.StartsWith($"{targetName}_"))); Assert.IsTrue(testNames.All(tn => tn.EndsWith($"_{testResultDescription}"))); } - private static void AssertParameters(ICollection testCaseDatas, bool idUnique, bool nameUnique, bool locationUnique) + private static void AssertParameters(IEnumerable testCaseData, bool idUnique, bool nameUnique, bool locationUnique) { var differentStructures = new List(); var referenceStructure = new TestHeightStructure(); - IEnumerable structures = testCaseDatas + IEnumerable structures = testCaseData .Select(tcd => tcd.Arguments[0]) .OfType() - .ToList(); + .ToArray(); - Assert.AreEqual(testCaseDatas.Count, structures.Count()); + int testDataCount = testCaseData.Count(); + Assert.AreEqual(testDataCount, structures.Count()); if (idUnique) { @@ -140,7 +141,7 @@ differentStructures.Add(structures.Single(s => !s.WidthFlowApertures.StandardDeviation.Equals(referenceStructure.WidthFlowApertures.StandardDeviation))); differentStructures.Add(structures.Single(s => !s.FailureProbabilityStructureWithErosion.Equals(referenceStructure.FailureProbabilityStructureWithErosion))); differentStructures.Add(structures.Single(s => !s.StructureNormalOrientation.Equals(referenceStructure.StructureNormalOrientation))); - Assert.AreEqual(testCaseDatas.Count, differentStructures.Distinct().Count()); + Assert.AreEqual(testDataCount, differentStructures.Distinct().Count()); } } } \ No newline at end of file