Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -47,7 +47,7 @@ var failureMechanism = new DuneErosionFailureMechanism(); var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection); - using (DuneErosionPlugin plugin = new DuneErosionPlugin()) + using (var plugin = new DuneErosionPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -64,7 +64,7 @@ public void FileFilter_Always_ReturnFileFilter() { // Setup - using (DuneErosionPlugin plugin = new DuneErosionPlugin()) + using (var plugin = new DuneErosionPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -88,7 +88,7 @@ failureMechanism.DuneLocations.Add(new TestDuneLocation()); var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection); - using (DuneErosionPlugin plugin = new DuneErosionPlugin()) + using (var plugin = new DuneErosionPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -98,6 +98,7 @@ // Assert Assert.IsFalse(isEnabled); } + mocks.VerifyAll(); } [Test] @@ -115,7 +116,7 @@ }); var context = new DuneLocationsContext(failureMechanism.DuneLocations, failureMechanism, assessmentSection); - using (DuneErosionPlugin plugin = new DuneErosionPlugin()) + using (var plugin = new DuneErosionPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -125,6 +126,7 @@ // Assert Assert.IsTrue(isEnabled); } + mocks.VerifyAll(); } private static ExportInfo GetExportInfo(DuneErosionPlugin plugin) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -49,7 +49,7 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -66,7 +66,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -90,7 +90,7 @@ var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -124,7 +124,7 @@ }, failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -50,7 +50,7 @@ var calculationGroup = new CalculationGroup(); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -67,7 +67,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -91,7 +91,7 @@ var calculationGroup = new CalculationGroup(); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -131,7 +131,7 @@ calculationGroup.Children.Add(calculation); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -179,7 +179,7 @@ }); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs (.../HydraulicBoundariesGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs (.../HydraulicBoundariesGroupContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Drawing; using System.Linq; using Core.Common.Base.IO; using Core.Common.Gui; @@ -34,7 +35,6 @@ using Ringtoets.GrassCoverErosionOutwards.IO; using Ringtoets.GrassCoverErosionOutwards.Plugin; using Ringtoets.Revetment.Data; -using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.ExportInfos @@ -48,7 +48,7 @@ [SetUp] public void Setup() { - using (GrassCoverErosionOutwardsPlugin plugin = new GrassCoverErosionOutwardsPlugin()) + using (var plugin = new GrassCoverErosionOutwardsPlugin()) { ExportInfo[] exportInfos = plugin.GetExportInfos().Where(ei => ei.DataType == typeof(HydraulicBoundariesGroupContext)).ToArray(); hydraulicBoundaryLocationsExporterExportInfo = exportInfos.FirstOrDefault(ei => ei.Name.Equals("Waterstanden en golfhoogtes uit marginale statistiek (*.shp).")); @@ -74,7 +74,7 @@ public void HydraulicBoundaryLocationsExporterExportInfo_Image_ReturnsPointShapefileIcon() { // Call - var icon = hydraulicBoundaryLocationsExporterExportInfo.Image; + Image icon = hydraulicBoundaryLocationsExporterExportInfo.Image; // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.PointShapefileIcon, icon); @@ -115,6 +115,7 @@ // Assert Assert.IsFalse(isEnabled); + mockRepository.VerifyAll(); } [Test] @@ -134,6 +135,7 @@ // Assert Assert.IsTrue(isEnabled); + mockRepository.VerifyAll(); } [Test] @@ -164,7 +166,7 @@ public void WaveConditionsExporterExportInfo_Image_ReturnsCsvFileIcon() { // Call - var icon = waveConditionsExporterExportInfo.Image; + Image icon = waveConditionsExporterExportInfo.Image; // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GeneralOutputIcon, icon); @@ -205,6 +207,7 @@ // Assert Assert.IsFalse(isEnabled); + mockRepository.VerifyAll(); } [Test] @@ -224,6 +227,7 @@ // Assert Assert.IsFalse(isEnabled); + mockRepository.VerifyAll(); } [Test] @@ -246,6 +250,7 @@ // Assert Assert.IsTrue(isEnabled); + mockRepository.VerifyAll(); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs (.../HydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs (.../HydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -29,7 +29,6 @@ using Ringtoets.Common.IO.Hydraulics; using Ringtoets.Integration.Data; using Ringtoets.Integration.Forms.PresentationObjects; -using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources; namespace Ringtoets.Integration.Plugin.Test.ExportInfos { @@ -40,17 +39,17 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Setup - HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "test", 0, 0)); - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { HydraulicBoundaryDatabase = hydraulicBoundaryDatabase }; - HydraulicBoundaryDatabaseContext context = new HydraulicBoundaryDatabaseContext(assessmentSection); - string filePath = "test"; + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); + var filePath = "test"; - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetInfo(plugin); @@ -66,7 +65,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetInfo(plugin); @@ -82,10 +81,10 @@ public void IsEnabled_NoHydraulicBoundaryDatabaseSet_ReturnsFalse() { // Setup - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - HydraulicBoundaryDatabaseContext context = new HydraulicBoundaryDatabaseContext(assessmentSection); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetInfo(plugin); @@ -101,13 +100,13 @@ public void IsEnabled_HydraulicBoundaryDatabaseSet_ReturnsTrue() { // Setup - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase() }; - HydraulicBoundaryDatabaseContext context = new HydraulicBoundaryDatabaseContext(assessmentSection); + var context = new HydraulicBoundaryDatabaseContext(assessmentSection); - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetInfo(plugin); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs (.../ReferenceLineContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs (.../ReferenceLineContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -38,14 +38,14 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Setup - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { ReferenceLine = new ReferenceLine() }; - ReferenceLineContext context = new ReferenceLineContext(assessmentSection); - string filePath = "test"; + var context = new ReferenceLineContext(assessmentSection); + var filePath = "test"; - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -61,7 +61,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -77,10 +77,10 @@ public void IsEnabled_NoReferenceLineSet_ReturnsFalse() { // Setup - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - ReferenceLineContext context = new ReferenceLineContext(assessmentSection); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); + var context = new ReferenceLineContext(assessmentSection); - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -96,13 +96,13 @@ public void IsEnabled_ReferenceLineSet_ReturnsTrue() { // Setup - AssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) { ReferenceLine = new ReferenceLine() }; - ReferenceLineContext context = new ReferenceLineContext(assessmentSection); + var context = new ReferenceLineContext(assessmentSection); - using (RingtoetsPlugin plugin = new RingtoetsPlugin()) + using (var plugin = new RingtoetsPlugin()) { ExportInfo info = GetExportInfo(plugin); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -49,7 +49,7 @@ var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -66,7 +66,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -90,7 +90,7 @@ var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -129,7 +129,7 @@ }, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -144,7 +144,7 @@ private static ExportInfo GetExportInfo(StabilityStoneCoverPlugin plugin) { - return Enumerable.First(plugin.GetExportInfos(), ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext)); + return plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationContext)); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -50,7 +50,7 @@ var calculationGroup = new CalculationGroup(); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -67,7 +67,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -91,7 +91,7 @@ var calculationGroup = new CalculationGroup(); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -117,7 +117,7 @@ calculationGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation()); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -155,7 +155,7 @@ }); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -209,7 +209,7 @@ }); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (StabilityStoneCoverPlugin plugin = new StabilityStoneCoverPlugin()) + using (var plugin = new StabilityStoneCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -224,7 +224,7 @@ private static ExportInfo GetExportInfo(StabilityStoneCoverPlugin plugin) { - return Enumerable.First(plugin.GetExportInfos(), ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext)); + return plugin.GetExportInfos().First(ei => ei.DataType == typeof(StabilityStoneCoverWaveConditionsCalculationGroupContext)); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -49,7 +49,7 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -66,7 +66,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -90,7 +90,7 @@ var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(), failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -124,7 +124,7 @@ }, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -139,7 +139,7 @@ private static ExportInfo GetExportInfo(WaveImpactAsphaltCoverPlugin plugin) { - return Enumerable.First(plugin.GetExportInfos(), ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext)); + return plugin.GetExportInfos().First(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationContext)); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -50,7 +50,7 @@ var calculationGroup = new CalculationGroup(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -67,7 +67,7 @@ public void FileFilter_Always_ReturnsFileFilter() { // Setup - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -91,7 +91,7 @@ var calculationGroup = new CalculationGroup(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -117,7 +117,7 @@ calculationGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -151,7 +151,7 @@ }); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -199,7 +199,7 @@ }); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, failureMechanism, assessmentSection); - using (WaveImpactAsphaltCoverPlugin plugin = new WaveImpactAsphaltCoverPlugin()) + using (var plugin = new WaveImpactAsphaltCoverPlugin()) { ExportInfo exportInfo = GetExportInfo(plugin); @@ -214,7 +214,7 @@ private static ExportInfo GetExportInfo(WaveImpactAsphaltCoverPlugin plugin) { - return Enumerable.First(plugin.GetExportInfos(), ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext)); + return plugin.GetExportInfos().First(ei => ei.DataType == typeof(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext)); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -re8e313c6998f900bbbc6aade310e2a27dfbbd318 -rd3079ddcf65720b6722bf95759ea0ea48c5f124d --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision e8e313c6998f900bbbc6aade310e2a27dfbbd318) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision d3079ddcf65720b6722bf95759ea0ea48c5f124d) @@ -51,7 +51,7 @@ new PipingFailureMechanism(), assessmentSection); - using (PipingPlugin plugin = new PipingPlugin()) + using (var plugin = new PipingPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -68,7 +68,7 @@ public void FileFilter_Always_ReturnFileFilter() { // Setup - using (PipingPlugin plugin = new PipingPlugin()) + using (var plugin = new PipingPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -94,7 +94,7 @@ new PipingFailureMechanism(), assessmentSection); - using (PipingPlugin plugin = new PipingPlugin()) + using (var plugin = new PipingPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -104,6 +104,7 @@ // Assert Assert.IsFalse(isEnabled); } + mocks.VerifyAll(); } [Test] @@ -134,7 +135,7 @@ new PipingFailureMechanism(), assessmentSection); - using (PipingPlugin plugin = new PipingPlugin()) + using (var plugin = new PipingPlugin()) { ExportInfo info = GetExportInfo(plugin); @@ -144,6 +145,7 @@ // Assert Assert.IsTrue(isEnabled); } + mocks.VerifyAll(); } private static ExportInfo GetExportInfo(PipingPlugin plugin)