Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLinesCsvImporterTest.cs (.../PipingSurfaceLinesCsvImporterTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -34,6 +34,7 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Plugin.FileImporter; +using Ringtoets.Piping.Primitives; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; using PipingIOResources = Ringtoets.Piping.IO.Properties.Resources; using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; @@ -76,15 +77,16 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var targetContext = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); var importer = new PipingSurfaceLinesCsvImporter(); // Call - var canImport = importer.CanImportOn(targetContext); + bool canImport = importer.CanImportOn(targetContext); // Assert Assert.IsTrue(canImport); @@ -98,15 +100,16 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = null; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var targetContext = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); var importer = new PipingSurfaceLinesCsvImporter(); // Call - var canImport = importer.CanImportOn(targetContext); + bool canImport = importer.CanImportOn(targetContext); // Assert Assert.IsFalse(canImport); @@ -122,9 +125,10 @@ var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); var importer = new PipingSurfaceLinesCsvImporter(); @@ -149,9 +153,6 @@ var twovalidsurfacelinesCsv = "TwoValidSurfaceLines.csv"; string validFilePath = Path.Combine(ioTestDataPath, twovalidsurfacelinesCsv); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -160,10 +161,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -208,21 +214,21 @@ Assert.IsTrue(File.Exists(validFilePath)); // Call - var importResult = importer.Import(context, validFilePath); + bool importResult = importer.Import(context, validFilePath); // Assert Assert.IsTrue(importResult); var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.AreEqual(expectedNumberOfSurfaceLines, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("Rotterdam1", firstSurfaceLine.Name); Assert.AreEqual(8, firstSurfaceLine.Points.Length); Assert.AreEqual(427776.654093, firstSurfaceLine.StartingWorldPoint.Y); AssertAreEqualPoint2D(new Point2D(94270.0, 427795.313769642), firstSurfaceLine.ReferenceLineIntersectionWorldPoint); - var secondSurfaceLine = importTargetArray[1]; + RingtoetsPipingSurfaceLine secondSurfaceLine = importTargetArray[1]; Assert.AreEqual("ArtifcialLocal", secondSurfaceLine.Name); Assert.AreEqual(3, secondSurfaceLine.Points.Length); Assert.AreEqual(5.7, secondSurfaceLine.EndingWorldPoint.X); @@ -242,20 +248,21 @@ var twovalidsurfacelinesCsv = "ValidSurfaceLine_HasConsecutiveDuplicatePoints.csv"; string validFilePath = Path.Combine(ioTestDataPath, twovalidsurfacelinesCsv); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { new Point2D(94270, 427700), new Point2D(94270, 427850) }); - assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); + assessmentSection.ReferenceLine = referenceLine; mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -266,7 +273,7 @@ Assert.IsTrue(File.Exists(validFilePath)); // Call - var importResult = false; + bool importResult = false; Action call = () => importResult = importer.Import(context, validFilePath); // Assert @@ -289,7 +296,7 @@ Assert.AreEqual(1, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("Rotterdam1", firstSurfaceLine.Name); var geometryPoints = firstSurfaceLine.Points.ToArray(); Assert.AreEqual(8, geometryPoints.Length); @@ -316,9 +323,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -330,7 +338,7 @@ importer.Cancel(); - var importResult = true; + bool importResult = true; // Call Action call = () => importResult = importer.Import(context, validFilePath); @@ -350,9 +358,6 @@ const int expectedNumberOfSurfaceLines = 2; string validFilePath = Path.Combine(ioTestDataPath, "TwoValidSurfaceLines.csv"); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -361,10 +366,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -384,7 +394,7 @@ // Assert Assert.IsTrue(importResult); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.AreEqual(expectedNumberOfSurfaceLines, importTargetArray.Length); mocks.VerifyAll(); } @@ -400,22 +410,23 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); var importer = new PipingSurfaceLinesCsvImporter(); - var importResult = true; + bool importResult = true; // Call Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, - string.Join(", ", Path.GetInvalidFileNameChars()))); + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, + string.Join(", ", Path.GetInvalidFileNameChars()))); var expectedLogMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CriticalErrorMessage_0_File_Skipped, internalErrorMessage); TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage, 1); @@ -435,9 +446,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -449,7 +461,7 @@ Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(UtilsResources.Error_File_does_not_exist); + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(UtilsResources.Error_File_does_not_exist); var expectedLogMessages = new[] { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, @@ -476,9 +488,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -490,7 +503,7 @@ Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(UtilsResources.Error_File_empty); var expectedLogMessages = new[] @@ -519,21 +532,22 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); var importer = new PipingSurfaceLinesCsvImporter(); - var importResult = true; + bool importResult = true; // Call Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_File_invalid_header); var expectedLogMessages = new[] @@ -566,17 +580,20 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); - var importer = new PipingSurfaceLinesCsvImporter(); - importer.ProgressChanged = (name, step, steps) => + var importer = new PipingSurfaceLinesCsvImporter { - // Delete the file being read by the import during the import itself: - File.Delete(copyTargetPath); + ProgressChanged = (name, step, steps) => + { + // Delete the file being read by the import during the import itself: + File.Delete(copyTargetPath); + } }; var importResult = true; @@ -585,7 +602,7 @@ Action call = () => importResult = importer.Import(context, copyTargetPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(copyTargetPath).Build(UtilsResources.Error_File_does_not_exist); + string internalErrorMessage = new FileReaderErrorMessageBuilder(copyTargetPath).Build(UtilsResources.Error_File_does_not_exist); var expectedLogMessages = new[] { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, @@ -619,19 +636,20 @@ string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string expectedCharacteristicPointsFile = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { new Point2D(94270, 427700), new Point2D(94270, 427900) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; + mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); - mocks.ReplayAll(); var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -644,7 +662,8 @@ Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_location_0_, "Rotterdam1"); + string duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_location_0_, + "Rotterdam1"); var expectedLogMessages = new[] { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, @@ -673,9 +692,6 @@ // Setup string corruptPath = Path.Combine(ioTestDataPath, "TwoValidAndOneInvalidNumberRowSurfaceLines.csv"); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -684,10 +700,15 @@ new Point2D(9.8, -1), new Point2D(9.8, 1) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -701,7 +722,7 @@ Action call = () => importResult = importer.Import(context, corruptPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 3") .WithSubject("profielschematisatie 'InvalidRow'") .Build(PipingIOResources.Error_SurfaceLine_has_not_double); @@ -752,9 +773,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -769,7 +791,7 @@ Action call = () => importResult = importer.Import(context, path); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(path) + string internalErrorMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'Rotterdam1'") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_reclining_geometry); @@ -788,7 +810,7 @@ }; TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, 6); Assert.IsTrue(importResult); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.AreEqual(0, importTargetArray.Length); Assert.IsTrue(TestHelper.CanOpenFileForWrite(path)); @@ -807,9 +829,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -824,7 +847,7 @@ Action call = () => importResult = importer.Import(context, path); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(path) + string internalErrorMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'Rotterdam1'") .Build(PipingIOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_zero_length); @@ -861,9 +884,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -896,9 +920,6 @@ string surfaceLinesFile = Path.Combine(ioTestDataPath, string.Format(surfaceLineFormat, fileName)); string nonExistingCharacteristicFile = Path.Combine(ioTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -907,10 +928,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -946,9 +972,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -960,7 +987,7 @@ Action call = () => importResult = importer.Import(context, surfaceLinesFile); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(UtilsResources.Error_File_empty); @@ -996,9 +1023,10 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1010,7 +1038,7 @@ Action call = () => importResult = importer.Import(context, surfaceLinesFile); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 1") .Build(PipingIOResources.CharacteristicPointsCsvReader_File_invalid_header); @@ -1055,20 +1083,23 @@ var observer = mocks.StrictMock(); var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = new ReferenceLine(); - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); - var importer = new PipingSurfaceLinesCsvImporter(); - importer.ProgressChanged = (name, step, steps) => + var importer = new PipingSurfaceLinesCsvImporter { - // Delete the file being read by the import during the import itself: - if (name == string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Read_PipingCharacteristicPoints_0_, - copyCharacteristicPointsTargetPath)) + ProgressChanged = (name, step, steps) => { - File.Delete(copyCharacteristicPointsTargetPath); + // Delete the file being read by the import during the import itself: + if (name == string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_Read_PipingCharacteristicPoints_0_, + copyCharacteristicPointsTargetPath)) + { + File.Delete(copyCharacteristicPointsTargetPath); + } } }; @@ -1078,7 +1109,7 @@ Action call = () => importResult = importer.Import(context, copyTargetPath); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(copyCharacteristicPointsTargetPath).Build(UtilsResources.Error_File_does_not_exist); + string internalErrorMessage = new FileReaderErrorMessageBuilder(copyCharacteristicPointsTargetPath).Build(UtilsResources.Error_File_does_not_exist); var expectedLogMessages = new[] { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, @@ -1121,9 +1152,6 @@ string surfaceLinesFile = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1132,10 +1160,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1147,8 +1180,8 @@ Action call = () => importResult = importer.Import(context, surfaceLinesFile); // Assert - var duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_characteristic_point_location_0_, - "Rotterdam1"); + string duplicateDefinitionMessage = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_AddImportedDataToModel_Duplicate_definitions_for_same_characteristic_point_location_0_, + "Rotterdam1"); var expectedLogMessages = new[] { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, @@ -1182,9 +1215,6 @@ string surfaceLinesFile = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1193,10 +1223,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1210,7 +1245,7 @@ Action call = () => importResult = importer.Import(context, surfaceLinesFile); // Assert - var internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) + string internalErrorMessage = new FileReaderErrorMessageBuilder(corruptPath) .WithLocation("op regel 2") .WithSubject("locatie 'Rotterdam1Invalid'") .Build(PipingIOResources.Error_CharacteristicPoint_has_not_double); @@ -1262,9 +1297,6 @@ string surfaceLinesPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1273,10 +1305,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1290,7 +1327,7 @@ Action call = () => importResult = importer.Import(context, surfaceLinesPath); // Assert - var expectedLogMessages = new[] + string[] expectedLogMessages = { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, surfaceLinesPath), @@ -1336,9 +1373,6 @@ string surfaceLinesPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1347,10 +1381,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1364,7 +1403,7 @@ Action call = () => importResult = importer.Import(context, surfaceLinesPath); // Assert - var expectedLogMessages = new[] + string[] expectedLogMessages = { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, surfaceLinesPath), @@ -1415,9 +1454,6 @@ string surfaceLinesPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); string corruptPath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(krpFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1426,10 +1462,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1446,7 +1487,7 @@ var pointFormat = string.Format(PipingDataResources.RingtoetsPipingSurfaceLine_SetCharacteristicPointAt_Geometry_does_not_contain_point_at_0_to_assign_as_characteristic_point_1_, new Point3D(0, 1, 2), characteristicPointName); - var expectedLogMessages = new[] + string[] expectedLogMessages = { string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_ReadSurfaceLines_Start_reading_surface_lines_from_File_0_, surfaceLinesPath), @@ -1499,9 +1540,6 @@ string validSurfaceLinesFilePath = Path.Combine(pluginSurfaceLinesTestDataPath, twovalidsurfacelinesCsv); string validCharacteristicPointsFilePath = Path.Combine(pluginSurfaceLinesTestDataPath, twovalidsurfacelinesCsv); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1510,10 +1548,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1563,15 +1606,15 @@ Assert.IsTrue(File.Exists(validCharacteristicPointsFilePath)); // Call - var importResult = importer.Import(context, validSurfaceLinesFilePath); + bool importResult = importer.Import(context, validSurfaceLinesFilePath); // Assert Assert.IsTrue(importResult); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.AreEqual(expectedNumberOfSurfaceLines, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("Rotterdam1", firstSurfaceLine.Name); Assert.AreEqual(8, firstSurfaceLine.Points.Length); Assert.AreEqual(427776.654093, firstSurfaceLine.StartingWorldPoint.Y); @@ -1582,7 +1625,7 @@ Assert.AreEqual(new Point3D(94284.0663827, 427831.918156, 1.25), firstSurfaceLine.DikeToeAtRiver); Assert.AreEqual(new Point3D(94305.3566362, 427889.900123, 1.65), firstSurfaceLine.DikeToeAtPolder); - var secondSurfaceLine = importTargetArray[1]; + RingtoetsPipingSurfaceLine secondSurfaceLine = importTargetArray[1]; Assert.AreEqual("ArtifcialLocal", secondSurfaceLine.Name); Assert.AreEqual(3, secondSurfaceLine.Points.Length); Assert.AreEqual(5.7, secondSurfaceLine.EndingWorldPoint.X); @@ -1609,19 +1652,21 @@ var twovalidsurfacelinesCsv = "TwoValidSurfaceLines.csv"; string validFilePath = Path.Combine(ioTestDataPath, twovalidsurfacelinesCsv); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1638,12 +1683,12 @@ // Assert var mesagge = "Profielschematisatie ArtifcialLocal doorkruist de huidige referentielijn niet of op meer dan 1 punt en kan niet worden geïmporteerd. Dit kan komen doordat de profielschematisatie een lokaal coördinaatsysteem heeft."; TestHelper.AssertLogMessageIsGenerated(call, mesagge); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.IsTrue(importResult); Assert.AreEqual(expectedNumberOfSurfaceLines, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("Rotterdam1", firstSurfaceLine.Name); Assert.AreEqual(8, firstSurfaceLine.Points.Length); Assert.AreEqual(427776.654093, firstSurfaceLine.StartingWorldPoint.Y); @@ -1661,9 +1706,6 @@ var twovalidsurfacelinesCsv = "TwoValidSurfaceLines.csv"; string validFilePath = Path.Combine(ioTestDataPath, twovalidsurfacelinesCsv); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1674,10 +1716,15 @@ new Point2D(94271, 427776), new Point2D(94271, 427813) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1694,12 +1741,12 @@ // Assert var mesagge = "Profielschematisatie Rotterdam1 doorkruist de huidige referentielijn niet of op meer dan 1 punt en kan niet worden geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, mesagge); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.IsTrue(importResult); Assert.AreEqual(expectedNumberOfSurfaceLines, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("ArtifcialLocal", firstSurfaceLine.Name); Assert.AreEqual(3, firstSurfaceLine.Points.Length); Assert.AreEqual(0.0, firstSurfaceLine.StartingWorldPoint.Y); @@ -1717,9 +1764,6 @@ // Setup string validFilePath = Path.Combine(pluginSurfaceLinesTestDataPath, string.Format(surfaceLineFormat, fileName)); - var mocks = new MockRepository(); - var observer = mocks.StrictMock(); - var assessmentSection = mocks.Stub(); var referenceLine = new ReferenceLine(); referenceLine.SetGeometry(new[] { @@ -1728,10 +1772,15 @@ new Point2D(94270, 427775.65), new Point2D(94270, 427812.08) }); + + var mocks = new MockRepository(); + var observer = mocks.StrictMock(); + var assessmentSection = mocks.Stub(); assessmentSection.ReferenceLine = referenceLine; - var failureMechanism = new PipingFailureMechanism(); mocks.ReplayAll(); + var failureMechanism = new PipingFailureMechanism(); + var context = new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection); context.Attach(observer); @@ -1746,15 +1795,16 @@ Action call = () => importResult = importer.Import(context, validFilePath); // Assert - var message = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CheckCharacteristicPoints_EntryPointL_greater_or_equal_to_ExitPointL_for_0_, "ArtifcialLocal"); + var message = string.Format(PipingPluginResources.PipingSurfaceLinesCsvImporter_CheckCharacteristicPoints_EntryPointL_greater_or_equal_to_ExitPointL_for_0_, + "ArtifcialLocal"); TestHelper.AssertLogMessageIsGenerated(call, message); Assert.IsTrue(importResult); - var importTargetArray = context.WrappedData.SurfaceLines.ToArray(); + RingtoetsPipingSurfaceLine[] importTargetArray = context.WrappedData.SurfaceLines.ToArray(); Assert.AreEqual(1, importTargetArray.Length); // Sample some of the imported data: - var firstSurfaceLine = importTargetArray[0]; + RingtoetsPipingSurfaceLine firstSurfaceLine = importTargetArray[0]; Assert.AreEqual("Rotterdam1", firstSurfaceLine.Name); Assert.AreEqual(8, firstSurfaceLine.Points.Length); Assert.AreEqual(427776.654093, firstSurfaceLine.StartingWorldPoint.Y); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineExtensionsTest.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineExtensionsTest.cs (.../RingtoetsPipingSurfaceLineExtensionsTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/RingtoetsPipingSurfaceLineExtensionsTest.cs (.../RingtoetsPipingSurfaceLineExtensionsTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; +using Ringtoets.Piping.Data.Properties; using Ringtoets.Piping.Plugin.FileImporter; using Ringtoets.Piping.Primitives; @@ -38,11 +39,11 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetDitchPolderSide(null); + bool result = surfaceLine.TrySetDitchPolderSide(null); // Assert Assert.IsFalse(result); - } + } [Test] public void TrySetDitchPolderSide_NoPointInGeometry_LogAndReturnFalse() @@ -55,17 +56,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetDitchPolderSide(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetDitchPolderSide(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_DitchPolderSide); + testPoint, Resources.CharacteristicPoint_DitchPolderSide); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -82,10 +80,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new [] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetDitchPolderSide(point); + bool result = surfaceLine.TrySetDitchPolderSide(point); // Assert Assert.IsTrue(result); @@ -99,7 +100,7 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetBottomDitchDikeSide(null); + bool result = surfaceLine.TrySetBottomDitchDikeSide(null); // Assert Assert.IsFalse(result); @@ -116,17 +117,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetBottomDitchDikeSide(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetBottomDitchDikeSide(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_BottomDitchDikeSide); + testPoint, Resources.CharacteristicPoint_BottomDitchDikeSide); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -143,10 +141,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new[] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetBottomDitchDikeSide(point); + bool result = surfaceLine.TrySetBottomDitchDikeSide(point); // Assert Assert.IsTrue(result); @@ -160,7 +161,7 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetBottomDitchPolderSide(null); + bool result = surfaceLine.TrySetBottomDitchPolderSide(null); // Assert Assert.IsFalse(result); @@ -177,17 +178,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetBottomDitchPolderSide(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetBottomDitchPolderSide(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_BottomDitchPolderSide); + testPoint, Resources.CharacteristicPoint_BottomDitchPolderSide); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -204,10 +202,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new[] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetBottomDitchPolderSide(point); + bool result = surfaceLine.TrySetBottomDitchPolderSide(point); // Assert Assert.IsTrue(result); @@ -221,7 +222,7 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetDitchDikeSide(null); + bool result = surfaceLine.TrySetDitchDikeSide(null); // Assert Assert.IsFalse(result); @@ -238,17 +239,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetDitchDikeSide(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetDitchDikeSide(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_DitchDikeSide); + testPoint, Resources.CharacteristicPoint_DitchDikeSide); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -265,10 +263,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new[] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetDitchDikeSide(point); + bool result = surfaceLine.TrySetDitchDikeSide(point); // Assert Assert.IsTrue(result); @@ -282,7 +283,7 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetDikeToeAtPolder(null); + bool result = surfaceLine.TrySetDikeToeAtPolder(null); // Assert Assert.IsFalse(result); @@ -299,17 +300,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetDikeToeAtPolder(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetDikeToeAtPolder(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_DikeToeAtPolder); + testPoint, Resources.CharacteristicPoint_DikeToeAtPolder); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -326,10 +324,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new[] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetDikeToeAtPolder(point); + bool result = surfaceLine.TrySetDikeToeAtPolder(point); // Assert Assert.IsTrue(result); @@ -343,7 +344,7 @@ var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call - var result = surfaceLine.TrySetDikeToeAtRiver(null); + bool result = surfaceLine.TrySetDikeToeAtRiver(null); // Assert Assert.IsFalse(result); @@ -360,17 +361,14 @@ Name = "testName" }; - var result = true; + bool result = true; // Call - Action test = () => - { - result = surfaceLine.TrySetDikeToeAtRiver(testPoint); - }; + Action test = () => { result = surfaceLine.TrySetDikeToeAtRiver(testPoint); }; // Assert var message = string.Format("Karakteristiek punt van profielschematisatie 'testName' is overgeslagen. De geometrie bevat geen punt op locatie {0} om als '{1}' in te stellen.", - testPoint, Data.Properties.Resources.CharacteristicPoint_DikeToeAtRiver); + testPoint, Resources.CharacteristicPoint_DikeToeAtRiver); TestHelper.AssertLogMessageIsGenerated(test, message, 1); Assert.IsFalse(result); } @@ -387,10 +385,13 @@ var point = new Point3D(x, y, z); - surfaceLine.SetGeometry(new[] { point }); + surfaceLine.SetGeometry(new[] + { + point + }); // Call - var result = surfaceLine.TrySetDikeToeAtRiver(point); + bool result = surfaceLine.TrySetDikeToeAtRiver(point); // Assert Assert.IsTrue(result); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -19,7 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; +using System.Drawing; using System.Linq; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; @@ -71,10 +73,9 @@ // Setup var failureMechanism = new PipingFailureMechanism(); var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism); - mocks.ReplayAll(); // Call - var viewData = info.GetViewData(context); + object viewData = info.GetViewData(context); // Assert Assert.AreSame(failureMechanism.SectionResults, viewData); @@ -85,22 +86,21 @@ { // Setup var failureMechanism = new PipingFailureMechanism(); - var viewMock = mocks.StrictMock(); + using (var view = new PipingFailureMechanismResultView()) + { + // Call + string viewName = info.GetViewName(view, failureMechanism.SectionResults); - mocks.ReplayAll(); - - // Call - var viewName = info.GetViewName(viewMock, failureMechanism.SectionResults); - - // Assert - Assert.AreEqual("Resultaat", viewName); + // Assert + Assert.AreEqual("Resultaat", viewName); + } } [Test] public void ViewType_Always_ReturnsViewType() { // Call - var viewType = info.ViewType; + Type viewType = info.ViewType; // Assert Assert.AreEqual(typeof(PipingFailureMechanismResultView), viewType); @@ -110,7 +110,7 @@ public void DataType_Always_ReturnsDataType() { // Call - var dataType = info.DataType; + Type dataType = info.DataType; // Assert Assert.AreEqual(typeof(FailureMechanismSectionResultContext), dataType); @@ -120,7 +120,7 @@ public void ViewDataType_Always_ReturnsViewDataType() { // Call - var viewDataType = info.ViewDataType; + Type viewDataType = info.ViewDataType; // Assert Assert.AreEqual(typeof(IEnumerable), viewDataType); @@ -130,7 +130,7 @@ public void Image_Always_ReturnsGenericInputOutputIcon() { // Call - var image = info.Image; + Image image = info.Image; // Assert TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, image); @@ -140,55 +140,61 @@ public void CloseForData_AssessmentSectionRemovedWithoutFailureMechanism_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var failureMechanism = new PipingFailureMechanism(); - - viewMock.Expect(vm => vm.Data).Return(failureMechanism.SectionResults); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); - mocks.ReplayAll(); - // Call - var closeForData = info.CloseForData(viewMock, assessmentSectionMock); + var failureMechanism = new PipingFailureMechanism(); - // Assert - Assert.IsFalse(closeForData); + using (var view = new PipingFailureMechanismResultView + { + Data = failureMechanism.SectionResults + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); + + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); var failureMechanismMock = mocks.Stub("N", "C"); - var failureMechanism = new PipingFailureMechanism(); - viewMock.Expect(vm => vm.Data).Return(failureMechanism.SectionResults); + var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[] { failureMechanismMock }); mocks.ReplayAll(); - // Call - var closeForData = info.CloseForData(viewMock, assessmentSectionMock); + var failureMechanism = new PipingFailureMechanism(); - // Assert - Assert.IsFalse(closeForData); + using (var view = new PipingFailureMechanismResultView + { + Data = failureMechanism.SectionResults + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); + + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); - viewMock.Expect(vm => vm.Data).Return(failureMechanism.SectionResults); + var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[] { new TestFailureMechanism(), @@ -197,45 +203,54 @@ mocks.ReplayAll(); - // Call - var closeForData = info.CloseForData(viewMock, assessmentSectionMock); + using (var view = new PipingFailureMechanismResultView + { + Data = failureMechanism.SectionResults + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var viewMock = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); - viewMock.Expect(vm => vm.Data).Return(failureMechanism.SectionResults); - mocks.ReplayAll(); + using (var view = new PipingFailureMechanismResultView + { + Data = failureMechanism.SectionResults + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanism); - // Call - var closeForData = info.CloseForData(viewMock, failureMechanism); - - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); - viewMock.Expect(vm => vm.Data).Return(failureMechanism.SectionResults); + using (var view = new PipingFailureMechanismResultView + { + Data = failureMechanism.SectionResults + }) + { + // Call + bool closeForData = info.CloseForData(view, new PipingFailureMechanism()); - mocks.ReplayAll(); - - // Call - var closeForData = info.CloseForData(viewMock, new PipingFailureMechanism()); - - // Assert - Assert.IsFalse(closeForData); + // Assert + Assert.IsFalse(closeForData); + } } [Test] @@ -247,16 +262,17 @@ var failureMechanism = new PipingFailureMechanism(); var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSectionMock); - var view = new PipingFailureMechanismResultView + using (var view = new PipingFailureMechanismResultView { Data = failureMechanism.SectionResults - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - var closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] @@ -267,31 +283,30 @@ mocks.ReplayAll(); var failureMechanism = new PipingFailureMechanism(); - var view = new PipingFailureMechanismResultView + using (var view = new PipingFailureMechanismResultView { Data = failureMechanism.SectionResults - }; + }) + { + var failureMechanismContext = new PipingFailureMechanismContext( + new PipingFailureMechanism(), + assessmentSectionMock); - var failureMechanismContext = new PipingFailureMechanismContext( - new PipingFailureMechanism(), - assessmentSectionMock - ); + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - var closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsFalse(closeForData); + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void AfterCreate_Always_SetsSpecificPropertiesToView() { // Setup - var viewMock = mocks.StrictMock(); var failureMechanism = new PipingFailureMechanism(); var context = new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism); - + var viewMock = mocks.StrictMock(); viewMock.Expect(v => v.FailureMechanism = failureMechanism); mocks.ReplayAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismViewInfoTest.cs (.../PipingFailureMechanismViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -20,6 +20,7 @@ // All rights reserved. using System.Linq; +using Core.Common.Base; using Core.Common.Gui.Plugin; using Core.Common.TestUtil; using NUnit.Framework; @@ -67,90 +68,109 @@ public void GetViewName_Always_ReturnsTextFromResources() { // Setup - var viewMock = mocks.StrictMock(); + using (var view = new PipingFailureMechanismView()) + { + // Call + string viewName = info.GetViewName(view, null); - mocks.ReplayAll(); - - // Call & Assert - Assert.AreEqual(PipingDataResources.PipingFailureMechanism_DisplayName, info.GetViewName(viewMock, null)); + // Assert + Assert.AreEqual(PipingDataResources.PipingFailureMechanism_DisplayName, viewName); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var otherAssessmentSectionMock = mocks.StrictMock(); - var pipingFailureMechanismMock = mocks.StrictMock(); - var pipingFailureMechanismContextMock = mocks.StrictMock(pipingFailureMechanismMock, assessmentSectionMock); + var assessmentSectionMock = mocks.Stub(); + var otherAssessmentSectionMock = mocks.Stub(); + mocks.ReplayAll(); - viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismContextMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); - mocks.ReplayAll(); + using (var view = new PipingFailureMechanismView + { + Data = pipingFailureMechanismContext + }) + { + // Call + bool closeForData = info.CloseForData(view, otherAssessmentSectionMock); - // Call & Assert - Assert.IsFalse(info.CloseForData(viewMock, otherAssessmentSectionMock)); + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var pipingFailureMechanismMock = mocks.StrictMock(); - var pipingFailureMechanismContextMock = mocks.StrictMock(pipingFailureMechanismMock, assessmentSectionMock); + var assessmentSectionMock = mocks.Stub(); + mocks.ReplayAll(); - viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismContextMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); - mocks.ReplayAll(); + using (var view = new PipingFailureMechanismView + { + Data = pipingFailureMechanismContext + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); - // Call & Assert - Assert.IsTrue(info.CloseForData(viewMock, assessmentSectionMock)); + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - var view = new PipingFailureMechanismView(); - var pipingFailureMechanismMock = new PipingFailureMechanism(); - var otherPipingFailureMechanismMock = new PipingFailureMechanism(); - var assessmentSectionMock = mocks.Stub(); - var pipingFailureMechanismContext = mocks.StrictMock(pipingFailureMechanismMock, assessmentSectionMock); - mocks.ReplayAll(); - view.Data = pipingFailureMechanismContext; + var pipingFailureMechanism = new PipingFailureMechanism(); + var otherPipingFailureMechanism = new PipingFailureMechanism(); - // Call - var closeForData = info.CloseForData(view, otherPipingFailureMechanismMock); + var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); - // Assert - Assert.IsFalse(closeForData); + using (var view = new PipingFailureMechanismView + { + Data = pipingFailureMechanismContext + }) + { + // Call + bool closeForData = info.CloseForData(view, otherPipingFailureMechanism); + + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var view = new PipingFailureMechanismView(); - var pipingFailureMechanism = new PipingFailureMechanism(); - var assessmentSectionMock = mocks.Stub(); - var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); - mocks.ReplayAll(); - view.Data = pipingFailureMechanismContext; + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSectionMock); - // Call - var closeForData = info.CloseForData(view, pipingFailureMechanism); + using (var view = new PipingFailureMechanismView + { + Data = pipingFailureMechanismContext + }) + { + // Call + bool closeForData = info.CloseForData(view, pipingFailureMechanism); - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] @@ -177,4 +197,4 @@ mocks.VerifyAll(); } } -} +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs =================================================================== diff -u -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840 -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -68,9 +68,9 @@ public void GetViewName_Always_ReturnsInputResourceName() { // Setup - using (PipingInputView view = new PipingInputView()) + using (var view = new PipingInputView()) { - PipingCalculationScenario calculationScenario = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationScenario = new PipingCalculationScenario(new GeneralPipingInput()); // Call string viewName = info.GetViewName(view, calculationScenario); @@ -87,13 +87,13 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingInput pipingInput = new PipingInput(new GeneralPipingInput()); + var pipingInput = new PipingInput(new GeneralPipingInput()); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingInputContext calculationInputContext = new PipingInputContext(pipingInput, calculation, Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationInputContext = new PipingInputContext(pipingInput, calculation, Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); // Call object viewData = info.GetViewData(calculationInputContext); @@ -110,14 +110,14 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingCalculationScenarioContext pipingCalculationScenarioContext = new PipingCalculationScenarioContext(pipingCalculation, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()); + var pipingCalculationScenarioContext = new PipingCalculationScenarioContext(pipingCalculation, + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = pipingCalculation }) @@ -138,16 +138,16 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingCalculationScenario calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput()); + var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput()); - PipingCalculationScenarioContext pipingCalculationScenarioContext = new PipingCalculationScenarioContext(calculationToRemove, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + var pipingCalculationScenarioContext = new PipingCalculationScenarioContext(calculationToRemove, + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = pipingCalculation }) @@ -168,16 +168,16 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - using (PipingInputView view = new PipingInputView + var calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (var view = new PipingInputView { Data = calculation }) @@ -198,16 +198,16 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - using (PipingInputView view = new PipingInputView + var calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (var view = new PipingInputView { Data = calculation }) @@ -228,18 +228,18 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); - CalculationGroup nestedGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var nestedGroup = new CalculationGroup(); nestedGroup.Children.Add(calculation); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(nestedGroup); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - using (PipingInputView view = new PipingInputView + var calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (var view = new PipingInputView { Data = calculation }) @@ -260,18 +260,18 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); - CalculationGroup nestedGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var nestedGroup = new CalculationGroup(); nestedGroup.Children.Add(calculation); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(nestedGroup); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - using (PipingInputView view = new PipingInputView + var calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (var view = new PipingInputView { Data = calculation }) @@ -292,13 +292,13 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); - PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -319,13 +319,13 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); - PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -346,16 +346,16 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); - PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -376,16 +376,16 @@ IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); - PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); + var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -398,16 +398,16 @@ mocks.VerifyAll(); } } - + [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -424,11 +424,11 @@ public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -445,14 +445,14 @@ public void CloseForData_NestedViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -469,14 +469,14 @@ public void CloseForData_NestedViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -493,8 +493,8 @@ public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); IAssessmentSection assessmentSection = mocks.StrictMock(); @@ -505,7 +505,7 @@ mocks.ReplayAll(); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -523,8 +523,8 @@ public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); IAssessmentSection assessmentSection = mocks.StrictMock(); @@ -535,7 +535,7 @@ mocks.ReplayAll(); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = new PipingCalculationScenario(new GeneralPipingInput()) }) @@ -553,11 +553,11 @@ public void CloseForData_NestedViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); IAssessmentSection assessmentSection = mocks.StrictMock(); @@ -568,7 +568,7 @@ mocks.ReplayAll(); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = calculation }) @@ -586,11 +586,11 @@ public void CloseForData_NestedViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); - CalculationGroup calculationGroup = new CalculationGroup(); + var calculation = new PipingCalculationScenario(new GeneralPipingInput()); + var calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingFailureMechanism failureMechanism = new PipingFailureMechanism(); + var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculationGroup); IAssessmentSection assessmentSection = mocks.StrictMock(); @@ -601,7 +601,7 @@ mocks.ReplayAll(); - using (PipingInputView view = new PipingInputView + using (var view = new PipingInputView { Data = new PipingCalculationScenario(new GeneralPipingInput()) }) Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -rc09079988a542708a8cee7c6640c67335ea3c760 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingScenariosViewInfoTest.cs (.../PipingScenariosViewInfoTest.cs) (revision c09079988a542708a8cee7c6640c67335ea3c760) @@ -30,7 +30,6 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Forms.Views; - using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Plugin.Test.ViewInfos @@ -69,212 +68,244 @@ public void GetViewData_Always_ReturnsWrappedCalculationGroup() { // Setup - var pipingFailureMechanismMock = mocks.StrictMock(); - var pipingCalculationsGroupMock = mocks.StrictMock(); - var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroupMock, pipingFailureMechanismMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingCalculationsGroup = new CalculationGroup(); + var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism); - mocks.ReplayAll(); + // Call + object viewData = info.GetViewData(pipingScenariosContext); - // Call & Assert - Assert.AreEqual(pipingCalculationsGroupMock, info.GetViewData(pipingScenariosContext)); + // Assert + Assert.AreEqual(pipingCalculationsGroup, viewData); } [Test] public void GetViewName_Always_ReturnsScenarios() { // Setup - var viewMock = mocks.StrictMock(); - var pipingCalculationsGroupMock = mocks.StrictMock(); + var pipingCalculationsGroup = new CalculationGroup + { + Name = "Test" + }; - mocks.ReplayAll(); + using (var view = new PipingScenariosView()) + { + // Call + string viewName = info.GetViewName(view, pipingCalculationsGroup); - pipingCalculationsGroupMock.Name = "Test"; - - // Call & Assert - Assert.AreEqual(RingtoetsCommonFormsResources.Scenarios_DisplayName, info.GetViewName(viewMock, pipingCalculationsGroupMock)); + // Assert + Assert.AreEqual(RingtoetsCommonFormsResources.Scenarios_DisplayName, viewName); + } } [Test] public void AdditionalDataCheck_PipingScenariosContextWithPipingFailureMechanismParent_ReturnsTrue() { // Setup - var pipingFailureMechanismMock = mocks.StrictMock(); - var pipingScenariosContext = new PipingScenariosContext(pipingFailureMechanismMock.CalculationsGroup, pipingFailureMechanismMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingScenariosContext = new PipingScenariosContext(pipingFailureMechanism.CalculationsGroup, pipingFailureMechanism); - mocks.ReplayAll(); + // Call + bool additionalDataCheck = info.AdditionalDataCheck(pipingScenariosContext); - // Call & Assert - Assert.IsTrue(info.AdditionalDataCheck(pipingScenariosContext)); + // Assert + Assert.IsTrue(additionalDataCheck); } [Test] public void AdditionalDataCheck_PipingScenariosContextWithoutPipingFailureMechanismParent_ReturnsFalse() { // Setup - var pipingFailureMechanismMock = mocks.Stub(); - var pipingCalculationsGroupMock = mocks.StrictMock(); - var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroupMock, pipingFailureMechanismMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingCalculationsGroup = new CalculationGroup(); + var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism); - mocks.ReplayAll(); + // Call + bool additionalDataCheck = info.AdditionalDataCheck(pipingScenariosContext); - // Call & Assert - Assert.IsFalse(info.AdditionalDataCheck(pipingScenariosContext)); + // Assert + Assert.IsFalse(additionalDataCheck); } [Test] public void CloseForData_AssessmentSectionRemovedWithoutPipingFailureMechanism_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var pipingCalculationsGroupMock = mocks.StrictMock(); + var pipingCalculationsGroup = new CalculationGroup(); - viewMock.Expect(vm => vm.Data).Return(pipingCalculationsGroupMock); + var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]); mocks.ReplayAll(); - // Call & Assert - Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock)); + using (var view = new PipingScenariosView + { + Data = pipingCalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); + + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var pipingFailureMechanismMock = mocks.Stub(); - var pipingCalculationsGroupMock = mocks.StrictMock(); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingCalculationsGroup = new CalculationGroup(); - viewMock.Expect(vm => vm.Data).Return(pipingCalculationsGroupMock); + var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[] { - pipingFailureMechanismMock + pipingFailureMechanism }); mocks.ReplayAll(); - // Call & Assert - Assert.IsFalse(info.CloseForData(viewMock, assessmentSectionMock)); + using (var view = new PipingScenariosView + { + Data = pipingCalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); + + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue() { // Setup - var viewMock = mocks.StrictMock(); - var assessmentSectionMock = mocks.StrictMock(); - var pipingFailureMechanismMock = mocks.StrictMock(); + var pipingFailureMechanism = new PipingFailureMechanism(); - viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismMock.CalculationsGroup); + var assessmentSectionMock = mocks.StrictMock(); assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[] { - pipingFailureMechanismMock + pipingFailureMechanism }); mocks.ReplayAll(); - // Call & Assert - Assert.IsTrue(info.CloseForData(viewMock, assessmentSectionMock)); + using (var view = new PipingScenariosView + { + Data = pipingFailureMechanism.CalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSectionMock); + + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanism_ReturnsFalse() { // Setup - var view = new PipingScenariosView(); - var failureMechanism = new PipingFailureMechanism(); + using (var view = new PipingScenariosView + { + Data = new CalculationGroup() + }) + { + var failureMechanism = new PipingFailureMechanism(); - view.Data = new CalculationGroup(); + // Call + bool closeForData = info.CloseForData(view, failureMechanism); - mocks.ReplayAll(); - - // Call - var closeForData = info.CloseForData(view, failureMechanism); - - // Assert - Assert.IsFalse(closeForData); + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanism_ReturnsTrue() { // Setup - var view = new PipingScenariosView(); var failureMechanism = new PipingFailureMechanism(); - view.Data = failureMechanism.CalculationsGroup; + using (var view = new PipingScenariosView + { + Data = failureMechanism.CalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanism); - mocks.ReplayAll(); - - // Call - var closeForData = info.CloseForData(view, failureMechanism); - - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void CloseForData_ViewNotCorrespondingToRemovedFailureMechanismContext_ReturnsFalse() { // Setup var assessmentSectionMock = mocks.StrictMock(); + mocks.ReplayAll(); - var view = new PipingScenariosView(); var failureMechanism = new PipingFailureMechanism(); var failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSectionMock); - view.Data = failureMechanism.CalculationsGroup; + using (var view = new PipingScenariosView + { + Data = failureMechanism.CalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - mocks.ReplayAll(); - - // Call - var closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsFalse(closeForData); + // Assert + Assert.IsFalse(closeForData); + } } [Test] public void CloseForData_ViewCorrespondingToRemovedFailureMechanismContext_ReturnsTrue() { // Setup var assessmentSectionMock = mocks.StrictMock(); + mocks.ReplayAll(); - var view = new PipingScenariosView(); var failureMechanism = new PipingFailureMechanism(); var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSectionMock); - view.Data = failureMechanism.CalculationsGroup; + using (var view = new PipingScenariosView + { + Data = failureMechanism.CalculationsGroup + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - mocks.ReplayAll(); - - // Call - var closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsTrue(closeForData); + // Assert + Assert.IsTrue(closeForData); + } } [Test] public void AfterCreate_Always_SetsSpecificPropertiesToView() { // Setup - var viewMock = mocks.StrictMock(); - var pipingFailureMechanismMock = mocks.StrictMock(); - var pipingCalculationsGroupMock = mocks.StrictMock(); - var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroupMock, pipingFailureMechanismMock); + var pipingFailureMechanism = new PipingFailureMechanism(); + var pipingCalculationsGroup = new CalculationGroup(); + var pipingScenariosContext = new PipingScenariosContext(pipingCalculationsGroup, pipingFailureMechanism); - viewMock.Expect(v => v.PipingFailureMechanism = pipingFailureMechanismMock); + using (var view = new PipingScenariosView()) + { + // Call + info.AfterCreate(view, pipingScenariosContext); - mocks.ReplayAll(); - - // Call - info.AfterCreate(viewMock, pipingScenariosContext); - - // Assert - mocks.VerifyAll(); - } + // Assert + Assert.AreSame(pipingFailureMechanism, view.PipingFailureMechanism); + } + } } } \ No newline at end of file