Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -48,7 +48,7 @@ TestDelegate test = () => assessmentSection.Create(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs =================================================================== diff -u -r8aaa7b9a8a2826cf8da31d0fd136f2d559933afe -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs (.../FailureMechanismSectionCreateExtensionsTest.cs) (revision 8aaa7b9a8a2826cf8da31d0fd136f2d559933afe) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs (.../FailureMechanismSectionCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => failureMechanismSection.Create(null); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs =================================================================== diff -u -r01782033c49f0510e5a622c161c14fa8e7a56138 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision 01782033c49f0510e5a622c161c14fa8e7a56138) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -44,7 +44,7 @@ TestDelegate test = () => foreshoreProfile.Create(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs =================================================================== diff -u -r73dabc9a2cb1bf55429a16930318006c75c180c0 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 73dabc9a2cb1bf55429a16930318006c75c180c0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => hydraulicBoundaryLocation.Create(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } @@ -151,7 +151,7 @@ TestDelegate test = () => hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r79a6c6e4c56e48b6fc077aabbbbf60e05dc4f8a1 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 79a6c6e4c56e48b6fc077aabbbbf60e05dc4f8a1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -47,7 +47,7 @@ TestDelegate test = () => failureMechanism.Create(null); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => soilProfile.Create(null); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilModelCreateExtensionsTest.cs =================================================================== diff -u -rc2bf0666539fa1a781c6d5d633ac292fa4fe2bd4 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilModelCreateExtensionsTest.cs (.../StochasticSoilModelCreateExtensionsTest.cs) (revision c2bf0666539fa1a781c6d5d633ac292fa4fe2bd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilModelCreateExtensionsTest.cs (.../StochasticSoilModelCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -46,7 +46,7 @@ TestDelegate test = () => stochasticSoilModel.Create(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilProfileCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilProfileCreateExtensionsTest.cs (.../StochasticSoilProfileCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/StochasticSoilProfileCreateExtensionsTest.cs (.../StochasticSoilProfileCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => stochasticSoilProfile.Create(null, 0); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/RingtoetsProjectCreateExtensionsTest.cs =================================================================== diff -u -rc2bf0666539fa1a781c6d5d633ac292fa4fe2bd4 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/RingtoetsProjectCreateExtensionsTest.cs (.../RingtoetsProjectCreateExtensionsTest.cs) (revision c2bf0666539fa1a781c6d5d633ac292fa4fe2bd4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/RingtoetsProjectCreateExtensionsTest.cs (.../RingtoetsProjectCreateExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -41,7 +41,7 @@ TestDelegate test = () => project.Create(null); // Assert - var parameterName = Assert.Throws(test).ParamName; + string parameterName = Assert.Throws(test).ParamName; Assert.AreEqual("registry", parameterName); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rd0368f7a05ee1fea5a181022d8619219c4e8c2b2 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision d0368f7a05ee1fea5a181022d8619219c4e8c2b2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -48,7 +48,7 @@ TestDelegate test = () => entity.Read(null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -rd0368f7a05ee1fea5a181022d8619219c4e8c2b2 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision d0368f7a05ee1fea5a181022d8619219c4e8c2b2) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -120,7 +120,7 @@ TestDelegate test = () => entity.ReadAsPipingFailureMechanism(null, new ReadConversionCollector()); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("failureMechanism", parameter); } @@ -134,7 +134,7 @@ TestDelegate test = () => entity.ReadAsPipingFailureMechanism(new PipingFailureMechanism(), null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs (.../SoilProfileEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs (.../SoilProfileEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => entity.Read(null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -44,7 +44,7 @@ TestDelegate test = () => entity.Read(null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs =================================================================== diff -u -re440a0fe415d87b898ae1b6ad2e4ba98d0f104cf -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs (.../StochasticSoilProfileEntityReadExtensionsTest.cs) (revision e440a0fe415d87b898ae1b6ad2e4ba98d0f104cf) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs (.../StochasticSoilProfileEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -41,7 +41,7 @@ TestDelegate test = () => entity.Read(null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -rd3c511b25782c606f9c71158ba5cf5cf5315d6ea -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision d3c511b25782c606f9c71158ba5cf5cf5315d6ea) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -41,7 +41,7 @@ TestDelegate test = () => entity.Read(null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("collector", parameter); } Index: Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Core/Common/test/Core.Common.Gui.Test/Forms/ViewHost/DocumentViewControllerTest.cs (.../DocumentViewControllerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -89,7 +89,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -171,7 +171,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -224,7 +224,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -259,7 +259,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -293,7 +293,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -370,7 +370,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -412,7 +412,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -461,7 +461,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestView; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -510,7 +510,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { view = invocation.Arguments[0] as TestViewDerivative; }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); mocks.ReplayAll(); @@ -579,7 +579,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vh => vh.DocumentViews).Return(viewList); - viewHost.Expect(vm => vm.AddDocumentView(Arg.Matches(c => true))).WhenCalled(invocation => { viewList.Add(invocation.Arguments[0] as TestView); }); + viewHost.Expect(vm => vm.AddDocumentView(Arg.Is.NotNull)).WhenCalled(invocation => { viewList.Add(invocation.Arguments[0] as TestView); }); viewHost.Expect(vh => vh.SetImage(null, null)).IgnoreArguments(); viewHost.Expect(vh => vh.SetFocusToView(Arg.Matches(c => c == viewList.First()))); Index: Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs (.../IDataReaderExtensionsTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Core/Common/test/Core.Common.IO.Test/Readers/IDataReaderExtensionsTest.cs (.../IDataReaderExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -40,7 +40,7 @@ TestDelegate test = () => ((IDataReader) null).Read("column"); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("dataReader", paramName); } @@ -56,7 +56,7 @@ TestDelegate test = () => dataReader.Read(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("columnName", paramName); mockRepository.VerifyAll(); Index: Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs =================================================================== diff -u -r917edb0f289fcc7259995bc8da2678142c16620c -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs (.../RandomExtensionsTest.cs) (revision 917edb0f289fcc7259995bc8da2678142c16620c) +++ Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs (.../RandomExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -104,7 +104,7 @@ TestDelegate test = () => random.NextBoolean(); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("random", paramName); } @@ -133,7 +133,7 @@ TestDelegate test = () => random.NextEnumValue(); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("random", paramName); } @@ -175,7 +175,7 @@ TestDelegate test = () => random.NextRoundedDouble(); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("random", paramName); } Index: Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs =================================================================== diff -u -r0be8a14b7c545ae5a07d1da6a0fa70829323b0f2 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs (.../ChartPluginTest.cs) (revision 0be8a14b7c545ae5a07d1da6a0fa70829323b0f2) +++ Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs (.../ChartPluginTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -81,7 +81,7 @@ gui.Stub(g => g.ViewHost).Return(viewHost); viewHost.Expect(vm => vm.ToolViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); viewHost.Expect(vm => vm.ActiveDocumentView).Return(null); viewHost.Expect(vm => vm.ActiveDocumentViewChanged += null).IgnoreArguments(); Index: Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs =================================================================== diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs (.../ToggleLegendViewCommandTest.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d) +++ Core/Plugins/test/Core.Plugins.Chart.Test/Commands/ToggleLegendViewCommandTest.cs (.../ToggleLegendViewCommandTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -60,7 +60,7 @@ viewController.Stub(tvc => tvc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); } @@ -96,11 +96,11 @@ viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); // Open - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); // Close - viewHost.Expect(vm => vm.Remove(Arg.Matches(v => true))); + viewHost.Expect(vm => vm.Remove(Arg.Is.NotNull)); mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs =================================================================== diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs (.../ChartLegendControllerTest.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d) +++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendControllerTest.cs (.../ChartLegendControllerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -76,7 +76,7 @@ viewController.Stub(tvc => tvc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); } @@ -113,11 +113,11 @@ var toolViewList = new List(); viewController.Stub(tvc => tvc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ChartLegendView); }); if (open) { - viewHost.Expect(p => p.Remove(Arg.Matches(c => true))); + viewHost.Expect(p => p.Remove(Arg.Is.NotNull)); } mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs =================================================================== diff -u -rb78eea44f0c54cf91f8357c96b5c9af8655308d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision b78eea44f0c54cf91f8357c96b5c9af8655308d7) +++ Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -63,7 +63,7 @@ viewController.Stub(vc => vc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); @@ -102,13 +102,13 @@ viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); // Open - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); // Close - viewHost.Expect(vm => vm.Remove(Arg.Matches(v => true))); + viewHost.Expect(vm => vm.Remove(Arg.Is.NotNull)); mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs =================================================================== diff -u -rb78eea44f0c54cf91f8357c96b5c9af8655308d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs (.../MapLegendControllerTest.cs) (revision b78eea44f0c54cf91f8357c96b5c9af8655308d7) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs (.../MapLegendControllerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -103,7 +103,7 @@ viewController.Stub(tvc => tvc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); } @@ -138,12 +138,12 @@ var toolViewList = new List(); viewController.Stub(vc => vc.ViewHost).Return(viewHost); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as MapLegendView); }); viewHost.Stub(tvc => tvc.SetImage(null, null)).IgnoreArguments(); if (open) { - viewHost.Expect(p => p.Remove(Arg.Matches(c => true))); + viewHost.Expect(p => p.Remove(Arg.Is.NotNull)); } mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs =================================================================== diff -u -rb78eea44f0c54cf91f8357c96b5c9af8655308d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision b78eea44f0c54cf91f8357c96b5c9af8655308d7) +++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -86,14 +86,14 @@ gui.Stub(g => g.ViewHost).Return(viewHost); viewHost.Expect(vm => vm.ToolViews).Return(new IView[0]); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), Arg.Matches(vl => vl == ToolViewLocation.Left))); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); viewHost.Expect(vm => vm.ActiveDocumentView).Return(null); viewHost.Expect(vm => vm.ActiveDocumentViewChanged += null).IgnoreArguments(); viewHost.Expect(vm => vm.ActiveDocumentViewChanged -= null).IgnoreArguments(); viewHost.Expect(vm => vm.ViewOpened += null).IgnoreArguments(); viewHost.Expect(vm => vm.ViewOpened -= null).IgnoreArguments(); - viewHost.Expect(vm => vm.Remove(Arg.Matches(c => true))); + viewHost.Expect(vm => vm.Remove(Arg.Is.NotNull)); mocks.ReplayAll(); Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs =================================================================== diff -u -r650277f75faab8d29b4a07b738f0fd2a99ac7ed3 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs (.../ToggleProjectExplorerCommandTest.cs) (revision 650277f75faab8d29b4a07b738f0fd2a99ac7ed3) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/Commands/ToggleProjectExplorerCommandTest.cs (.../ToggleProjectExplorerCommandTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -89,7 +89,7 @@ if (isViewOpen) { - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Expect(tvc => tvc.SetImage(null, null)).IgnoreArguments(); @@ -133,7 +133,7 @@ var viewHost = mocks.StrictMock(); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Stub(vm => vm.SetImage(null, null)).IgnoreArguments(); Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs =================================================================== diff -u -r0be8a14b7c545ae5a07d1da6a0fa70829323b0f2 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs (.../ProjectExplorerPluginTest.cs) (revision 0be8a14b7c545ae5a07d1da6a0fa70829323b0f2) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerPluginTest.cs (.../ProjectExplorerPluginTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -241,11 +241,11 @@ // Activate var toolViews = new List(); viewHost.Stub(vm => vm.ToolViews).Return(toolViews); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(v => true), Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViews.Add(invocation.Arguments[0] as ProjectExplorer); }); + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))).WhenCalled(invocation => { toolViews.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); // Dispose - viewHost.Expect(tvc => tvc.Remove(Arg.Matches(v => true))); + viewHost.Expect(tvc => tvc.Remove(Arg.Is.NotNull)); guiStub.Expect(g => g.ProjectOpened += null).IgnoreArguments(); guiStub.Expect(g => g.ProjectOpened -= null).IgnoreArguments(); Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs =================================================================== diff -u -r650277f75faab8d29b4a07b738f0fd2a99ac7ed3 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs (.../ProjectExplorerViewControllerTest.cs) (revision 650277f75faab8d29b4a07b738f0fd2a99ac7ed3) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/ProjectExplorerViewControllerTest.cs (.../ProjectExplorerViewControllerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -68,7 +68,7 @@ var toolViewList = new List(); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); @@ -136,7 +136,7 @@ if (isOpen) { - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); @@ -172,7 +172,7 @@ var toolViewList = new List(); viewHost.Stub(vm => vm.ToolViews).Return(toolViewList); - viewHost.Expect(vm => vm.AddToolView(Arg.Matches(c => true), + viewHost.Expect(vm => vm.AddToolView(Arg.Is.NotNull, Arg.Matches(vl => vl == ToolViewLocation.Left))) .WhenCalled(invocation => { toolViewList.Add(invocation.Arguments[0] as ProjectExplorer); }); viewHost.Expect(vm => vm.SetImage(null, null)).IgnoreArguments(); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,8 @@ /// /// ViewModel of for properties panel. /// - public class ClosingStructuresInputContextProperties : StructuresInputBaseProperties, ClosingStructuresFailureMechanism>, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs =================================================================== diff -u -rcf9cd9f3225c44880a5e966117e0f2c09fc2d4b0 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision cf9cd9f3225c44880a5e966117e0f2c09fc2d4b0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresInputContextPropertiesTest.cs (.../ClosingStructuresInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -188,7 +188,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -239,7 +239,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -273,7 +273,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -306,7 +306,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -335,7 +335,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -366,7 +366,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -400,7 +400,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -429,7 +429,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -460,7 +460,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -494,7 +494,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, @@ -523,7 +523,7 @@ var failureMechanism = new ClosingStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + ClosingStructuresInput input = calculation.InputParameters; var inputContext = new ClosingStructuresInputContext(input, calculation, failureMechanism, Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -88,7 +88,7 @@ TestDelegate test = () => handler.PropertyChanged(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("failureMechanism", paramName); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/StructuresInputBasePropertiesTest.cs (.../StructuresInputBasePropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -189,8 +189,7 @@ // Assert IEnumerable expectedList = hydraulicBoundaryDatabase.Locations - .Select(hbl => - new SelectableHydraulicBoundaryLocation(hbl, null)) + .Select(hbl => new SelectableHydraulicBoundaryLocation(hbl, null)) .OrderBy(hbl => hbl.HydraulicBoundaryLocation.Id); CollectionAssert.AreEqual(expectedList, availableHydraulicBoundaryLocations); mockRepository.VerifyAll(); @@ -240,9 +239,9 @@ // Assert IEnumerable expectedList = hydraulicBoundaryDatabase.Locations - .Select(hbl => - new SelectableHydraulicBoundaryLocation( - hbl, calculation.InputParameters.Structure.Location)) + .Select(hbl => new SelectableHydraulicBoundaryLocation( + hbl, + calculation.InputParameters.Structure.Location)) .OrderBy(hbl => hbl.Distance) .ThenBy(hbl => hbl.HydraulicBoundaryLocation.Name); CollectionAssert.AreEqual(expectedList, availableHydraulicBoundaryLocations); @@ -299,8 +298,9 @@ IEnumerable expectedList = hydraulicBoundaryDatabase.Locations - .Select(hbl => - new SelectableHydraulicBoundaryLocation(hbl, properties.StructureLocation)) + .Select(hbl => new SelectableHydraulicBoundaryLocation( + hbl, + properties.StructureLocation)) .OrderBy(hbl => hbl.Distance) .ThenBy(hbl => hbl.HydraulicBoundaryLocation.Id); CollectionAssert.AreEqual(expectedList, availableHydraulicBoundaryLocations); @@ -533,10 +533,11 @@ const string modelSettingsCategory = "Modelinstellingen"; var dynamicPropertyBag = new DynamicPropertyBag(properties); - PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] - { - new BrowsableAttribute(true) - }); + PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties( + new Attribute[] + { + new BrowsableAttribute(true) + }); Assert.AreEqual(15, dynamicProperties.Count); PropertyDescriptor structureProperty = dynamicProperties[constructionProperties.StructurePropertyIndex]; @@ -654,24 +655,24 @@ var random = new Random(); var randomObjectLookup = new[] - { - structureObject, - structureLocationObject, - structureNormalOrientationObject, - flowWidthAtBottomProtectionObject, - widthFlowAperturesObject, - storageStructureAreaObject, - allowedLevelIncreaseStorageObject, - criticalOvertoppingDischargeObject, - failureProbabilityStructureWithErosionObject, - foreshoreProfileObject, - useBreakWaterObject, - useForeshoreObject, - modelFactorSuperCriticalFlowObject, - hydraulicBoundaryLocationObject, - stormDurationObject - }.OrderBy(p => random.Next()) - .ToList(); + { + structureObject, + structureLocationObject, + structureNormalOrientationObject, + flowWidthAtBottomProtectionObject, + widthFlowAperturesObject, + storageStructureAreaObject, + allowedLevelIncreaseStorageObject, + criticalOvertoppingDischargeObject, + failureProbabilityStructureWithErosionObject, + foreshoreProfileObject, + useBreakWaterObject, + useForeshoreObject, + modelFactorSuperCriticalFlowObject, + hydraulicBoundaryLocationObject, + stormDurationObject + }.OrderBy(p => random.Next()) + .ToList(); return new StructuresInputBaseProperties, IFailureMechanism>.ConstructionProperties { @@ -710,7 +711,11 @@ protected override void UpdateStructureParameters() {} } - private class SimpleStructuresInputProperties : StructuresInputBaseProperties, IFailureMechanism> + private class SimpleStructuresInputProperties : StructuresInputBaseProperties< + SimpleStructure, + SimpleStructureInput, + StructuresCalculation, + IFailureMechanism> { public SimpleStructuresInputProperties(ConstructionProperties constructionProperties) : base(constructionProperties) {} Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs (.../UseBreakWaterPropertiesTest.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/UseBreakWaterPropertiesTest.cs (.../UseBreakWaterPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -59,7 +59,7 @@ TestDelegate test = () => new UseBreakWaterProperties(null, null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("useBreakWaterData", paramName); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/TestCalculationTest.cs =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/TestCalculationTest.cs (.../TestCalculationTest.cs) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/TestCalculationTest.cs (.../TestCalculationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -7,7 +7,6 @@ [TestFixture] public class TestCalculationTest { - [Test] public void DefaultConstructor_PropertiesSet() { Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs =================================================================== diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs (.../HydraulicDatabaseHelperTest.cs) (revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraulicDatabaseHelperTest.cs (.../HydraulicDatabaseHelperTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -164,7 +164,7 @@ TestDelegate test = () => HydraulicDatabaseHelper.HaveEqualVersion(new HydraulicBoundaryDatabase(), null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("pathToDatabase", parameter); } @@ -178,7 +178,7 @@ TestDelegate test = () => HydraulicDatabaseHelper.HaveEqualVersion(null, validFilePath); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("database", parameter); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs (.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.ComponentModel; using Core.Common.Base; using Core.Common.Gui.Attributes; @@ -190,7 +191,7 @@ private void ClearOutputAndNotifyObservers() { - var changedObjects = propertyChangeHandler.PropertyChanged(data.WrappedData); + IEnumerable changedObjects = propertyChangeHandler.PropertyChanged(data.WrappedData); foreach (IObservable changedObject in changedObjects) { changedObject.NotifyObservers(); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Ringtoets.GrassCoverErosionInwards.Forms.csproj (.../Ringtoets.GrassCoverErosionInwards.Forms.csproj) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -161,6 +161,7 @@ {D951D6DA-FE83-4920-9FDB-63BF96480B54} Ringtoets.Common.Service + False {90DE728E-48EF-4665-AB38-3D88E41D9F4D} Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -11,13 +11,13 @@ public void DefaultConstructor_PropertiesSet() { // Call - var result = new TestGrassCoverErosionInwardsOutput(); + var output = new TestGrassCoverErosionInwardsOutput(); // Assert - Assert.AreEqual(0.0, result.WaveHeight.Value); - Assert.IsTrue(result.IsOvertoppingDominant); - Assert.IsInstanceOf(result.ProbabilityAssessmentOutput); - Assert.IsInstanceOf(result.DikeHeightAssessmentOutput); + Assert.AreEqual(0.0, output.WaveHeight.Value); + Assert.IsTrue(output.IsOvertoppingDominant); + Assert.IsInstanceOf(output.ProbabilityAssessmentOutput); + Assert.IsInstanceOf(output.DikeHeightAssessmentOutput); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs =================================================================== diff -u -rc4972d4aec336f991ac1b4ab3dcd56161c238516 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs (.../GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs) (revision c4972d4aec336f991ac1b4ab3dcd56161c238516) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs (.../GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -44,7 +44,7 @@ TestDelegate test = () => new GrassCoverErosionInwardsDikeProfileSelectionDialog(null, Enumerable.Empty()); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("dialogParent", parameter); } @@ -58,7 +58,7 @@ TestDelegate test = () => new GrassCoverErosionInwardsDikeProfileSelectionDialog(viewParent, null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("dikeProfiles", parameter); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -57,14 +57,14 @@ public void Constructor_DataIsNull_ThrowArgumentNullException() { // Setup - var handler = CreateSimpleHandler(); + IFailureMechanismPropertyChangeHandler handler = CreateSimpleHandler(); mockRepository.ReplayAll(); // Call TestDelegate test = () => new GrassCoverErosionInwardsFailureMechanismContextProperties(null, handler); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("data", paramName); mockRepository.VerifyAll(); } @@ -82,7 +82,7 @@ null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("handler", paramName); mockRepository.VerifyAll(); } @@ -92,15 +92,14 @@ { // Setup var assessmentSectionMock = mockRepository.StrictMock(); - var handler = CreateSimpleHandler(); + IFailureMechanismPropertyChangeHandler handler = CreateSimpleHandler(); mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties( new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock), - handler - ); + handler); // Assert Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, properties.Name); @@ -137,7 +136,7 @@ var changeHandler = mockRepository.StrictMock(); changeHandler.Expect(h => h.ConfirmPropertyChange()).Return(true); - changeHandler.Expect(h => h.PropertyChanged(Arg.Matches(z => true))).Return(new[] { observableMock }); + changeHandler.Expect(h => h.PropertyChanged(Arg.Is.NotNull)).Return(new[] { observableMock }); var assessmentSectionMock = mockRepository.StrictMock(); @@ -196,16 +195,15 @@ { // Setup var assessmentSectionMock = mockRepository.StrictMock(); - var handler = CreateSimpleHandler(); + IFailureMechanismPropertyChangeHandler handler = CreateSimpleHandler(); mockRepository.ReplayAll(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); // Call var properties = new GrassCoverErosionInwardsFailureMechanismContextProperties( new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock), - handler - ); + handler); // Assert var generalCategory = "Algemeen"; @@ -274,7 +272,7 @@ { var handler = mockRepository.Stub(); handler.Stub(h => h.ConfirmPropertyChange()).Return(true); - handler.Stub(h => h.PropertyChanged(Arg.Matches(z => true))).Return(Enumerable.Empty()); + handler.Stub(h => h.PropertyChanged(Arg.Is.NotNull)).Return(Enumerable.Empty()); return handler; } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -567,25 +567,28 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); + var calculationObserver = mocks.StrictMock(); - var inputObserver = mocks.StrictMock(); int numberOfChangedProperties = hasOutput ? 1 : 0; calculationObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); + + var inputObserver = mocks.StrictMock(); inputObserver.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); var calculation = new GrassCoverErosionInwardsCalculation(); if (hasOutput) { calculation.Output = new TestGrassCoverErosionInwardsOutput(); } - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + calculation.Attach(calculationObserver); GrassCoverErosionInwardsInput inputParameters = calculation.InputParameters; - calculation.Attach(calculationObserver); + inputParameters.DikeProfile = new TestDikeProfile(); inputParameters.Attach(inputObserver); - inputParameters.DikeProfile = new TestDikeProfile(); + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var properties = new GrassCoverErosionInwardsInputContextProperties { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -90,7 +90,7 @@ TestDelegate test = () => handler.PropertyChanged(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("failureMechanism", paramName); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -52,7 +52,7 @@ failureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation(); - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; // Call var context = new GrassCoverErosionOutwardsWaveConditionsInputContext( Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => new GrassCoverErosionOutwardsDesignWaterLevelLocationsContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("locations", paramName); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -57,7 +57,7 @@ TestDelegate test = () => new GrassCoverErosionOutwardsFailureMechanismProperties(null, changeHandler); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("failureMechanism", paramName); } @@ -68,7 +68,7 @@ TestDelegate test = () => new GrassCoverErosionOutwardsFailureMechanismProperties(new GrassCoverErosionOutwardsFailureMechanism(), null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("changeHandler", paramName); } @@ -112,7 +112,7 @@ var changeHandler = mockRepository.StrictMock(); changeHandler.Expect(h => h.ConfirmPropertyChange()).Return(true); - changeHandler.Expect(h => h.PropertyChanged(Arg.Matches(z => true))).Return(new[] { observableMock }); + changeHandler.Expect(h => h.PropertyChanged(Arg.Is.NotNull)).Return(new[] { observableMock }); mockRepository.ReplayAll(); @@ -227,7 +227,7 @@ { var handler = mockRepository.Stub(); handler.Stub(h => h.ConfirmPropertyChange()).Return(true); - handler.Stub(h => h.PropertyChanged(Arg.Matches(z => true))).Return(Enumerable.Empty()); + handler.Stub(h => h.PropertyChanged(Arg.Is.NotNull)).Return(Enumerable.Empty()); return handler; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("context", paramName); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => new GrassCoverErosionOutwardsWaveHeightLocationsContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("locations", paramName); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -202,7 +202,7 @@ { GeneralGrassCoverErosionOutwardsInput generalInput = assessmentSection.GrassCoverErosionOutwards.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -415,7 +415,7 @@ { GeneralGrassCoverErosionOutwardsInput generalInput = grassCoverErosionOutwardsFailureMechanism.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -37,7 +37,8 @@ /// /// ViewModel of for properties panel. /// - public class HeightStructuresInputContextProperties : StructuresInputBaseProperties, HeightStructuresFailureMechanism>, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs (.../DesignWaterLevelLocationsContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs (.../DesignWaterLevelLocationsContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => new DesignWaterLevelLocationsContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("database", paramName); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs =================================================================== diff -u -r1b04d8b730017db5c2a205203432f0b13f8d4192 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs (.../FailureMechanismContributionPropertiesTest.cs) (revision 1b04d8b730017db5c2a205203432f0b13f8d4192) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesTest.cs (.../FailureMechanismContributionPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -51,7 +51,7 @@ new AssessmentSectionCompositionChangeHandler()); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("failureMechanismContribution", paramName); } @@ -66,7 +66,7 @@ new AssessmentSectionCompositionChangeHandler()); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("assessmentSection", paramName); } @@ -84,7 +84,7 @@ new AssessmentSectionCompositionChangeHandler()); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("normChangeHandler", paramName); } @@ -102,7 +102,7 @@ null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("compositionChangeHandler", paramName); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsContextPropertiesTest.cs (.../WaveHeightLocationsContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsContextPropertiesTest.cs (.../WaveHeightLocationsContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,7 @@ TestDelegate test = () => new WaveHeightLocationsContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("database", paramName); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ReferenceLineMetaSelectionDialogTest.cs =================================================================== diff -u -r9df46b0d410ec7b0033102c0f518078cebbdb11f -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ReferenceLineMetaSelectionDialogTest.cs (.../ReferenceLineMetaSelectionDialogTest.cs) (revision 9df46b0d410ec7b0033102c0f518078cebbdb11f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ReferenceLineMetaSelectionDialogTest.cs (.../ReferenceLineMetaSelectionDialogTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -46,7 +46,7 @@ TestDelegate test = () => new ReferenceLineMetaSelectionDialog(null, Enumerable.Empty()); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("dialogParent", parameter); } @@ -60,7 +60,7 @@ TestDelegate test = () => new ReferenceLineMetaSelectionDialog(viewParent, null); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("referenceLineMetas", parameter); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -37,7 +37,7 @@ TestDelegate test = () => new PipingOutput(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("constructionProperties", paramName); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -39,7 +39,7 @@ TestDelegate test = () => new PipingOutputContext(null, new TestPipingSemiProbabilisticOutput()); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("wrappedData", paramName); } @@ -50,7 +50,7 @@ TestDelegate test = () => new PipingOutputContext(new TestPipingOutput(), null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("semiProbabilisticOutput", paramName); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs =================================================================== diff -u -r816744aa249d90e7460b9c2844292b2e0cf13669 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 816744aa249d90e7460b9c2844292b2e0cf13669) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs (.../PipingFailureMechanismContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -52,7 +52,7 @@ TestDelegate test = () => new PipingFailureMechanismContextProperties(null, handler); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("data", paramName); mocks.VerifyAll(); } @@ -71,7 +71,7 @@ null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("handler", paramName); mocks.VerifyAll(); } @@ -300,7 +300,7 @@ var handler = mocks.Stub(); handler.Expect(h => h.ConfirmPropertyChange()).Return(true); - handler.Expect(h => h.PropertyChanged(Arg.Matches(z => true))).Return(new [] { observableMock }); + handler.Expect(h => h.PropertyChanged(Arg.Is.NotNull)).Return(new [] { observableMock }); var assessmentSection = mocks.Stub(); @@ -413,7 +413,7 @@ { var handler = mockRepository.Stub(); handler.Stub(h => h.ConfirmPropertyChange()).Return(true); - handler.Stub(h => h.PropertyChanged(Arg.Matches(z => true))).Return(Enumerable.Empty()); + handler.Stub(h => h.PropertyChanged(Arg.Is.NotNull)).Return(Enumerable.Empty()); return handler; } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs =================================================================== diff -u -r139f1c2f826579b27dbea3a98a21dfb6797a8eb0 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision 139f1c2f826579b27dbea3a98a21dfb6797a8eb0) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -35,7 +35,7 @@ TestDelegate test = () => new PipingCalculatorInput(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("properties", paramName); } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -34,7 +34,7 @@ TestDelegate test = () => new PipingCalculatorResult(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("constructionProperties", paramName); } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs =================================================================== diff -u -rbb80820ff4a4e09793da242cb7b36ca2bce59c32 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs (.../WaveConditionsInputContext.cs) (revision bb80820ff4a4e09793da242cb7b36ca2bce59c32) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs (.../WaveConditionsInputContext.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -50,6 +50,9 @@ Calculation = calculation; } + /// + /// Gets the calculation containing the wrapped . + /// public ICalculation Calculation { get; private set; } /// Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs (.../WaveConditionsInputStepSizeExtensionsTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeExtensionsTest.cs (.../WaveConditionsInputStepSizeExtensionsTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -47,7 +47,7 @@ TestDelegate test = () => ((WaveConditionsInputStepSize) 4).AsValue(); // Assert - var parameter = Assert.Throws(test).ParamName; + string parameter = Assert.Throws(test).ParamName; Assert.AreEqual("stepSize", parameter); } } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -32,7 +32,6 @@ using Core.Common.Utils; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; @@ -74,7 +73,7 @@ TestDelegate test = () => new TestWaveConditionsInputContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("context", paramName); } @@ -300,71 +299,6 @@ } [Test] - public void SetProperties_IndividualProperties_UpdateDataAndNotifyObservers() - { - // Setup - var mockRepository = new MockRepository(); - var observerMock = mockRepository.StrictMock(); - const int numberOfChangedProperties = 8; - observerMock.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); - mockRepository.ReplayAll(); - - var random = new Random(21); - var orientation = (RoundedDouble) random.NextDouble(); - var assessmentLevel = (RoundedDouble) random.NextDouble(); - var newLowerBoundaryRevetment = (RoundedDouble) random.NextDouble(); - var newLowerBoundaryWaterLevels = (RoundedDouble) random.NextDouble(); - var newUpperBoundaryRevetment = newLowerBoundaryRevetment + (RoundedDouble) random.NextDouble(); - var newUpperBoundaryWaterLevels = newLowerBoundaryWaterLevels + (RoundedDouble) random.NextDouble(); - var newStepSize = WaveConditionsInputStepSize.Half; - - var hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(assessmentLevel); - var selectableHydraulicBoundaryLocation = new SelectableHydraulicBoundaryLocation(hydraulicBoundaryLocation, null); - - var input = new WaveConditionsInput(); - input.Attach(observerMock); - var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]); - - var newForeshoreProfile = new ForeshoreProfile( - new Point2D( - (RoundedDouble) random.NextDouble(), - (RoundedDouble) random.NextDouble()), - Enumerable.Empty(), - new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), - new ForeshoreProfile.ConstructionProperties()); - - var properties = new TestWaveConditionsInputContextProperties(inputContext); - - // Call - properties.ForeshoreProfile = newForeshoreProfile; - properties.UpperBoundaryRevetment = newUpperBoundaryRevetment; - properties.LowerBoundaryRevetment = newLowerBoundaryRevetment; - properties.UpperBoundaryWaterLevels = newUpperBoundaryWaterLevels; - properties.LowerBoundaryWaterLevels = newLowerBoundaryWaterLevels; - properties.StepSize = newStepSize; - properties.SelectedHydraulicBoundaryLocation = selectableHydraulicBoundaryLocation; - properties.Orientation = orientation; - - // Assert - Assert.AreSame(input.HydraulicBoundaryLocation, properties.SelectedHydraulicBoundaryLocation.HydraulicBoundaryLocation); - Assert.AreEqual(input.HydraulicBoundaryLocation.DesignWaterLevel.Value, properties.AssessmentLevel.Value); - Assert.AreEqual(assessmentLevel - 0.01, properties.UpperBoundaryDesignWaterLevel.Value, properties.UpperBoundaryDesignWaterLevel.GetAccuracy()); - Assert.AreEqual(2, properties.UpperBoundaryDesignWaterLevel.NumberOfDecimalPlaces); - Assert.AreEqual(newUpperBoundaryRevetment.Value, properties.UpperBoundaryRevetment.Value, properties.UpperBoundaryRevetment.GetAccuracy()); - Assert.AreEqual(2, properties.UpperBoundaryRevetment.NumberOfDecimalPlaces); - Assert.AreEqual(newLowerBoundaryRevetment.Value, properties.LowerBoundaryRevetment.Value, properties.LowerBoundaryRevetment.GetAccuracy()); - Assert.AreEqual(2, properties.LowerBoundaryRevetment.NumberOfDecimalPlaces); - Assert.AreEqual(newUpperBoundaryWaterLevels.Value, properties.UpperBoundaryWaterLevels.Value, properties.UpperBoundaryWaterLevels.GetAccuracy()); - Assert.AreEqual(2, properties.UpperBoundaryWaterLevels.NumberOfDecimalPlaces); - Assert.AreEqual(newLowerBoundaryWaterLevels.Value, properties.LowerBoundaryWaterLevels.Value, properties.LowerBoundaryWaterLevels.GetAccuracy()); - Assert.AreEqual(2, properties.LowerBoundaryWaterLevels.NumberOfDecimalPlaces); - Assert.AreEqual(orientation, properties.Orientation.Value, properties.Orientation.GetAccuracy()); - Assert.AreEqual(2, properties.Orientation.NumberOfDecimalPlaces); - Assert.AreEqual(newStepSize, properties.StepSize); - mockRepository.VerifyAll(); - } - - [Test] [TestCase(true)] [TestCase(false)] public void SelectedHydraulicBoundaryLocation_WithOrWithoutOutput_HasOutputFalseInputNotifiedAndCalculationNotifiedWhenHadOutput(bool hasOutput) @@ -574,11 +508,14 @@ { // Setup var mocks = new MockRepository(); + var calculationObserver = mocks.StrictMock(); - var inputObserver = mocks.StrictMock(); int numberOfChangedProperties = hasOutput ? 1 : 0; calculationObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); + + var inputObserver = mocks.StrictMock(); inputObserver.Expect(o => o.UpdateObserver()); + mocks.ReplayAll(); var calculation = new TestCalculation(); @@ -587,9 +524,9 @@ { calculation.Output = new object(); } + calculation.Attach(calculationObserver); var input = new WaveConditionsInput(); - calculation.Attach(calculationObserver); input.Attach(inputObserver); var properties = new TestWaveConditionsInputContextProperties( @@ -617,8 +554,8 @@ IEnumerable locations) : base(wrappedData, calculation) { - this.ForeshoreProfiles = foreshoreProfiles; - this.HydraulicBoundaryLocations = locations; + ForeshoreProfiles = foreshoreProfiles; + HydraulicBoundaryLocations = locations; } public override IEnumerable HydraulicBoundaryLocations { get; } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs =================================================================== diff -u -r68953cc654409e65478d6aa4fb8c1cf44b116d9d -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 68953cc654409e65478d6aa4fb8c1cf44b116d9d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -42,7 +42,8 @@ /// /// ViewModel of for properties panel. /// - public class StabilityPointStructuresInputContextProperties : StructuresInputBaseProperties, StabilityPointStructuresFailureMechanism>, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs =================================================================== diff -u -r44ce84b25d7dfc4a0b7057443a7439af3cafb8bb -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 44ce84b25d7dfc4a0b7057443a7439af3cafb8bb) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -199,7 +199,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -259,7 +259,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -293,7 +293,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -322,7 +322,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -353,7 +353,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -387,7 +387,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, @@ -416,7 +416,7 @@ var failureMechanism = new StabilityPointStructuresFailureMechanism(); var calculation = new StructuresCalculation(); - var input = calculation.InputParameters; + StabilityPointStructuresInput input = calculation.InputParameters; var inputContext = new StabilityPointStructuresInputContext(input, calculation, failureMechanism, Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => new StabilityStoneCoverWaveConditionsInputContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("context", paramName); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -167,7 +167,7 @@ GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -444,7 +444,7 @@ GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision c48f16746209f799f93c6fc79a5202a9e3fd419f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -43,7 +43,7 @@ TestDelegate test = () => new WaveImpactAsphaltCoverWaveConditionsInputContextProperties(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("context", paramName); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -159,7 +159,7 @@ { GeneralWaveConditionsInput generalInput = assessmentSection.WaveImpactAsphaltCover.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id, Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r545b105a213ed85564861b4bcf6d2d6425dbde50 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) @@ -407,7 +407,7 @@ { GeneralWaveConditionsInput generalInput = waveImpactAsphaltCoverFailureMechanism.GeneralInput; - var input = calculation.InputParameters; + WaveConditionsInput input = calculation.InputParameters; var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, input.HydraulicBoundaryLocation.Id,