Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision f4efcc2bb58d597f4a19884d98d0ab79bab04b1c) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -133,7 +133,7 @@ /// /// This method returns the result of the import action. /// - /// True if the import was succesful, false if otherwise. + /// True if the import was successful, false if otherwise. protected abstract bool OnImport(); protected void NotifyProgress(string currentStepName, int currentStep, int totalNumberOfSteps) Index: Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision f4efcc2bb58d597f4a19884d98d0ab79bab04b1c) +++ Core/Common/test/Core.Common.Base.Test/IO/FileImporterBaseTest.cs (.../FileImporterBaseTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -148,13 +148,13 @@ } [Test] - public void Import_CancelGivesSuccesfulImport_LogsMessage() + public void Import_CancelGivesSuccessfulImport_LogsMessage() { // Setup var importTarget = new object(); var simpleImporter = new SimpleFileImporter(importTarget) { - ImportSuccesful = true + ImportSuccessful = true }; simpleImporter.SetProgressChanged((description, step, steps) => simpleImporter.Cancel()); @@ -167,13 +167,13 @@ } [Test] - public void Import_CancelGivesUnsuccesfulImport_CallsLogImportoverigensCanceledMessage() + public void Import_CancelGivesUnsuccessfulImport_CallsLogImportoverigensCanceledMessage() { // Setup var importTarget = new object(); var simpleImporter = new SimpleFileImporter(importTarget) { - ImportSuccesful = false + ImportSuccessful = false }; simpleImporter.SetProgressChanged((description, step, steps) => simpleImporter.Cancel()); @@ -194,7 +194,7 @@ LogCanceledMessageCalled = false; } - public bool ImportSuccesful { private get; set; } + public bool ImportSuccessful { private get; set; } public bool LogCanceledMessageCalled { get; private set; } @@ -206,7 +206,7 @@ protected override bool OnImport() { TestNotifyProgress(string.Empty, 1, 1); - return ImportSuccesful; + return ImportSuccessful; } protected override void LogImportCanceledMessage() Index: Core/Common/test/Core.Common.Base.Test/ObservableUniqueItemCollectionWithSourcePathTest.cs =================================================================== diff -u -raae2ecaacbb094fe66d6a54d6ac4b1e6780b0864 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Common/test/Core.Common.Base.Test/ObservableUniqueItemCollectionWithSourcePathTest.cs (.../ObservableUniqueItemCollectionWithSourcePathTest.cs) (revision aae2ecaacbb094fe66d6a54d6ac4b1e6780b0864) +++ Core/Common/test/Core.Common.Base.Test/ObservableUniqueItemCollectionWithSourcePathTest.cs (.../ObservableUniqueItemCollectionWithSourcePathTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -381,10 +381,10 @@ Assert.IsNotNull(collection.SourcePath); // Call - bool removeSuccesful = collection.Remove(elementToBeRemoved); + bool removeSuccessful = collection.Remove(elementToBeRemoved); // Assert - Assert.IsTrue(removeSuccesful); + Assert.IsTrue(removeSuccessful); Assert.IsNull(collection.SourcePath); } Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs =================================================================== diff -u -rfc5dec9b2a89e3593042a84dcc1f2709946b291f -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision fc5dec9b2a89e3593042a84dcc1f2709946b291f) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -379,7 +379,7 @@ } [Test] - public void ImportOn_MultipleSupportedImportInfoAvailableVerifyUpdatesUnsuccesful_ActivityNotCreated() + public void ImportOn_MultipleSupportedImportInfoAvailableVerifyUpdatesUnsuccessful_ActivityNotCreated() { // Setup var generator = new FileFilterGenerator(); Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs =================================================================== diff -u -rfc5dec9b2a89e3593042a84dcc1f2709946b291f -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision fc5dec9b2a89e3593042a84dcc1f2709946b291f) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -283,7 +283,7 @@ } [Test] - public void UpdateOn_SupportedUpdateInfoAvailableVerifyUpdatesSuccesful_ExpectedUpdateInfoFunctionsCalledActivityCreated() + public void UpdateOn_SupportedUpdateInfoAvailableVerifyUpdatesSuccessful_ExpectedUpdateInfoFunctionsCalledActivityCreated() { // Setup const string filePath = "/some/path"; @@ -379,7 +379,7 @@ } [Test] - public void UpdateOn_SupportedUpdateInfoAvailableVerifyUpdatesUnsuccesful_ActivityNotCreated() + public void UpdateOn_SupportedUpdateInfoAvailableVerifyUpdatesUnsuccessful_ActivityNotCreated() { // Setup var generator = new FileFilterGenerator(); Index: Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs (.../FeatureBasedMapDataImporterTest.cs) (revision f4efcc2bb58d597f4a19884d98d0ab79bab04b1c) +++ Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs (.../FeatureBasedMapDataImporterTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -57,14 +57,14 @@ var importer = new FeatureBasedMapDataImporter(mapDataCollection, path); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert var expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': het bestand of andere benodigde bestanden zijn niet gevonden.", path) + Environment.NewLine + "Er is geen kaartlaag geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -76,14 +76,14 @@ var importer = new FeatureBasedMapDataImporter(mapDataCollection, path); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert var expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': kon geen geometrieën vinden in dit bestand.", path) + Environment.NewLine + "Er is geen kaartlaag geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -95,15 +95,15 @@ var importer = new FeatureBasedMapDataImporter(mapDataCollection, path); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert const string message = @"Fout bij het lezen van bestand '{0}': het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie."; var expectedMessage = string.Format(message, path) + Environment.NewLine + "Er is geen kaartlaag geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -117,15 +117,15 @@ using (new StreamReader(new FileStream(path, FileMode.Open))) { // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert const string message = @"Fout bij het lezen van bestand '{0}': het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie."; var expectedMessage = string.Format(message, path) + Environment.NewLine + "Er is geen kaartlaag geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } } @@ -144,15 +144,15 @@ CollectionAssert.IsEmpty(mapDataCollection.Collection); // Call - bool importSuccesful = importer.Import(); + bool importSuccessful = importer.Import(); // Assert - Assert.IsTrue(importSuccesful); + Assert.IsTrue(importSuccessful); Assert.AreEqual(1, mapDataCollection.Collection.Count()); } [Test] - public void DoPostImportUpdates_ImportSuccesful_NotifiesMapDataCollection() + public void DoPostImportUpdates_ImportSuccessful_NotifiesMapDataCollection() { // Setup var mocks = new MockRepository(); Index: Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -92,7 +92,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -113,7 +113,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Setup using (var plugin = new ClosingStructuresPlugin()) Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r84db6d79354723db5626dbb9ff7361d2a70d66d1 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -448,10 +448,10 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - bool succesfulCalculation = guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); + bool successfulCalculation = guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert - Assert.IsTrue(succesfulCalculation); + Assert.IsTrue(successfulCalculation); } mockRepository.VerifyAll(); } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs =================================================================== diff -u -r7b85dbce8bcc39e824c367468892764778527ce4 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision 7b85dbce8bcc39e824c367468892764778527ce4) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -48,7 +48,7 @@ } [Test] - public void Constructor_EmptyAcceptedIds_SuccesfullyInitialzed() + public void Constructor_EmptyAcceptedIds_successfullyInitialzed() { // Call TestDelegate call = () => new DikeProfileDataReader(new string[0]); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision f4efcc2bb58d597f4a19884d98d0ab79bab04b1c) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/ReferenceLines/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -96,10 +96,10 @@ var importer = new ReferenceLineImporter(assessmentSection, handler, path); // Call - bool importSuccesful = importer.Import(); + bool importSuccessful = importer.Import(); // Assert - Assert.IsTrue(importSuccesful); + Assert.IsTrue(importSuccessful); mocks.VerifyAll(); } @@ -122,11 +122,11 @@ { new ExpectedProgressNotification { - Text = "Inlezen referentielijn.", CurrentStep = 1, MaxNrOfSteps = 2 + Text = "Inlezen referentielijn.", CurrentStep = 1, TotalNumberOfSteps = 2 }, new ExpectedProgressNotification { - Text = "Geïmporteerde data toevoegen aan het toetsspoor.", CurrentStep = 2, MaxNrOfSteps = 2 + Text = "Geïmporteerde data toevoegen aan het toetsspoor.", CurrentStep = 2, TotalNumberOfSteps = 2 } }; var progressChangedCallCount = 0; @@ -135,7 +135,7 @@ { Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description); Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step); - Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].MaxNrOfSteps, steps); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].TotalNumberOfSteps, steps); progressChangedCallCount++; }); @@ -166,14 +166,14 @@ var importer = new ReferenceLineImporter(assessmentSection, handler, path); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert var expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': bestandspad mag niet verwijzen naar een lege bestandsnaam. ", path) + Environment.NewLine + "Er is geen referentielijn geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); mocks.VerifyAll(); } @@ -196,14 +196,14 @@ var importer = new ReferenceLineImporter(assessmentSection, handler, path); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + bool importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert var expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': het bestand bestaat niet. ", path) + Environment.NewLine + "Er is geen referentielijn geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); mocks.VerifyAll(); } @@ -228,10 +228,10 @@ var importer = new ReferenceLineImporter(assessmentSection, handler, path); // Call - bool importSuccesful = importer.Import(); + bool importSuccessful = importer.Import(); // Assert - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); mocks.VerifyAll(); } @@ -371,15 +371,15 @@ importer.SetProgressChanged((description, step, steps) => importer.Cancel()); // Pre-condition - bool importSuccesful = importer.Import(); - Assert.IsFalse(importSuccesful); + bool importSuccessful = importer.Import(); + Assert.IsFalse(importSuccessful); importer.SetProgressChanged(null); // Call - importSuccesful = importer.Import(); + importSuccessful = importer.Import(); // Assert - Assert.IsTrue(importSuccesful); + Assert.IsTrue(importSuccessful); mocks.VerifyAll(); } @@ -533,7 +533,7 @@ { public string Text { get; set; } public int CurrentStep { get; set; } - public int MaxNrOfSteps { get; set; } + public int TotalNumberOfSteps { get; set; } } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -113,7 +113,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Setup using (var plugin = new HeightStructuresPlugin()) Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -167,7 +167,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Setup using (var plugin = new RingtoetsPlugin()) Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -125,7 +125,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -171,7 +171,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Setup using (var plugin = new RingtoetsPlugin()) Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -107,7 +107,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; Index: Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs (.../ReferenceLineImporterIntegrationTest.cs) (revision f4efcc2bb58d597f4a19884d98d0ab79bab04b1c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Test/ReferenceLineImporterIntegrationTest.cs (.../ReferenceLineImporterIntegrationTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -72,10 +72,10 @@ }; // When - bool importSuccesful = importer.Import(); + bool importSuccessful = importer.Import(); // Then - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); Assert.AreSame(originalReferenceLine, assessmentSection.ReferenceLine); Assert.AreEqual("Bevestigen", messageBoxTitle); @@ -137,11 +137,11 @@ assessmentSection.PipingFailureMechanism.SurfaceLines.Attach(surfaceLinesObserver); // When - bool importSuccesful = importer.Import(); + bool importSuccessful = importer.Import(); importer.DoPostImport(); // Then - Assert.IsTrue(importSuccesful); + Assert.IsTrue(importSuccessful); Assert.AreNotSame(originalReferenceLine, assessmentSection.ReferenceLine); Point2D[] point2Ds = assessmentSection.ReferenceLine.Points.ToArray(); Assert.AreEqual(803, point2Ds.Length); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs =================================================================== diff -u -rdfe649292c68391f773d01a0ec9e9950a04e031e -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -41,16 +41,15 @@ { private readonly string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO, "PipingConfigurationReader"); - private static IEnumerable NestedOrNaNData + private static IEnumerable ValidConfigurationsWithValidData { get { yield return new TestCaseData("validConfigurationNesting.xml", - GetNestedData()) + GetExpectedNestedData()) .SetName("validConfigurationNesting"); - yield return new TestCaseData("validConfigurationCalculationContainingNaNs.xml", - GetNaNData()) + GetExpectedNaNData()) .SetName("validConfigurationCalculationContainingNaNs"); } } @@ -108,14 +107,14 @@ new PipingFailureMechanism()); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + var importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = $"Fout bij het lezen van bestand '{filePath}': bestandspad mag niet verwijzen naar een lege bestandsnaam. " + Environment.NewLine + + string expectedMessage = $"Fout bij het lezen van bestand '{filePath}': bestandspad mag niet verwijzen naar een lege bestandsnaam. " + Environment.NewLine + "Er is geen berekening configuratie geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -129,14 +128,14 @@ new PipingFailureMechanism()); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + var importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert - var expectedMessage = $"Fout bij het lezen van bestand '{filePath}': het bestand bestaat niet. " + Environment.NewLine + + string expectedMessage = $"Fout bij het lezen van bestand '{filePath}': het bestand bestaat niet. " + Environment.NewLine + "Er is geen berekening configuratie geïmporteerd."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -150,8 +149,8 @@ new PipingFailureMechanism()); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + var importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert TestHelper.AssertLogMessages(call, messages => @@ -161,14 +160,14 @@ StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}': het XML-document dat de configuratie voor de berekeningen beschrijft is niet geldig.", msgs[0]); }); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] [SetCulture("nl-NL")] [TestCase("validConfigurationInvalidEntryExitPoint.xml", "Het uittredepunt moet landwaarts van het intredepunt liggen.")] [TestCase("validConfigurationExitPointNotOnSurfaceLine.xml", "Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 10,0]).")] - public void Import_EntryExitPointNotValid_LogMessageAndContinueImport(string file, string expectedErrorMessage) + public void Import_ValidConfigurationInvalidData_LogMessageAndContinueImport(string file, string expectedErrorMessage) { // Setup string filePath = Path.Combine(path, file); @@ -220,13 +219,13 @@ pipingFailureMechanism); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert string expectedMessage = $"{expectedErrorMessage} Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -253,13 +252,13 @@ }); // Call - bool importSuccesful = true; - Action call = () => importSuccesful = importer.Import(); + var importSuccessful = true; + Action call = () => importSuccessful = importer.Import(); // Assert TestHelper.AssertLogMessageIsGenerated(call, "Berekening configuratie importeren afgebroken. Geen data ingelezen.", 1); CollectionAssert.IsEmpty(calculationGroup.Children); - Assert.IsFalse(importSuccesful); + Assert.IsFalse(importSuccessful); } [Test] @@ -276,15 +275,15 @@ { new ExpectedProgressNotification { - Text = "Inlezen berekening configuratie.", CurrentStep = 1, MaxNrOfSteps = 3 + Text = "Inlezen berekening configuratie.", CurrentStep = 1, TotalNumberOfSteps = 3 }, new ExpectedProgressNotification { - Text = "Valideren berekening configuratie.", CurrentStep = 2, MaxNrOfSteps = 3 + Text = "Valideren berekening configuratie.", CurrentStep = 2, TotalNumberOfSteps = 3 }, new ExpectedProgressNotification { - Text = "Geïmporteerde data toevoegen aan het toetsspoor.", CurrentStep = 3, MaxNrOfSteps = 3 + Text = "Geïmporteerde data toevoegen aan het toetsspoor.", CurrentStep = 3, TotalNumberOfSteps = 3 } }; @@ -293,7 +292,7 @@ { Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].Text, description); Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].CurrentStep, step); - Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].MaxNrOfSteps, steps); + Assert.AreEqual(expectedProgressMessages[progressChangedCallCount].TotalNumberOfSteps, steps); progressChangedCallCount++; }); @@ -316,13 +315,13 @@ new PipingFailureMechanism()); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert const string expectedMessage = "De locatie met hydraulische randvoorwaarden 'HRlocatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -342,13 +341,13 @@ new PipingFailureMechanism()); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert const string expectedMessage = "De profielschematisatie 'Profielschematisatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -385,13 +384,13 @@ pipingFailureMechanism); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel' bestaat niet. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -439,13 +438,13 @@ pipingFailureMechanism); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert const string expectedMessage = "Het stochastische ondergrondmodel 'Ondergrondmodel'doorkruist de profielschematisatie 'Profielschematisatie' niet. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } @@ -493,20 +492,20 @@ pipingFailureMechanism); // Call - bool succesful = false; - Action call = () => succesful = importer.Import(); + var successful = false; + Action call = () => successful = importer.Import(); // Assert const string expectedMessage = "De ondergrondschematisatie 'Ondergrondschematisatie' bestaat niet binnen het stochastische ondergrondmodel 'Ondergrondmodel'. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); - Assert.IsTrue(succesful); + Assert.IsTrue(successful); CollectionAssert.IsEmpty(calculationGroup.Children); } [Test] [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", false)] [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", true)] - public void Import_ValidData_DataAddedToModel(string file, bool manualAssessmentLevel) + public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(string file, bool manualAssessmentLevel) { // Setup string filePath = Path.Combine(path, file); @@ -558,18 +557,18 @@ pipingFailureMechanism); // Call - bool succesful = importer.Import(); + bool successful = importer.Import(); // Assert - Assert.IsTrue(succesful); + Assert.IsTrue(successful); var expectedCalculation = new PipingCalculationScenario(new GeneralPipingInput()) { Name = "Calculation", InputParameters = { - UseAssessmentLevelManualInput = manualAssessmentLevel, HydraulicBoundaryLocation = hydraulicBoundaryLocation, + UseAssessmentLevelManualInput = manualAssessmentLevel, SurfaceLine = surfaceLine, EntryPointL = (RoundedDouble) 2.2, ExitPointL = (RoundedDouble) 3.3, @@ -602,8 +601,8 @@ } [Test] - [TestCaseSource(nameof(NestedOrNaNData))] - public void Import_NestedOrEmptyCalculations_DataAddedToModel(string file, CalculationGroup expectedCalculationGroup) + [TestCaseSource(nameof(ValidConfigurationsWithValidData))] + public void Import_ValidConfigurationWithValidData_DataAddedToModel(string file, CalculationGroup expectedCalculationGroup) { // Setup string filePath = Path.Combine(path, file); @@ -617,14 +616,14 @@ pipingFailureMechanism); // Call - bool succesful = importer.Import(); + bool successful = importer.Import(); // Assert - Assert.IsTrue(succesful); + Assert.IsTrue(successful); AssertCalculationGroup(expectedCalculationGroup, calculationGroup); } - private static CalculationGroup GetNestedData() + private static CalculationGroup GetExpectedNestedData() { return new CalculationGroup("Root", false) { @@ -673,7 +672,7 @@ }; } - private static CalculationGroup GetNaNData() + private static CalculationGroup GetExpectedNaNData() { return new CalculationGroup("Root", false) { @@ -707,6 +706,7 @@ private static void AssertCalculationGroup(CalculationGroup expectedCalculationGroup, CalculationGroup actualCalculationGroup) { Assert.AreEqual(expectedCalculationGroup.Children.Count, actualCalculationGroup.Children.Count); + Assert.IsTrue(actualCalculationGroup.IsNameEditable); for (var i = 0; i < expectedCalculationGroup.Children.Count; i++) { @@ -752,7 +752,7 @@ { public string Text { get; set; } public int CurrentStep { get; set; } - public int MaxNrOfSteps { get; set; } + public int TotalNumberOfSteps { get; set; } } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs =================================================================== diff -u -r39bbb7b4108d845bf7834c1b92a983e35109271f -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 39bbb7b4108d845bf7834c1b92a983e35109271f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -328,7 +328,7 @@ } [Test] - public void Import_CancelOfImportWhenAddingDataToModel_ImportCompletedSuccesfullyNonetheless() + public void Import_CancelOfImportWhenAddingDataToModel_ImportCompletedSuccessfullyNonetheless() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.soil"); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationExitPointNotOnSurfaceLine.xml =================================================================== diff -u -r80f26bb57c31ea312cbe1461eb979033c8299517 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationExitPointNotOnSurfaceLine.xml (.../validConfigurationExitPointNotOnSurfaceLine.xml) (revision 80f26bb57c31ea312cbe1461eb979033c8299517) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationExitPointNotOnSurfaceLine.xml (.../validConfigurationExitPointNotOnSurfaceLine.xml) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -1,21 +1,8 @@ - 1.1 Profielschematisatie 2.2 200.2 - Ondergrondmodel - Ondergrondschematisatie - - - 4.4 - 5.5 - - - 6.6 - 7.7 - - \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationInvalidEntryExitPoint.xml =================================================================== diff -u -r80f26bb57c31ea312cbe1461eb979033c8299517 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationInvalidEntryExitPoint.xml (.../validConfigurationInvalidEntryExitPoint.xml) (revision 80f26bb57c31ea312cbe1461eb979033c8299517) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationInvalidEntryExitPoint.xml (.../validConfigurationInvalidEntryExitPoint.xml) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -1,21 +1,7 @@ - 1.1 - Profielschematisatie 3.3 2.2 - Ondergrondmodel - Ondergrondschematisatie - - - 4.4 - 5.5 - - - 6.6 - 7.7 - - \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -r5f1d410a44f7895c3519e5763497dc30ec492a73 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision 5f1d410a44f7895c3519e5763497dc30ec492a73) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/PipingCalculationGroupContextImportInfoTest.cs (.../PipingCalculationGroupContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -88,7 +88,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs =================================================================== diff -u -r26da131fa5dbcf95f9a16de6f81eb4acc8d1be14 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision 26da131fa5dbcf95f9a16de6f81eb4acc8d1be14) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -130,7 +130,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; @@ -184,7 +184,7 @@ var importTarget = new RingtoetsPipingSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection); // Call - IFileImporter importer = importInfo.CreateFileImporter(importTarget, "'"); + IFileImporter importer = importInfo.CreateFileImporter(importTarget, ""); // Assert Assert.IsInstanceOf(importer); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -128,7 +128,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextUpdateInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -131,7 +131,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call string fileFilter = updateInfo.FileFilterGenerator.Filter; @@ -213,7 +213,7 @@ var importTarget = new RingtoetsPipingSurfaceLinesContext(surfaceLines, failureMechanism, assessmentSection); // Call - IFileImporter importer = updateInfo.CreateFileImporter(importTarget, "'"); + IFileImporter importer = updateInfo.CreateFileImporter(importTarget, ""); // Assert Assert.IsInstanceOf(importer); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -129,7 +129,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Call FileFilterGenerator fileFilter = updateInfo.FileFilterGenerator; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs =================================================================== diff -u -r071888c2752e0deb69682e9d685a6f9ba2e75742 -r110999cffbcac705d99ff96033e9eabb0e0b5e12 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision 071888c2752e0deb69682e9d685a6f9ba2e75742) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision 110999cffbcac705d99ff96033e9eabb0e0b5e12) @@ -116,7 +116,7 @@ } [Test] - public void FileFilter_Always_ReturnExpectedFileFilter() + public void FileFilterGenerator_Always_ReturnExpectedFileFilter() { // Setup using (var plugin = new StabilityPointStructuresPlugin())