Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs (.../ClosingStructureUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/FileImporters/ClosingStructureUpdateDataStrategy.cs (.../ClosingStructureUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -24,7 +24,6 @@ using System.Linq; using Core.Common.Base; using Ringtoets.ClosingStructures.Data; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.Forms; @@ -35,7 +34,7 @@ namespace Ringtoets.ClosingStructures.Plugin.FileImporters { /// - /// An implementation for + /// An implementation for /// updating closing structures based on imported data. /// public class ClosingStructureUpdateDataStrategy : UpdateDataStrategyBase, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs (.../ClosingStructureReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureReplaceDataStrategyTest.cs (.../ClosingStructureReplaceDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -109,7 +109,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - newSourcePath); + newSourcePath); // Assert CollectionAssert.AreEqual(new IObservable[] @@ -131,7 +131,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert CollectionAssert.IsEmpty(targetCollection); @@ -156,7 +156,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(importedStructures, - sourceFilePath); + sourceFilePath); // Assert StructureCollection actualCollection = failureMechanism.ClosingStructures; @@ -234,7 +234,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsNull(calculation.InputParameters.Structure); @@ -279,7 +279,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsFalse(calculation.HasOutput); @@ -334,7 +334,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsNull(sectionResult.Calculation); @@ -358,7 +358,6 @@ new TestClosingStructure(duplicateId, "Other name") }; - var targetCollection = new StructureCollection(); var strategy = new ClosingStructureReplaceDataStrategy(new ClosingStructuresFailureMechanism()); // Call Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructureUpdateDataStrategyTest.cs (.../ClosingStructureUpdateDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -478,7 +478,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert Assert.IsFalse(calculation.HasOutput); @@ -675,7 +675,7 @@ { readStructure }, - sourceFilePath); + sourceFilePath); // Assert AssertClosingStructures(readStructure, structure); @@ -744,7 +744,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert CollectionAssert.AreEqual(new IObservable[] Index: Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs (.../IMechanismSurfaceLine.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.Data/IMechanismSurfaceLine.cs (.../IMechanismSurfaceLine.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -21,5 +21,8 @@ namespace Ringtoets.Common.Data { + /// + /// Interface for a mechanism specific surfaceline. + /// public interface IMechanismSurfaceLine {} } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/ReplaceDataStrategyBase.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/ReplaceDataStrategyBase.cs (.../ReplaceDataStrategyBase.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/ReplaceDataStrategyBase.cs (.../ReplaceDataStrategyBase.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -32,20 +32,19 @@ /// target collection with the data that was imported. /// /// The target data type. - /// The failure mechanism in which the target collection should be updated. + /// The type of the failure mechanism in which the target collection should be updated. public abstract class ReplaceDataStrategyBase where TTargetData : class where TFailureMechanism : IFailureMechanism { - protected readonly TFailureMechanism FailureMechanism; private readonly ObservableUniqueItemCollectionWithSourcePath targetCollection; /// - /// Initializes a + /// Initializes a . /// /// The failure mechanism in which the target collection should be updated. /// The collection that needs to be updated. - /// Thrown when is null + /// Thrown when is null. protected ReplaceDataStrategyBase(TFailureMechanism failureMechanism, ObservableUniqueItemCollectionWithSourcePath targetCollection) { if (failureMechanism == null) @@ -58,10 +57,15 @@ } /// + /// Gets the failure mechanism. + /// + protected TFailureMechanism FailureMechanism { get; } + + /// /// Clears all the dependent data of the target items that are within the failure mechanism. /// - /// A with all the items that are affected within the failure mechanism - /// after clearing all the within the target collection. + /// An with all the items that are affected within the failure mechanism + /// after clearing all the data within the target collection. protected abstract IEnumerable ClearData(); /// @@ -70,10 +74,10 @@ /// The data that was imported. /// The source file path where the imported data comes from. /// An with affected objects. - /// Thrown when any of the input parameters are null. + /// Thrown when any of the input parameters is null. /// Thrown when replacing the data has failed. protected IEnumerable ReplaceTargetCollectionWithImportedData(IEnumerable importedDataCollection, - string sourceFilePath) + string sourceFilePath) { if (importedDataCollection == null) { @@ -92,7 +96,7 @@ } /// - /// Adds read data from the to the . + /// Adds imported data from the to the . /// /// The data that was imported. /// The source file path where the imported data comes from. Index: Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/UpdateDataStrategyBase.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/UpdateDataStrategyBase.cs (.../UpdateDataStrategyBase.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.Data/UpdateDataStrategies/UpdateDataStrategyBase.cs (.../UpdateDataStrategyBase.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -39,17 +39,16 @@ /// /// /// The target data type. - /// The failure mechanism in which the target collection should be updated. + /// The type of the failure mechanism in which the target collection should be updated. public abstract class UpdateDataStrategyBase where TTargetData : Observable where TFailureMechanism : IFailureMechanism { - protected readonly TFailureMechanism FailureMechanism; private readonly IEqualityComparer equalityComparer; private readonly ObservableUniqueItemCollectionWithSourcePath targetCollection; /// - /// Creates a new instance of object. + /// Creates a new instance of . /// /// The failure mechanism which needs to be updated. /// The collection to add the updated objects to. @@ -79,19 +78,24 @@ } /// + /// Gets the failure mechanism. + /// + protected TFailureMechanism FailureMechanism { get; } + + /// /// Updates the unequal object and its dependent data with data from the imported data. /// - /// Object that needs to be updated. + /// The object that needs to be updated. /// The object to update from. /// An with affected objects. /// Thrown when duplicate items are found. protected abstract IEnumerable UpdateObjectAndDependentData(TTargetData objectToUpdate, TTargetData objectToUpdateFrom); /// - /// Removes the objects and their dependent data. + /// Removes the object and its dependent data. /// - /// The object that is removed. + /// The object to remove. /// An with affected objects. protected abstract IEnumerable RemoveObjectAndDependentData(TTargetData removedObject); @@ -102,8 +106,9 @@ /// The imported data collection that is used to update /// the . /// The source file path. - /// A of affected objects. + /// An of affected objects. /// Thrown when an error occurred while updating the data. + /// Thrown when any input parameter is null. /// Thrown when contains /// null elements. protected IEnumerable UpdateTargetCollectionData(IEnumerable importedDataCollection, @@ -123,15 +128,15 @@ /// /// Identifies which items were changed, removed and added to the target collection /// when compared with the imported data and performs the necessary operations for - /// the dependent data of the affected elements. + /// the dependent data of the affected elements. /// /// The imported data collection which is used to update /// the . /// The source file path. - /// A with affected objects. + /// An with affected objects. /// Thrown when: /// - /// duplicate items are being added to the . + /// duplicate items are being added to the ; /// duplicate items are found in the . /// /// @@ -165,7 +170,7 @@ /// /// The objects that need to be updated. /// The data to update from. - /// A of affected items. + /// An of affected items. /// Thrown when the imported /// contains duplicate items. private IEnumerable UpdateData(IEnumerable objectsToUpdate, @@ -201,7 +206,7 @@ /// Removes all the objects and their dependent data. /// /// The objects that need to be removed. - /// A of affected items. + /// An of affected items. private IEnumerable RemoveData(IEnumerable objectsToRemove) { var affectedObjects = new List(); @@ -231,8 +236,8 @@ /// Thrown when /// or contains a null element. public CollectionModification(IEnumerable existingObjects, - IEnumerable updatedObjects, - IEqualityComparer equalityComparer) + IEnumerable updatedObjects, + IEqualityComparer equalityComparer) { if (existingObjects == null) { Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IDikeProfileUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IDikeProfileUpdateDataStrategy.cs (.../IDikeProfileUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IDikeProfileUpdateDataStrategy.cs (.../IDikeProfileUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -34,16 +34,13 @@ public interface IDikeProfileUpdateDataStrategy { /// - /// Adds the imported data to the . + /// Updates the dike profiles and its dependent data with data from . /// /// The imported dike profiles. - /// The source path from where the dike profiles - /// were imported from. + /// The source path from where the dike profiles were imported from. /// An of updated instances. - /// Thrown when any input - /// argument is null. - /// Thrown - /// when applying the strategy has failed. + /// Thrown when any input argument is null. + /// Thrown when applying the strategy has failed. IEnumerable UpdateDikeProfilesWithImportedData(IEnumerable importedDataCollection, string sourceFilePath); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs (.../IForeshoreProfileUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/IForeshoreProfileUpdateDataStrategy.cs (.../IForeshoreProfileUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -34,16 +34,13 @@ public interface IForeshoreProfileUpdateDataStrategy { /// - /// Adds the imported data to the . + /// Updates the foreshore profiles and its dependent data with data from . /// /// The imported foreshore profiles. - /// The source path from where the foreshore - /// profiles were imported. + /// The source path from where the foreshore profiles were imported. /// An of updated instances. - /// Thrown when any input argument - /// is null. - /// Thrown when updating the data - /// model has failed. + /// Thrown when any input argument is null. + /// Thrown when updating the data model has failed. IEnumerable UpdateForeshoreProfilesWithImportedData(IEnumerable importedDataCollection, string sourceFilePath); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs (.../IStructureUpdateStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Structures/IStructureUpdateStrategy.cs (.../IStructureUpdateStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -34,8 +34,7 @@ public interface IStructureUpdateStrategy where TStructure : StructureBase { /// - /// Updates the strucutres and its dependent data with data - /// from . + /// Updates the structures and its dependent data with data from . /// /// The imported structures. /// The source path from where the structures were imported from. Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs (.../ReplaceDataStrategyBaseTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/ReplaceDataStrategyBaseTest.cs (.../ReplaceDataStrategyBaseTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -34,7 +34,7 @@ public class ReplaceDataStrategyBaseTest { [Test] - public void DefaultConstructor_FailureMechanismNull_ThrowsArgumentNullException() + public void Constructor_FailureMechanismNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new ConcreteStrategyClass(null, null); @@ -45,7 +45,7 @@ } [Test] - public void DefaultConstructor_FailureMechanisNotNull_DoesNotThrowException() + public void Constructor_FailureMechanisNotNull_DoesNotThrowException() { // Call TestDelegate call = () => new ConcreteStrategyClass(new TestFailureMechanism(), null); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/UpdateDataStrategyBaseTest.cs =================================================================== diff -u -rf288f9ccb9ac465f017170a59279909d8431fdc7 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/UpdateDataStrategyBaseTest.cs (.../UpdateDataStrategyBaseTest.cs) (revision f288f9ccb9ac465f017170a59279909d8431fdc7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/UpdateDataStrategies/UpdateDataStrategyBaseTest.cs (.../UpdateDataStrategyBaseTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -82,10 +82,10 @@ public void UpdateTargetCollectionData_ImportedDataCollectionNull_ThrowsArgumentNullException() { // Setup - var strategy = CreateDefaultTestStrategy(new TestUniqueItemCollection()); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(new TestUniqueItemCollection()); // Call - TestDelegate call = () => strategy.ConcreteUpdateData(new TestUniqueItemCollection(), null, string.Empty); + TestDelegate call = () => strategy.ConcreteUpdateData(null, string.Empty); // Assert string paramName = Assert.Throws(call).ParamName; @@ -96,10 +96,10 @@ public void UpdateTargetCollectionData_ImportedDataCollectionContainsNullElement_ThrowsArgumentException() { // Setup - var strategy = CreateDefaultTestStrategy(new TestUniqueItemCollection()); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(new TestUniqueItemCollection()); // Call - TestDelegate call = () => strategy.ConcreteUpdateData(new TestUniqueItemCollection(), new TestItem[] + TestDelegate call = () => strategy.ConcreteUpdateData(new TestItem[] { null }, string.Empty); @@ -114,10 +114,10 @@ { // Setup var collection = new TestUniqueItemCollection(); - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - TestDelegate call = () => strategy.ConcreteUpdateData(collection, Enumerable.Empty(), null); + TestDelegate call = () => strategy.ConcreteUpdateData(Enumerable.Empty(), null); // Assert string paramName = Assert.Throws(call).ParamName; @@ -131,10 +131,10 @@ var collection = new TestUniqueItemCollection(); const string filePath = "path"; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, Enumerable.Empty(), filePath); + IEnumerable affectedObjects = strategy.ConcreteUpdateData(Enumerable.Empty(), filePath); // Assert Assert.IsFalse(strategy.IsUpdateDataCalled); @@ -158,11 +158,11 @@ }; collection.AddRange(itemsRemoved, filePath); - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToRemove = itemsRemoved; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, Enumerable.Empty(), filePath); + IEnumerable affectedObjects = strategy.ConcreteUpdateData(Enumerable.Empty(), filePath); // Assert Assert.IsFalse(strategy.IsUpdateDataCalled); @@ -197,10 +197,10 @@ new TestItem("Name B") }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, importedItems, sourceFilePath); + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert Assert.IsFalse(strategy.IsUpdateDataCalled); @@ -234,10 +234,10 @@ new TestItem(duplicateName) }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - TestDelegate call = () => strategy.ConcreteUpdateData(collection, importedCollection, sourceFilePath); + TestDelegate call = () => strategy.ConcreteUpdateData(importedCollection, sourceFilePath); // Assert var exception = Assert.Throws(call); @@ -271,12 +271,11 @@ currentCollection[1].DeepClone() }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToUpdate = currentCollection; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, - importedItems, + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -316,14 +315,13 @@ currentCollection[1].DeepClone() }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToUpdate = currentCollection; const string newSourceFilePath = "Something/Different/From/Onbekend"; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, - importedItems, + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, newSourceFilePath); // Assert @@ -358,7 +356,7 @@ itemToAdd }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToUpdate = new[] { itemToUpdate @@ -369,8 +367,7 @@ }; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, - importedItems, + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -416,12 +413,11 @@ new TestItem("Item four") }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToRemove = currentCollection; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, - importedItems, + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -466,11 +462,10 @@ new TestItem("Item one") }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - strategy.ConcreteUpdateData(collection, - importedItems, + strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -496,11 +491,10 @@ new TestItem("Item one") }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - strategy.ConcreteUpdateData(collection, - importedItems, + strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -525,11 +519,10 @@ new TestItem(name) }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); // Call - TestDelegate call = () => strategy.ConcreteUpdateData(collection, - importedItems, + TestDelegate call = () => strategy.ConcreteUpdateData(importedItems, sourceFilePath); // Assert @@ -555,14 +548,13 @@ itemTwo }; - var strategy = CreateDefaultTestStrategy(collection); + TestUpdateDataStrategy strategy = CreateDefaultTestStrategy(collection); strategy.ItemsToUpdate = currentCollection; strategy.ItemsToUpdateFrom = importedItems; strategy.AddObjectToUpdateToAffectedItems = true; // Call - IEnumerable affectedObjects = strategy.ConcreteUpdateData(collection, - importedItems, + IEnumerable affectedObjects = strategy.ConcreteUpdateData(importedItems, "path"); IEnumerable expectedAffectedObjects = new IObservable[] @@ -575,7 +567,7 @@ CollectionAssert.AreEqual(expectedAffectedObjects, affectedObjects); } - private TestUpdateDataStrategy CreateDefaultTestStrategy(ObservableUniqueItemCollectionWithSourcePath targetCollection) + private static TestUpdateDataStrategy CreateDefaultTestStrategy(ObservableUniqueItemCollectionWithSourcePath targetCollection) { return new TestUpdateDataStrategy(new TestFailureMechanism(), new NameComparer(), targetCollection); } @@ -604,8 +596,7 @@ /// public List> RemoveDataCallArguments { get; } = new List>(); - public IEnumerable ConcreteUpdateData(ObservableUniqueItemCollectionWithSourcePath targetCollection, - IEnumerable importedDataCollection, + public IEnumerable ConcreteUpdateData(IEnumerable importedDataCollection, string sourceFilePath) { return UpdateTargetCollectionData(importedDataCollection, sourceFilePath); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs =================================================================== diff -u -rf288f9ccb9ac465f017170a59279909d8431fdc7 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision f288f9ccb9ac465f017170a59279909d8431fdc7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/DikeProfilesImporterTest.cs (.../DikeProfilesImporterTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -392,7 +392,6 @@ // Setup const string cancelledLogMessage = "Operation Cancelled"; - var mocks = new MockRepository(); var messageProvider = mocks.StrictMock(); messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Dijkprofielen")).Return(cancelledLogMessage); mocks.ReplayAll(); Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/TestDikeProfileUpdateStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/TestDikeProfileUpdateStrategyTest.cs (.../TestDikeProfileUpdateStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/TestDikeProfileUpdateStrategyTest.cs (.../TestDikeProfileUpdateStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -71,8 +71,10 @@ // Setup IEnumerable updatedInstances = Enumerable.Empty(); - var strategy = new TestDikeProfileUpdateStrategy(); - strategy.UpdatedInstances = updatedInstances; + var strategy = new TestDikeProfileUpdateStrategy + { + UpdatedInstances = updatedInstances + }; // Call strategy.UpdateDikeProfilesWithImportedData(Enumerable.Empty(), string.Empty); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsDikeProfileUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsDikeProfileUpdateDataStrategy.cs (.../GrassCoverErosionInwardsDikeProfileUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/FileImporters/GrassCoverErosionInwardsDikeProfileUpdateDataStrategy.cs (.../GrassCoverErosionInwardsDikeProfileUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -34,7 +34,7 @@ namespace Ringtoets.GrassCoverErosionInwards.Plugin.FileImporters { /// - /// An for updating + /// An for updating /// dike profiles based on imported data. /// public class GrassCoverErosionInwardsDikeProfileUpdateDataStrategy Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsDikeProfileReplaceDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsDikeProfileReplaceDataStrategyTest.cs (.../GrassCoverErosionInwardsDikeProfileReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsDikeProfileReplaceDataStrategyTest.cs (.../GrassCoverErosionInwardsDikeProfileReplaceDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -180,8 +180,6 @@ public void UpdateDikeProfilesWithImportedData_ImportedDataContainsDuplicateIDs_ThrowsUpdateException() { // Setup - var targetCollection = new DikeProfileCollection(); - const string duplicateId = "Duplicate ID it is"; DikeProfile[] importedSurfaceLines = { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs (.../HeightStructureReplaceDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureReplaceDataStrategy.cs (.../HeightStructureReplaceDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.Structures; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.Forms; @@ -35,7 +34,7 @@ namespace Ringtoets.HeightStructures.Plugin.FileImporters { /// - /// An implementation for + /// An implementation for /// updating height structures based on imported data. /// public class HeightStructureUpdateDataStrategy : UpdateDataStrategyBase, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs (.../HeightStructureReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureReplaceDataStrategyTest.cs (.../HeightStructureReplaceDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -109,7 +109,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - newSourcePath); + newSourcePath); // Assert CollectionAssert.AreEqual(new IObservable[] @@ -131,7 +131,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert CollectionAssert.IsEmpty(targetCollection); @@ -156,7 +156,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(importedStructures, - sourceFilePath); + sourceFilePath); // Assert StructureCollection actualCollection = failureMechanism.HeightStructures; @@ -234,7 +234,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsNull(calculation.InputParameters.Structure); @@ -279,7 +279,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsFalse(calculation.HasOutput); @@ -334,7 +334,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath).ToArray(); + sourceFilePath).ToArray(); // Assert Assert.IsNull(sectionResult.Calculation); @@ -358,7 +358,6 @@ new TestHeightStructure(duplicateId, "Other name") }; - var targetCollection = new StructureCollection(); var strategy = new HeightStructureReplaceDataStrategy(new HeightStructuresFailureMechanism()); // Call Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -478,7 +478,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert Assert.IsFalse(calculation.HasOutput); @@ -623,7 +623,7 @@ { readStructure }, - sourceFilePath); + sourceFilePath); // Assert AssertHeightStructures(readStructure, structure); @@ -692,7 +692,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert CollectionAssert.AreEqual(new IObservable[] Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs (.../ForeshoreProfileReplaceDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs (.../ForeshoreProfileReplaceDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -25,11 +25,9 @@ using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; -using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.FileImporters; -using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service; namespace Ringtoets.Integration.Plugin.FileImporters Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileUpdateDataStrategy.cs (.../ForeshoreProfileUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileUpdateDataStrategy.cs (.../ForeshoreProfileUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -33,7 +33,7 @@ namespace Ringtoets.Integration.Plugin.FileImporters { /// - /// An for + /// An for /// updating surface lines based on imported data. /// public class ForeshoreProfileUpdateDataStrategy : UpdateDataStrategyBase, @@ -43,10 +43,9 @@ /// Creates a new instance of . /// /// The failure mechanism in which the - /// are updated. + /// are updated. /// The foreshore profiles which will be updated. - /// Thrown when - /// is null. + /// Thrown when any input parameter is null. public ForeshoreProfileUpdateDataStrategy(IFailureMechanism failureMechanism, ForeshoreProfileCollection foreshoreProfiles) : base(failureMechanism, foreshoreProfiles, new ForeshoreProfileEqualityComparer()) {} Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileUpdateDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileUpdateDataStrategyTest.cs (.../ForeshoreProfileUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ForeshoreProfileUpdateDataStrategyTest.cs (.../ForeshoreProfileUpdateDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -521,7 +521,7 @@ new Point2D(1, 2), new Point2D(3, 4) }; - + var affectedProfile = new TestForeshoreProfile(id, geometry); TestCalculationWithForeshoreProfile affectedCalculation = TestCalculationWithForeshoreProfile.CreateCalculationWithOutput(affectedProfile); Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs =================================================================== diff -u -r5579d8fdef4f553fb4ba94160825ec960b89bab9 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 5579d8fdef4f553fb4ba94160825ec960b89bab9) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -36,14 +36,12 @@ using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.Integration.Data; using Ringtoets.Integration.Plugin.Handlers; -using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.Piping.Data; using Ringtoets.Piping.IO.Importers; using Ringtoets.Piping.Plugin.FileImporter; using Ringtoets.Piping.Primitives; -using StochasticSoilModelReplaceDataStrategy = Ringtoets.Piping.Plugin.FileImporter.StochasticSoilModelReplaceDataStrategy; using PipingSurfaceLinesCsvImporterConfigurationFactory = Ringtoets.Piping.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory; using MacroStabilityInwardsSurfaceLinesCsvImporterConfigurationFactory = Ringtoets.MacroStabilityInwards.Plugin.FileImporter.SurfaceLinesCsvImporterConfigurationFactory; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -109,15 +109,6 @@ } /// - /// Looks up a localized string similar to Profielschematisaties. - /// - public static string MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor { - get { - return ResourceManager.GetString("MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Stochastische ondergrondmodellen. /// public static string StochasticSoilModelCollection_TypeDescriptor { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -123,9 +123,6 @@ Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen. - - Profielschematisaties - Stochastische ondergrondmodellen Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/RingtoetsMacroStabilityInwardsSurfaceLineCollection.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/RingtoetsMacroStabilityInwardsSurfaceLineCollection.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineCollection.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/RingtoetsMacroStabilityInwardsSurfaceLineCollection.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineCollection.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -22,6 +22,7 @@ using Core.Common.Base; using Ringtoets.MacroStabilityInwards.Data.Properties; using Ringtoets.MacroStabilityInwards.Primitives; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Data { @@ -32,7 +33,7 @@ public class RingtoetsMacroStabilityInwardsSurfaceLineCollection : ObservableUniqueItemCollectionWithSourcePath { public RingtoetsMacroStabilityInwardsSurfaceLineCollection() : base(line => line.Name, - Resources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor, + RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor, Resources.UniqueFeature_Name_FeatureDescription) {} } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs =================================================================== diff -u -rbee45bfbe50673fef6b944b92a2cb26665d46354 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision bee45bfbe50673fef6b944b92a2cb26665d46354) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -26,6 +26,7 @@ using Ringtoets.MacroStabilityInwards.Primitives; using DataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Forms.Factories { @@ -40,7 +41,7 @@ /// The created . public static MapLineData CreateSurfaceLinesMapData() { - return new MapLineData(DataResources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor, + return new MapLineData(RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor, new LineStyle { Color = Color.DarkSeaGreen, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r357925a9ba2aebce58a9e03e620c6d470323672f -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 357925a9ba2aebce58a9e03e620c6d470323672f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -92,7 +92,7 @@ { yield return new ImportInfo { - Name = MacroStabilityInwardsDataResources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor, + Name = RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = MacroStabilityInwardsFormsResources.SurfaceLineIcon, FileFilterGenerator = SurfaceLineFileFilter, @@ -142,7 +142,7 @@ { yield return new UpdateInfo { - Name = MacroStabilityInwardsDataResources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor, + Name = RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = MacroStabilityInwardsFormsResources.SurfaceLineIcon, FileFilterGenerator = SurfaceLineFileFilter, @@ -267,7 +267,7 @@ yield return new TreeNodeInfo { - Text = context => MacroStabilityInwardsDataResources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor, + Text = context => RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor, Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon, ForeColor = context => context.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = context => context.WrappedData.Cast().ToArray(), @@ -288,8 +288,9 @@ { Text = stochasticSoilModelContext => MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor, Image = stochasticSoilModelContext => RingtoetsCommonFormsResources.GeneralFolderIcon, - ForeColor = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Any() ? - Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), + ForeColor = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Any() + ? Color.FromKnownColor(KnownColor.ControlText) + : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Cast().ToArray(), ContextMenuStrip = StochasticSoilModelCollectionContextContextMenuStrip }; @@ -966,7 +967,7 @@ { return new FileFilterGenerator( RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, - $"{MacroStabilityInwardsDataResources.MacroStabilityInwardsSurfaceLineCollection_TypeDescriptor} {RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description}"); + $"{RingtoetsCommonDataResources.SurfaceLineCollection_TypeDescriptor} {RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description}"); } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureReplaceStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureReplaceStrategy.cs (.../StabilityPointStructureReplaceStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureReplaceStrategy.cs (.../StabilityPointStructureReplaceStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.Structures; Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureUpdateDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureUpdateDataStrategy.cs (.../StabilityPointStructureUpdateDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/FileImporters/StabilityPointStructureUpdateDataStrategy.cs (.../StabilityPointStructureUpdateDataStrategy.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.Forms; @@ -35,7 +34,7 @@ namespace Ringtoets.StabilityPointStructures.Plugin.FileImporters { /// - /// An + /// An /// implementation for updating stability point structures based on imported /// data. /// Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs (.../StabilityPointStructureReplaceDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructureReplaceDataStrategyTest.cs (.../StabilityPointStructureReplaceDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -77,7 +77,7 @@ // Call TestDelegate call = () => strategy.UpdateStructuresWithImportedData(null, - sourcePath); + sourcePath); // Assert var exception = Assert.Throws(call); @@ -93,7 +93,7 @@ // Call TestDelegate call = () => strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - null); + null); // Assert var exception = Assert.Throws(call); @@ -113,7 +113,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - newSourcePath); + newSourcePath); // Assert Assert.AreEqual(newSourcePath, targetCollection.SourcePath); @@ -134,7 +134,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourcePath); + sourcePath); // Assert CollectionAssert.IsEmpty(targetCollection); @@ -156,12 +156,11 @@ new TestStabilityPointStructure(duplicateId, "Other name") }; - var targetCollection = new StructureCollection(); var strategy = new StabilityPointStructureReplaceStrategy(new StabilityPointStructuresFailureMechanism()); // Call TestDelegate call = () => strategy.UpdateStructuresWithImportedData(importedClosingStructures, - sourcePath); + sourcePath); // Assert var exception = Assert.Throws(call); @@ -186,7 +185,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(importedCollection, - sourcePath); + sourcePath); // Assert Assert.AreEqual(sourcePath, targetCollection.SourcePath); @@ -212,7 +211,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourcePath); + sourcePath); // Assert Assert.AreEqual(sourcePath, targetCollection.SourcePath); @@ -243,7 +242,7 @@ { importedStructure }, - sourcePath); + sourcePath); // Assert CollectionAssert.AreEqual(new[] @@ -283,7 +282,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourcePath); + sourcePath); // Assert Assert.IsNull(calculation.InputParameters.Structure); @@ -324,7 +323,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourcePath); + sourcePath); // Assert Assert.IsNull(calculation.InputParameters.Structure); @@ -373,7 +372,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourcePath); + sourcePath); // Assert Assert.IsNull(calculation.InputParameters.Structure); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r9540d67453c6a1caf5833d64ab651660dce11595 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresUpdateDataStrategyTest.cs (.../StabilityPointStructuresUpdateDataStrategyTest.cs) (revision 9540d67453c6a1caf5833d64ab651660dce11595) @@ -256,7 +256,7 @@ StabilityPointStructure structure = new TestStabilityPointStructure(); var failureMechanism = new StabilityPointStructuresFailureMechanism(); - var targetCollection = failureMechanism.StabilityPointStructures; + StructureCollection targetCollection = failureMechanism.StabilityPointStructures; targetCollection.AddRange(new[] { structure @@ -321,7 +321,7 @@ { readStructure }, - sourceFilePath); + sourceFilePath); // Assert Assert.IsTrue(calculation.HasOutput); @@ -449,7 +449,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert Assert.IsFalse(calculation.HasOutput); @@ -647,7 +647,7 @@ { readStructure }, - sourceFilePath); + sourceFilePath); // Assert AssertStabilityPointStructure(readStructure, structure); @@ -716,7 +716,7 @@ // Call IEnumerable affectedObjects = strategy.UpdateStructuresWithImportedData(Enumerable.Empty(), - sourceFilePath); + sourceFilePath); // Assert CollectionAssert.AreEqual(new IObservable[]