Index: Core/Common/src/Core.Common.Base/CloneableObservable.cs =================================================================== diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Base/CloneableObservable.cs (.../CloneableObservable.cs) (revision 07f3d67fe9512b3c8303ff09398b0a234900d546) +++ Core/Common/src/Core.Common.Base/CloneableObservable.cs (.../CloneableObservable.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -33,7 +33,7 @@ { var clone = (CloneableObservable) MemberwiseClone(); - clone.observers = new Collection(); + clone.ObserverCollection = new Collection(); return clone; } Index: Core/Common/src/Core.Common.Base/CloneableObservableList.cs =================================================================== diff -u -r817593259f188dfd979b6fa7a266ca87093b652f -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Base/CloneableObservableList.cs (.../CloneableObservableList.cs) (revision 817593259f188dfd979b6fa7a266ca87093b652f) +++ Core/Common/src/Core.Common.Base/CloneableObservableList.cs (.../CloneableObservableList.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -34,7 +34,7 @@ { var clone = (CloneableObservableList) MemberwiseClone(); - clone.observers = new Collection(); + clone.ObserverCollection = new Collection(); return clone; } Index: Core/Common/src/Core.Common.Base/Observable.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Base/Observable.cs (.../Observable.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Core/Common/src/Core.Common.Base/Observable.cs (.../Observable.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -33,34 +33,34 @@ /// /// The observers that are attached. /// - protected Collection observers = new Collection(); + protected Collection ObserverCollection = new Collection(); public IEnumerable Observers { get { - return observers; + return ObserverCollection; } } public void Attach(IObserver observer) { - observers.Add(observer); + ObserverCollection.Add(observer); } public void Detach(IObserver observer) { - observers.Remove(observer); + ObserverCollection.Remove(observer); } public virtual void NotifyObservers() { // Iterate through a copy of the list of observers; an update of one observer might result in detaching // another observer (which will result in a "list modified" exception over here otherwise) - foreach (IObserver observer in observers.ToArray()) + foreach (IObserver observer in ObserverCollection.ToArray()) { // Ensure the observer is still part of the original list of observers - if (!observers.Contains(observer)) + if (!ObserverCollection.Contains(observer)) { continue; } Index: Core/Common/src/Core.Common.Base/ObservableList.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Base/ObservableList.cs (.../ObservableList.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Core/Common/src/Core.Common.Base/ObservableList.cs (.../ObservableList.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -34,33 +34,33 @@ /// /// The observers that are attached. /// - protected Collection observers = new Collection(); + protected Collection ObserverCollection = new Collection(); public IEnumerable Observers { get { - return observers; + return ObserverCollection; } } public void Attach(IObserver observer) { - observers.Add(observer); + ObserverCollection.Add(observer); } public void Detach(IObserver observer) { - observers.Remove(observer); + ObserverCollection.Remove(observer); } public void NotifyObservers() { // Iterate through a copy of the list of observers; an update of one observer might result in detaching another observer (which will result in a "list modified" exception over here otherwise) - foreach (IObserver observer in observers.ToArray()) + foreach (IObserver observer in ObserverCollection.ToArray()) { // Ensure the observer is still part of the original list of observers - if (!observers.Contains(observer)) + if (!ObserverCollection.Contains(observer)) { continue; } Index: Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -69,8 +69,6 @@ Properties = properties; WrappedObject = propertyObject; - - } /// Index: Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs (.../ColorAccess.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Core/Common/src/Core.Common.Util/Drawing/ColorAccess.cs (.../ColorAccess.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -170,7 +170,7 @@ } BitmapData bitmapData = bitmap.LockBits(validRange, ImageLockMode.WriteOnly, bitmap.PixelFormat); - Marshal.Copy(Buffer.ToArray(), 0, bitmapData.Scan0, Buffer.Count()); + Marshal.Copy(buffer, 0, bitmapData.Scan0, buffer.Length); bitmap.UnlockBits(bitmapData); } Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -253,7 +253,7 @@ mockRepository.ReplayAll(); var dialogText = ""; - List listViewItems = null; + TestListViewItem[] listViewItems = null; ModalFormHandler = (name, wnd, form) => { @@ -265,7 +265,7 @@ listViewItems = listView.Items .OfType() .Select(lvi => new TestListViewItem(lvi.Name, lvi.Group.Name, imageList.Images[lvi.ImageIndex])) - .ToList(); + .ToArray(); dialog.Close(); }; @@ -282,7 +282,7 @@ // Assert Assert.AreEqual("Kies wat u wilt exporteren", dialogText); - Assert.AreEqual(2, listViewItems.Count); + Assert.AreEqual(2, listViewItems.Length); Assert.AreEqual("", listViewItems[0].Name); Assert.AreEqual("Algemeen", listViewItems[0].Group); Assert.AreEqual("", listViewItems[1].Name); @@ -370,7 +370,7 @@ mockRepository.ReplayAll(); var dialogText = ""; - List listViewItems = null; + TestListViewItem[] listViewItems = null; ModalFormHandler = (name, wnd, form) => { @@ -382,7 +382,7 @@ listViewItems = listView.Items .OfType() .Select(lvi => new TestListViewItem(lvi.Name, lvi.Group.Name, imageList.Images[lvi.ImageIndex])) - .ToList(); + .ToArray(); dialog.Close(); }; @@ -415,7 +415,7 @@ // Assert Assert.AreEqual("Kies wat u wilt exporteren", dialogText); - Assert.AreEqual(2, listViewItems.Count); + Assert.AreEqual(2, listViewItems.Length); string expectedItemName1 = hasFileFilterGenerator ? $"{exportInfo1.Name} (*.{exportInfo1.FileFilterGenerator.Extension})" : exportInfo1.Name; Index: Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs =================================================================== diff -u -rb9e640cceb967cc24e3999c373ddb5040e59a1f0 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs (.../PolygonShapeFileReader.cs) (revision b9e640cceb967cc24e3999c373ddb5040e59a1f0) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PolygonShapeFileReader.cs (.../PolygonShapeFileReader.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -138,14 +138,14 @@ }; } - private FeatureBasedMapData ConvertPolygonFeaturesToMapPointData(IEnumerable featureList, string name) + private FeatureBasedMapData ConvertPolygonFeaturesToMapPointData(IEnumerable features, string name) { - int featureListCount = featureList.Count(); - var mapFeatures = new MapFeature[featureListCount]; + int featureCount = features.Count(); + var mapFeatures = new MapFeature[featureCount]; - for (var i = 0; i < featureListCount; i++) + for (var i = 0; i < featureCount; i++) { - IFeature feature = featureList.ElementAt(i); + IFeature feature = features.ElementAt(i); MapFeature mapFeature = CreateMapFeatureForPolygonFeature(feature); CopyMetaDataIntoFeature(mapFeature, i); Index: Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs =================================================================== diff -u -rb9e640cceb967cc24e3999c373ddb5040e59a1f0 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision b9e640cceb967cc24e3999c373ddb5040e59a1f0) +++ Core/Components/src/Core.Components.Gis.IO/Readers/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -150,7 +150,7 @@ private MapLineData ConvertMultiLineFeatureToMapLineData(IEnumerable lineFeatures, string name) { int lineFeaturesCount = lineFeatures.Count(); - var mapFeatureList = new MapFeature[lineFeaturesCount]; + var mapFeatures = new MapFeature[lineFeaturesCount]; for (var featureIndex = 0; featureIndex < lineFeaturesCount; featureIndex++) { @@ -159,12 +159,12 @@ CopyMetaDataIntoFeature(feature, featureIndex); - mapFeatureList[featureIndex] = feature; + mapFeatures[featureIndex] = feature; } var mapLineData = new MapLineData(name) { - Features = mapFeatureList + Features = mapFeatures }; mapLineData.SelectedMetaDataAttribute = mapLineData.MetaData.FirstOrDefault(); Index: Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleLineDataConverter.cs =================================================================== diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision bf790921e622ee49149a92e6b52668fb30d6e3a6) +++ Core/Components/src/Core.Components.OxyPlot/Converter/Chart/ChartMultipleLineDataConverter.cs (.../ChartMultipleLineDataConverter.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; using Core.Components.Chart.Data; @@ -37,7 +38,7 @@ { series.Lines.Clear(); - foreach (Point2D[] line in data.Lines) + foreach (IEnumerable line in data.Lines) { series.Lines.Add(line.Select(p => new DataPoint(p.X, p.Y)).ToArray()); } Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs =================================================================== diff -u -r66964d0c53eb0d904f7ada3e3bbc1e9604e241e7 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs (.../MultipleAreaSeries.cs) (revision 66964d0c53eb0d904f7ada3e3bbc1e9604e241e7) +++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs (.../MultipleAreaSeries.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -104,9 +104,9 @@ renderContext.SetClip(clippingRect); // Transform all points to screen coordinates - foreach (DataPoint[] area in Areas) + foreach (IEnumerable area in Areas) { - int n0 = area.Length; + int n0 = area.Count(); var pts0 = new ScreenPoint[n0]; TransformToScreenCoordinates(n0, pts0, area); @@ -139,11 +139,11 @@ YAxis.Include(MaxY); } - private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, DataPoint[] actualPoints) + private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, IEnumerable actualPoints) { for (var i = 0; i < n0; i++) { - pts0[i] = XAxis.Transform(actualPoints[i].X, actualPoints[i].Y, YAxis); + pts0[i] = XAxis.Transform(actualPoints.ElementAt(i).X, actualPoints.ElementAt(i).Y, YAxis); } } } Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs =================================================================== diff -u -re14ae58fe3639b6850b6e0bece9bbaa8a6267fdc -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs (.../MultipleLineSeries.cs) (revision e14ae58fe3639b6850b6e0bece9bbaa8a6267fdc) +++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleLineSeries.cs (.../MultipleLineSeries.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -98,9 +98,9 @@ renderContext.SetClip(clippingRect); // Transform all points to screen coordinates - foreach (DataPoint[] line in Lines) + foreach (IEnumerable line in Lines) { - int n0 = line.Length; + int n0 = line.Count(); var pts0 = new ScreenPoint[n0]; TransformToScreenCoordinates(n0, pts0, line); @@ -134,11 +134,11 @@ YAxis.Include(MaxY); } - private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, DataPoint[] actualPoints) + private void TransformToScreenCoordinates(int n0, ScreenPoint[] pts0, IEnumerable actualPoints) { for (var i = 0; i < n0; i++) { - pts0[i] = XAxis.Transform(actualPoints[i].X, actualPoints[i].Y, YAxis); + pts0[i] = XAxis.Transform(actualPoints.ElementAt(i).X, actualPoints.ElementAt(i).Y, YAxis); } } } Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs =================================================================== diff -u -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 -r6949918830314633db5cc8c16bb2188779fffc93 --- Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) +++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/StackChartControlTest.cs (.../StackChartControlTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -297,9 +297,10 @@ private static void AssertSeries(IEnumerable expectedSeriesTitles, CategoryPlotView plotView) { ElementCollection series = plotView.Model.Series; - Assert.AreEqual(expectedSeriesTitles.Count(), series.Count); + int expectedSeriesTitlesCount = expectedSeriesTitles.Count(); + Assert.AreEqual(expectedSeriesTitlesCount, series.Count); - for (var i = 0; i < expectedSeriesTitles.Count(); i++) + for (var i = 0; i < expectedSeriesTitlesCount; i++) { Assert.AreEqual(expectedSeriesTitles.ElementAt(i), series[i].Title); } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -368,9 +367,9 @@ }; } - private static IEnumerable GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), @@ -379,9 +378,9 @@ }; } - private static IEnumerable GetOutputs(ClosingStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(ClosingStructuresFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new ClosingStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs =================================================================== diff -u -r61c2ac2573d82151b0b1593260a419543d07122a -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision 61c2ac2573d82151b0b1593260a419543d07122a) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/ClosingStructurePermutationHelperTest.cs (.../ClosingStructurePermutationHelperTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -36,12 +36,12 @@ const string testResultDescription = "B"; // Call - List testCaseDatas = ClosingStructurePermutationHelper.DifferentClosingStructures(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = ClosingStructurePermutationHelper.DifferentClosingStructures(targetName, testResultDescription); // Assert - Assert.AreEqual(27, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, true, true, true); + Assert.AreEqual(27, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, true, true, true); } [Test] @@ -52,12 +52,12 @@ const string testResultDescription = "D"; // Call - List testCaseDatas = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameId(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameId(targetName, testResultDescription); // Assert - Assert.AreEqual(26, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, true, true); + Assert.AreEqual(26, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, false, true, true); } [Test] @@ -68,35 +68,35 @@ const string testResultDescription = "F"; // Call - List testCaseDatas = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = ClosingStructurePermutationHelper.DifferentClosingStructuresWithSameIdNameAndLocation(targetName, testResultDescription); // Assert - Assert.AreEqual(24, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, false, false); + Assert.AreEqual(24, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, false, false, false); } - private static void AssertTestNames(IEnumerable 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(IEnumerable 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 TestClosingStructure(); - IEnumerable structures = testCaseDatas + IEnumerable structures = testCaseData .Select(tcd => tcd.Arguments[0]) .OfType() - .ToList(); + .ToArray(); - int expectedTestDataCount = testCaseDatas.Count(); + int expectedTestDataCount = testCaseData.Count(); Assert.AreEqual(expectedTestDataCount, structures.Count()); if (idUnique) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r964f8948f0ec59095ea9cc58fdabd706c4b17d22 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 964f8948f0ec59095ea9cc58fdabd706c4b17d22) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -305,12 +305,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -339,12 +338,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual(67.1, calculation.StructureNormalOrientation); Assert.AreEqual("kunstwerk1", calculation.StructureId); Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName); @@ -397,12 +395,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value)); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -453,12 +450,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNaN(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -509,12 +505,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName); @@ -560,12 +555,11 @@ var reader = new ClosingStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ForeshoreProfilePermutationHelperTest.cs =================================================================== diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ForeshoreProfilePermutationHelperTest.cs (.../ForeshoreProfilePermutationHelperTest.cs) (revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/ForeshoreProfilePermutationHelperTest.cs (.../ForeshoreProfilePermutationHelperTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -37,14 +37,14 @@ const string testResultDescription = "D"; // Call - TestCaseData[] testCaseDatas = ForeshoreProfilePermutationHelper.DifferentForeshoreProfilesWithSameIdNameAndX0( + IEnumerable testCaseData = ForeshoreProfilePermutationHelper.DifferentForeshoreProfilesWithSameIdNameAndX0( targetName, - testResultDescription).ToArray(); + testResultDescription); // Assert - Assert.AreEqual(5, testCaseDatas.Length); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertProperties(testCaseDatas, true); + Assert.AreEqual(5, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertProperties(testCaseData, true); } [Test] @@ -55,38 +55,39 @@ const string testResultDescription = "D"; // Call - TestCaseData[] testCaseDatas = ForeshoreProfilePermutationHelper.DifferentForeshoreProfilesWithSameIdNameOrientationAndX0( + IEnumerable testCaseData = ForeshoreProfilePermutationHelper.DifferentForeshoreProfilesWithSameIdNameOrientationAndX0( targetName, testResultDescription).ToArray(); // Assert - Assert.AreEqual(4, testCaseDatas.Length); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertProperties(testCaseDatas, false); + Assert.AreEqual(4, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertProperties(testCaseData, false); } - private static void AssertTestNames(ICollection testCaseDatas, + 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 AssertProperties(ICollection testCaseDatas, bool orientationUnique) + private static void AssertProperties(IEnumerable testCaseData, bool orientationUnique) { var differentProfiles = new List(); var referenceProfile = new TestForeshoreProfile(); - IEnumerable profiles = testCaseDatas.Select(tcd => tcd.Arguments[0]) - .OfType() - .ToList(); + IEnumerable profiles = testCaseData.Select(tcd => tcd.Arguments[0]) + .OfType() + .ToArray(); - Assert.AreEqual(profiles.Count(), testCaseDatas.Count); + int testDataCount = testCaseData.Count(); + Assert.AreEqual(testDataCount, profiles.Count()); Assert.IsTrue(profiles.All(p => p.Id == referenceProfile.Id)); Assert.IsTrue(profiles.All(p => p.Name == referenceProfile.Name)); @@ -114,7 +115,7 @@ && p.BreakWater.Type.Equals(BreakWaterType.Wall) && p.BreakWater.Height.Equals(defaultBreakWater.Height))); - Assert.AreEqual(differentProfiles.Distinct().Count(), testCaseDatas.Count); + Assert.AreEqual(testDataCount, differentProfiles.Distinct().Count()); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -265,12 +265,11 @@ var calculationConfigurationReader = new CalculationConfigurationReader(filePath, validMainSchemaDefinition, new Dictionary()); // Call - List readConfigurationItems = calculationConfigurationReader.Read().ToList(); + IEnumerable readConfigurationItems = calculationConfigurationReader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var group = (CalculationGroupConfiguration) readConfigurationItems.Single(); - var group = readConfigurationItems[0] as CalculationGroupConfiguration; Assert.IsNotNull(group); Assert.AreEqual("Calculation group", group.Name); CollectionAssert.IsEmpty(group.Items); @@ -284,10 +283,10 @@ var calculationConfigurationReader = new CalculationConfigurationReader(filePath, validMainSchemaDefinition, new Dictionary()); // Call - List readConfigurationItems = calculationConfigurationReader.Read().ToList(); + IConfigurationItem[] readConfigurationItems = calculationConfigurationReader.Read().ToArray(); // Assert - Assert.AreEqual(5, readConfigurationItems.Count); + Assert.AreEqual(5, readConfigurationItems.Length); var group1 = readConfigurationItems[0] as CalculationGroupConfiguration; Assert.IsNotNull(group1); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -172,18 +171,18 @@ }; } - private static IEnumerable GetInputs(DuneErosionFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(DuneErosionFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), failureMechanism.InputComments }; } - private static IEnumerable GetOutputs(DuneErosionFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(DuneErosionFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new FailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism), Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -539,19 +538,19 @@ }; } - private static IEnumerable GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new DikeProfilesContext(failureMechanism.DikeProfiles, failureMechanism, assessmentSection), failureMechanism.InputComments }; } - private static IEnumerable GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(GrassCoverErosionInwardsFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new GrassCoverErosionInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -230,12 +230,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Calculation", calculation.Name); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -256,12 +255,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNull(calculation.CriticalFlowRate); } @@ -274,12 +272,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNaN(calculation.Orientation); Assert.IsNaN(calculation.DikeHeight); @@ -296,12 +293,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNotNull(calculation.Orientation); @@ -329,12 +325,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Berekening 1", calculation.Name); Assert.AreEqual("Some_hydraulic_boundary_location", calculation.HydraulicBoundaryLocationName); @@ -362,12 +357,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Partial calculation 2", calculation.Name); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -394,12 +388,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNull(calculation.CriticalFlowRate.Mean); Assert.AreEqual(2.2, calculation.CriticalFlowRate.StandardDeviation); @@ -413,12 +406,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual(1.1, calculation.CriticalFlowRate.Mean); Assert.IsNull(calculation.CriticalFlowRate.StandardDeviation); @@ -432,12 +424,11 @@ var reader = new GrassCoverErosionInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (GrassCoverErosionInwardsCalculationConfiguration) readConfigurationItems.Single(); - var calculation = readConfigurationItems[0] as GrassCoverErosionInwardsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNull(calculation.CriticalFlowRate.Mean); Assert.IsNull(calculation.CriticalFlowRate.StandardDeviation); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -427,19 +426,19 @@ }; } - private static IEnumerable GetInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), failureMechanism.InputComments }; } - private static IEnumerable GetOutputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new FailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism), Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -381,9 +380,9 @@ }; } - private static IEnumerable GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), @@ -392,9 +391,9 @@ }; } - private static IEnumerable GetOutputs(HeightStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(HeightStructuresFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new HeightStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( 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 Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -230,12 +230,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -265,12 +264,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual(67.1, calculation.StructureNormalOrientation); Assert.AreEqual("kunstwerk1", calculation.StructureId); Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName); @@ -310,12 +308,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value)); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -355,12 +352,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNaN(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -400,12 +396,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName); @@ -441,12 +436,11 @@ var reader = new HeightStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.StructureNormalOrientation); Assert.IsNull(calculation.StructureId); Assert.IsNull(calculation.HydraulicBoundaryLocationName); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r35525b6135cc111e4af3803f7dcce0d7528bbb16 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 35525b6135cc111e4af3803f7dcce0d7528bbb16) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; @@ -840,7 +839,7 @@ foreach (AssessmentSection section in sectionsWithDatabase) { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(section.HydraulicBoundaryDatabase.FilePath, - section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); if (validationProblem != null) { log.WarnFormat( @@ -1194,16 +1193,16 @@ }; } - private static IEnumerable GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(nodeData, assessmentSection), nodeData.InputComments }; } - private static IEnumerable GetOutputs(IFailureMechanism nodeData) + private static IEnumerable GetOutputs(IFailureMechanism nodeData) { var duneErosion = nodeData as IHasSectionResults; var grassCoverSlipOffInwards = nodeData as IHasSectionResults; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -686,9 +685,9 @@ }; } - private static IEnumerable GetInputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(MacroStabilityInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new MacroStabilityInwardsSurfaceLinesContext(failureMechanism.SurfaceLines, failureMechanism, assessmentSection), @@ -697,9 +696,9 @@ }; } - private static IEnumerable GetOutputs(MacroStabilityInwardsFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(MacroStabilityInwardsFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new MacroStabilityInwardsScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -78,12 +78,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", configuration.Name); Assert.IsNull(configuration.AssessmentLevel); Assert.IsNull(configuration.HydraulicBoundaryLocationName); @@ -132,12 +131,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; Assert.IsNaN(configuration.AssessmentLevel); Assert.IsNaN(configuration.Scenario.Contribution); Assert.IsNaN(configuration.WaterLevelRiverAverage); @@ -185,13 +183,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; - Assert.IsNotNull(configuration.AssessmentLevel); Assert.IsNotNull(configuration.Scenario.Contribution); @@ -246,12 +242,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", configuration.Name); Assert.IsNull(configuration.AssessmentLevel); Assert.AreEqual("HRlocatie", configuration.HydraulicBoundaryLocationName); @@ -351,12 +346,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", configuration.Name); Assert.AreEqual(1.1, configuration.AssessmentLevel); Assert.IsNull(configuration.HydraulicBoundaryLocationName); @@ -451,12 +445,11 @@ var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call - var readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); - var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", configuration.Name); Assert.AreEqual(1.1, configuration.AssessmentLevel); Assert.IsNull(configuration.HydraulicBoundaryLocationName); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -680,9 +679,9 @@ }; } - private static IEnumerable GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(PipingFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new PipingSurfaceLinesContext(failureMechanism.SurfaceLines, failureMechanism, assessmentSection), @@ -691,9 +690,9 @@ }; } - private static IEnumerable GetOutputs(PipingFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(PipingFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new PipingScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs =================================================================== diff -u -r6b8f6422c0a6f96f8e563bb6afb82a7a192142b4 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision 6b8f6422c0a6f96f8e563bb6afb82a7a192142b4) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -190,12 +190,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", calculation.Name); Assert.IsNull(calculation.AssessmentLevel); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -217,12 +216,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.PhreaticLevelExit); Assert.IsNull(calculation.DampingFactorExit); } @@ -235,12 +233,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.IsNaN(calculation.AssessmentLevel); Assert.IsNaN(calculation.EntryPointL); Assert.IsNaN(calculation.ExitPointL); @@ -259,13 +256,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; - Assert.IsNotNull(calculation.AssessmentLevel); Assert.IsNotNull(calculation.EntryPointL); Assert.IsNotNull(calculation.ExitPointL); @@ -297,12 +292,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", calculation.Name); Assert.IsNull(calculation.AssessmentLevel); Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName); @@ -331,12 +325,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", calculation.Name); Assert.AreEqual(1.1, calculation.AssessmentLevel); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -361,12 +354,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual("Calculation", calculation.Name); Assert.AreEqual(1.1, calculation.AssessmentLevel); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -388,12 +380,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.PhreaticLevelExit.Mean); Assert.AreEqual(0.1, calculation.PhreaticLevelExit.StandardDeviation); Assert.IsNull(calculation.DampingFactorExit.Mean); @@ -408,12 +399,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.AreEqual(0.0, calculation.PhreaticLevelExit.Mean); Assert.IsNull(calculation.PhreaticLevelExit.StandardDeviation); Assert.AreEqual(6.6, calculation.DampingFactorExit.Mean); @@ -428,12 +418,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.PhreaticLevelExit.Mean); Assert.IsNull(calculation.PhreaticLevelExit.StandardDeviation); Assert.IsNull(calculation.DampingFactorExit.Mean); @@ -448,12 +437,11 @@ var reader = new PipingCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (PipingCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (PipingCalculationConfiguration) readConfigurationItems[0]; Assert.IsNull(calculation.Scenario.Contribution); Assert.IsNull(calculation.Scenario.IsRelevant); } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -190,12 +190,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Berekening 1", calculation.Name); Assert.IsNull(calculation.HydraulicBoundaryLocationName); @@ -217,12 +216,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNull(calculation.WaveReduction.UseBreakWater); Assert.IsNull(calculation.WaveReduction.BreakWaterType); @@ -238,12 +236,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.IsNaN(calculation.UpperBoundaryRevetment); Assert.IsNaN(calculation.LowerBoundaryRevetment); @@ -261,12 +258,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.NotNull(calculation.UpperBoundaryRevetment); @@ -294,12 +290,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Berekening 1", calculation.Name); Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName); @@ -324,12 +319,11 @@ var reader = new WaveConditionsCalculationConfigurationReader(filePath); // Call - List readItems = reader.Read().ToList(); + IEnumerable readItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readItems.Count); + var calculation = (WaveConditionsCalculationConfiguration) readItems.Single(); - var calculation = readItems[0] as WaveConditionsCalculationConfiguration; Assert.IsNotNull(calculation); Assert.AreEqual("Berekening 1", calculation.Name); Assert.IsNull(calculation.HydraulicBoundaryLocationName); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -387,10 +386,10 @@ }; } - private static IEnumerable GetInputs(StabilityPointStructuresFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(StabilityPointStructuresFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), @@ -399,9 +398,9 @@ }; } - private static IEnumerable GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(StabilityPointStructuresFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new StabilityPointStructuresScenariosContext(failureMechanism.CalculationsGroup, failureMechanism), new FailureMechanismSectionResultContext( Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs =================================================================== diff -u -r59bb55c3103574906353fbfb3ef3026f0086b6be -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs (.../StabilityPointStructurePermutationHelperTest.cs) (revision 59bb55c3103574906353fbfb3ef3026f0086b6be) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/StabilityPointStructurePermutationHelperTest.cs (.../StabilityPointStructurePermutationHelperTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -36,12 +36,12 @@ const string testResultDescription = "B"; // Call - List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructures(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructures(targetName, testResultDescription); // Assert - Assert.AreEqual(46, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, true, true, true); + Assert.AreEqual(46, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, true, true, true); } [Test] @@ -52,12 +52,12 @@ const string testResultDescription = "D"; // Call - List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameId(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameId(targetName, testResultDescription); // Assert - Assert.AreEqual(45, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, true, true); + Assert.AreEqual(45, testCaseData.Count()); + AssertTestNames(testCaseData, targetName, testResultDescription); + AssertParameters(testCaseData, false, true, true); } [Test] @@ -68,35 +68,36 @@ const string testResultDescription = "F"; // Call - List testCaseDatas = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); + IEnumerable testCaseData = StabilityPointStructurePermutationHelper.DifferentStabilityPointStructuresWithSameIdNameAndLocation(targetName, testResultDescription).ToList(); // Assert - Assert.AreEqual(43, testCaseDatas.Count); - AssertTestNames(testCaseDatas, targetName, testResultDescription); - AssertParameters(testCaseDatas, false, false, false); + Assert.AreEqual(43, 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 TestStabilityPointStructure(); - IEnumerable structures = testCaseDatas + IEnumerable structures = testCaseData .Select(tcd => tcd.Arguments[0]) .OfType() - .ToList(); + .ToArray(); - Assert.AreEqual(testCaseDatas.Count, structures.Count()); + int testCaseDataCount = testCaseData.Count(); + Assert.AreEqual(testCaseDataCount, structures.Count()); if (idUnique) { @@ -168,7 +169,7 @@ differentStructures.Add(structures.Single(s => !s.AreaFlowApertures.Mean.Equals(referenceStructure.AreaFlowApertures.Mean))); differentStructures.Add(structures.Single(s => !s.AreaFlowApertures.StandardDeviation.Equals(referenceStructure.AreaFlowApertures.StandardDeviation))); differentStructures.Add(structures.Single(s => !s.InflowModelType.Equals(referenceStructure.InflowModelType))); - Assert.AreEqual(testCaseDatas.Count, differentStructures.Distinct().Count()); + Assert.AreEqual(testCaseDataCount, differentStructures.Distinct().Count()); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r8b567830c978aa32ef7fbe0a16d71f637ff383e3 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 8b567830c978aa32ef7fbe0a16d71f637ff383e3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -379,13 +379,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; - Assert.AreEqual(0.2, calculation.AllowedLevelIncreaseStorage.Mean); Assert.AreEqual(0.01, calculation.AllowedLevelIncreaseStorage.StandardDeviation); @@ -494,13 +492,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; - Assert.AreEqual(0.01, calculation.FactorStormDurationOpenStructure); Assert.AreEqual("profiel1", calculation.ForeshoreProfileId); Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName); @@ -563,13 +559,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; - Assert.IsNull(calculation.AllowedLevelIncreaseStorage); Assert.IsNull(calculation.AreaFlowApertures); Assert.IsNull(calculation.BankWidth); @@ -619,13 +613,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; - Assert.IsNull(calculation.AllowedLevelIncreaseStorage.Mean); Assert.IsNull(calculation.AllowedLevelIncreaseStorage.StandardDeviation); Assert.IsNull(calculation.AreaFlowApertures.Mean); @@ -697,12 +689,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.That(double.IsPositiveInfinity(calculation.AllowedLevelIncreaseStorage.Mean.Value)); Assert.That(double.IsNegativeInfinity(calculation.AllowedLevelIncreaseStorage.StandardDeviation.Value)); @@ -796,12 +787,11 @@ var reader = new StabilityPointStructuresCalculationConfigurationReader(filePath); // Call - List readConfigurationItems = reader.Read().ToList(); + IEnumerable readConfigurationItems = reader.Read().ToArray(); // Assert - Assert.AreEqual(1, readConfigurationItems.Count); + var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems.Single(); - var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0]; Assert.IsNaN(calculation.AllowedLevelIncreaseStorage.Mean); Assert.IsNaN(calculation.AllowedLevelIncreaseStorage.StandardDeviation); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -262,19 +261,19 @@ }; } - private static IEnumerable GetInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(StabilityStoneCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), failureMechanism.InputComments }; } - private static IEnumerable GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new FailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism), Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r6949918830314633db5cc8c16bb2188779fffc93 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 6949918830314633db5cc8c16bb2188779fffc93) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -264,19 +263,19 @@ }; } - private static IEnumerable GetInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + private static IEnumerable GetInputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { - return new ArrayList + return new object[] { new FailureMechanismSectionsContext(failureMechanism, assessmentSection), new ForeshoreProfilesContext(failureMechanism.ForeshoreProfiles, failureMechanism, assessmentSection), failureMechanism.InputComments }; } - private static IEnumerable GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) + private static IEnumerable GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) { - return new ArrayList + return new object[] { new FailureMechanismSectionResultContext( failureMechanism.SectionResults, failureMechanism),