Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs (.../CalculationGroupEntityReadExtentions.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs (.../CalculationGroupEntityReadExtentions.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -65,7 +65,10 @@ throw new ArgumentNullException(nameof(generalPipingInput)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -101,7 +104,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -137,7 +143,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -173,7 +182,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -209,7 +221,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -245,7 +260,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -281,7 +299,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -317,7 +338,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { @@ -353,7 +377,10 @@ throw new ArgumentNullException(nameof(collector)); } - var group = new CalculationGroup(entity.Name); + var group = new CalculationGroup + { + Name = entity.Name + }; foreach (object childEntity in GetChildEntitiesInOrder(entity)) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -62,7 +62,10 @@ { // Setup const string name = "blaballab"; - var group = new CalculationGroup(name); + var group = new CalculationGroup + { + Name = name + }; var registry = new PersistenceRegistry(); @@ -104,16 +107,29 @@ { // Setup const string name = "blaballab"; - var group = new CalculationGroup(name); - group.Children.Add(new CalculationGroup("A") + var group = new CalculationGroup { + Name = name + }; + group.Children.Add(new CalculationGroup + { + Name = "A", Children = { - new CalculationGroup("AA"), - new CalculationGroup("AB") + new CalculationGroup + { + Name = "AA" + }, + new CalculationGroup + { + Name = "AB" + } } }); - group.Children.Add(new CalculationGroup("B")); + group.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); @@ -151,7 +167,7 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -188,16 +204,22 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new PipingCalculationScenario(generalInputParameters) { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new PipingCalculationScenario(generalInputParameters) { Name = "D" @@ -239,7 +261,7 @@ public void Create_GroupWithMacroStabilityInwardsCalculations_CreatesEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -276,16 +298,22 @@ public void Create_GroupWithChildMacroStabilityInwardsCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new MacroStabilityInwardsCalculationScenario { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new MacroStabilityInwardsCalculationScenario { Name = "D" @@ -327,7 +355,7 @@ public void Create_GroupWithChildGrassCoverErosionInwardsCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -363,16 +391,22 @@ public void Create_GroupWithChildGrassCoverErosionInwardCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new GrassCoverErosionInwardsCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new GrassCoverErosionInwardsCalculation { Name = "D" @@ -414,7 +448,7 @@ public void Create_GroupWithChildGrassCoverErosionOutwardsWaveConditionsCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -450,16 +484,22 @@ public void Create_GroupWithChildGrassCoverErosionOutwardsWaveConditionsCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new GrassCoverErosionOutwardsWaveConditionsCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new GrassCoverErosionOutwardsWaveConditionsCalculation { Name = "D" @@ -501,7 +541,7 @@ public void Create_GroupWithChildHeightStructuresCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -537,16 +577,22 @@ public void Create_GroupWithChildHeightStructuresCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new StructuresCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new StructuresCalculation { Name = "D" @@ -588,7 +634,7 @@ public void Create_GroupWithChildStabilityStoneCoverWaveConditionsCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -624,16 +670,22 @@ public void Create_GroupWithChildStabilityStoneCoverWaveConditionsCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new StabilityStoneCoverWaveConditionsCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new StabilityStoneCoverWaveConditionsCalculation { Name = "D" @@ -675,7 +727,7 @@ public void Create_GroupWithChildWaveImpactAsphaltCoverWaveConditionsCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -711,16 +763,22 @@ public void Create_GroupWithChildWaveImpactAsphaltCoverWaveConditionsCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new WaveImpactAsphaltCoverWaveConditionsCalculation { Name = "D" @@ -762,7 +820,7 @@ public void Create_GroupWithChildClosingStructuresCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -798,16 +856,22 @@ public void Create_GroupWithChildClosingStructuresCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new StructuresCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new StructuresCalculation { Name = "D" @@ -849,7 +913,7 @@ public void Create_GroupWithChildStabilityPointStructuresCalculations_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { @@ -885,16 +949,22 @@ public void Create_GroupWithChildStabilityPointStructuresCalculationsAndChildCalculationGroups_CreateEntities() { // Setup - var group = new CalculationGroup("root") + var group = new CalculationGroup { Children = { - new CalculationGroup("A"), + new CalculationGroup + { + Name = "A" + }, new StructuresCalculation { Name = "B" }, - new CalculationGroup("C"), + new CalculationGroup + { + Name = "C" + }, new StructuresCalculation { Name = "D" Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -244,7 +244,10 @@ calculation.InputParameters.HydraulicBoundaryLocation = null; var failureMechanism = new ClosingStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("A")); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); failureMechanism.CalculationsGroup.Children.Add(calculation); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -207,8 +207,14 @@ { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("A")); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("B")); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -221,8 +221,14 @@ { // Setup var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("A")); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("B")); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -288,8 +288,14 @@ { // Setup var failureMechanism = new HeightStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("A")); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("B")); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -259,7 +259,7 @@ public void Create_WithCalculationGroup_ReturnFailureMechanismWithCalculationGroupEntities() { // Setup - var calculationGroup = new CalculationGroup("A"); + var calculationGroup = new CalculationGroup(); var calculation = new MacroStabilityInwardsCalculationScenario(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -221,7 +221,7 @@ public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities() { // Setup - var calculationGroup = new CalculationGroup("A"); + var calculationGroup = new CalculationGroup(); var calculation = new PipingCalculationScenario(new GeneralPipingInput()); var failureMechanism = new PipingFailureMechanism(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -277,7 +277,10 @@ calculation.InputParameters.HydraulicBoundaryLocation = null; var failureMechanism = new StabilityPointStructuresFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("A")); + failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); failureMechanism.CalculationsGroup.Children.Add(calculation); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -201,8 +201,14 @@ { // Setup var failureMechanism = new StabilityStoneCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("A")); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("B")); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -200,8 +200,14 @@ { // Setup var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("A")); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup("B")); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "A" + }); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup + { + Name = "B" + }); var registry = new PersistenceRegistry(); Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -45,7 +45,10 @@ public ClosingStructuresFailureMechanism() : base(Resources.ClosingStructuresFailureMechanism_DisplayName, Resources.ClosingStructuresFailureMechanism_Code) { - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; GeneralInput = new GeneralClosingStructuresInput(); ClosingStructures = new StructureCollection(); sectionResults = new List(); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -75,13 +75,15 @@ .SetName("Calculation configuration with use breakwater true"); yield return new TestCaseData("folderWithSubfolderAndCalculation", new[] { - new CalculationGroup("Testmap") + new CalculationGroup { + Name = "Testmap", Children = { CreateFullCalculation(), - new CalculationGroup("Nested") + new CalculationGroup { + Name = "Nested", Children = { CreateSparseCalculation() Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs (.../ClosingStructureDataSynchronizationServiceTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -351,7 +351,7 @@ Children = { calculation1, - new CalculationGroup("B") + new CalculationGroup { Children = { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs (.../CalculationGroup.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/CalculationGroup.cs (.../CalculationGroup.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -32,18 +32,11 @@ public class CalculationGroup : CloneableObservable, ICalculationBase { /// - /// Creates a new instance of the class - /// with a default name. - /// - public CalculationGroup() : this(Resources.CalculationGroup_DefaultName) {} - - /// /// Creates a new instance of the class. /// - /// The name of the group. - public CalculationGroup(string newName) + public CalculationGroup() { - Name = newName; + Name = Resources.CalculationGroup_DefaultName; Children = new List(); } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -387,7 +387,10 @@ /// to parse is not valid. private CalculationGroup ParseReadCalculationGroup(CalculationGroupConfiguration readCalculationGroup) { - var calculationGroup = new CalculationGroup(readCalculationGroup.Name); + var calculationGroup = new CalculationGroup + { + Name = readCalculationGroup.Name + }; foreach (IConfigurationItem item in readCalculationGroup.Items) { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs (.../CalculationGroupTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs (.../CalculationGroupTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -32,7 +32,7 @@ public class CalculationGroupTest { [Test] - public void DefaultConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Call var group = new CalculationGroup(); @@ -46,20 +46,6 @@ } [Test] - public void ParameteredConstructor_ExpectedValues() - { - // Setup - const string newName = "new Name"; - - // Call - var group = new CalculationGroup(newName); - - // Assert - Assert.AreEqual(newName, group.Name); - CollectionAssert.IsEmpty(group.Children); - } - - [Test] public void Children_AddCalculation_CalculationAddedToCollection() { // Setup @@ -187,8 +173,9 @@ public void Clone_Always_ReturnNewInstanceWithCopiedValues() { // Setup - var original = new CalculationGroup("Random group name") + var original = new CalculationGroup { + Name = "Random group name", Children = { new TestCalculationBase Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs (.../RingtoetsTreeNodeInfoFactoryTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -696,7 +696,7 @@ { // Setup var calculationToBeRemoved = new TestCalculation(); - var group = new CalculationGroup(""); + var group = new CalculationGroup(); group.Children.Add(calculationToBeRemoved); var mocks = new MockRepository(); @@ -721,7 +721,7 @@ { // Setup var calculationToBeRemoved = new TestCalculation(); - var group = new CalculationGroup(""); + var group = new CalculationGroup(); var mocks = new MockRepository(); var failureMechanism = mocks.StrictMock(); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -891,12 +891,14 @@ private static CalculationGroup GetExpectedNestedData() { - return new CalculationGroup("Root") + return new CalculationGroup { + Name = "Root", Children = { - new CalculationGroup("Group 1") + new CalculationGroup { + Name = "Group 1", Children = { new TestCalculation @@ -909,12 +911,14 @@ { Name = "Calculation 1" }, - new CalculationGroup("Group 2") + new CalculationGroup { + Name = "Group 2", Children = { - new CalculationGroup("Group 4") + new CalculationGroup { + Name = "Group 4", Children = { new TestCalculation @@ -933,7 +937,10 @@ { Name = "Calculation 2" }, - new CalculationGroup("Group 3") + new CalculationGroup + { + Name = "Group 3" + } } }; } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -42,7 +42,10 @@ public GrassCoverErosionInwardsFailureMechanism() : base(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayName, Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode) { - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; GeneralInput = new GeneralGrassCoverErosionInwardsInput(); sectionResults = new List(); DikeProfiles = new DikeProfileCollection(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -51,16 +51,18 @@ Name = "Berekening 2" }; - var calculationGroup2 = new CalculationGroup("Nested") + var calculationGroup2 = new CalculationGroup { + Name = "Nested", Children = { calculation2 } }; - var calculationGroup = new CalculationGroup("Testmap") + var calculationGroup = new CalculationGroup { + Name = "Testmap", Children = { calculation, Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -48,7 +48,10 @@ { sectionResults = new List(); GeneralInput = new GeneralGrassCoverErosionOutwardsInput(); - WaveConditionsCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + WaveConditionsCalculationGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; HydraulicBoundaryLocations = new ObservableList(); ForeshoreProfiles = new ForeshoreProfileCollection(); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -64,16 +64,18 @@ } }; - var calculationGroup2 = new CalculationGroup("PK001_0002") + var calculationGroup2 = new CalculationGroup { + Name = "PK001_0002", Children = { calculation2 } }; - var calculationGroup = new CalculationGroup("PK001_0001") + var calculationGroup = new CalculationGroup { + Name = "PK001_0001", Children = { calculation1, Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -45,7 +45,10 @@ : base(Resources.HeightStructuresFailureMechanism_DisplayName, Resources.HeightStructuresFailureMechanism_Code) { sectionResults = new List(); - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; GeneralInput = new GeneralHeightStructuresInput(); HeightStructures = new StructureCollection(); ForeshoreProfiles = new ForeshoreProfileCollection(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs (.../HeightStructuresCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs (.../HeightStructuresCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -75,13 +75,15 @@ .SetName("Calculation configuration with use breakwater true"); yield return new TestCaseData("folderWithSubfolderAndCalculation", new[] { - new CalculationGroup("Testmap") + new CalculationGroup { + Name = "Testmap", Children = { CreateFullCalculation(), - new CalculationGroup("Nested") + new CalculationGroup { + Name = "Nested", Children = { CreateSparseCalculation() Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs (.../HeightStructuresDataSynchronizationServiceTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs (.../HeightStructuresDataSynchronizationServiceTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -353,7 +353,7 @@ Children = { calculation1, - new CalculationGroup("B") + new CalculationGroup { Children = { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationGroupContextProperties.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationGroupContextProperties.cs (.../CalculationGroupContextProperties.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/CalculationGroupContextProperties.cs (.../CalculationGroupContextProperties.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -37,8 +37,6 @@ [ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationGroupContextProperties_DisplayName))] public class CalculationGroupContextProperties : ObjectProperties> { - private readonly bool isNameEditable; - /// /// Creates a new instance of the class. /// @@ -51,7 +49,6 @@ } Data = calculationContext; - isNameEditable = calculationContext.Parent != null; } [DynamicReadOnly] @@ -74,7 +71,7 @@ [DynamicReadOnlyValidationMethod] public bool DynamicReadOnlyValidator(string propertyName) { - return !isNameEditable; + return data.Parent == null; } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/CalculationGroupContextPropertiesTest.cs (.../CalculationGroupContextPropertiesTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -21,9 +21,7 @@ using System; using System.ComponentModel; -using System.Reflection; using Core.Common.Base; -using Core.Common.Gui.Attributes; using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; @@ -78,9 +76,10 @@ var calculationGroup = new CalculationGroup(); + // Call var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(calculationGroup, new CalculationGroup(), failureMechanism)); - // Call & Assert + // Assert Assert.AreEqual(calculationGroup.Name, properties.Name); mocks.VerifyAll(); } @@ -100,9 +99,10 @@ calculationGroup.Attach(projectObserver); + // Call var properties = new CalculationGroupContextProperties(testCalculationGroupContext); - // Call & Assert + // Assert const string name = "cool new name!"; properties.Name = name; Assert.AreEqual(name, calculationGroup.Name); @@ -118,7 +118,7 @@ mocks.ReplayAll(); // Call - var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup("A"), + var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup(), new CalculationGroup(), failureMechanism)); @@ -134,38 +134,38 @@ } [Test] - public void DynamicReadOnlyValidator_WithParentCalculationGroup_ReturnsExpectedResult() + public void DynamicReadOnlyValidator_WithParentCalculationGroup_ReturnsFalse() { // Setup var mocks = new MockRepository(); var failureMechanism = mocks.StrictMock(); mocks.ReplayAll(); - var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup("A"), + var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup(), new CalculationGroup(), failureMechanism)); // Call - bool isReadOnly = properties.DynamicReadOnlyValidator(string.Empty); + bool isReadOnly = properties.DynamicReadOnlyValidator(null); // Assert Assert.IsFalse(isReadOnly); } [Test] - public void DynamicReadOnlyValidator_WithoutParentCalculationGroup_ReturnsExpectedResult() + public void DynamicReadOnlyValidator_WithoutParentCalculationGroup_ReturnsTrue() { // Setup var mocks = new MockRepository(); var failureMechanism = mocks.StrictMock(); mocks.ReplayAll(); - var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup("A"), + var properties = new CalculationGroupContextProperties(new TestCalculationGroupContext(new CalculationGroup(), null, failureMechanism)); // Call - bool isReadOnly = properties.DynamicReadOnlyValidator(string.Empty); + bool isReadOnly = properties.DynamicReadOnlyValidator(null); // Assert Assert.IsTrue(isReadOnly); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -44,7 +44,10 @@ MacroStabilityInwardsProbabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput(); SurfaceLines = new MacroStabilityInwardsSurfaceLineCollection(); StochasticSoilModels = new MacroStabilityInwardsStochasticSoilModelCollection(); - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; sectionResults = new List(); } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -105,7 +105,10 @@ private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels) { - var calculationGroup = new CalculationGroup(surfaceLine.Name); + var calculationGroup = new CalculationGroup + { + Name = surfaceLine.Name + }; IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (MacroStabilityInwardsStochasticSoilModel stochasticSoilModel in stochasticSoilModels) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -1181,7 +1181,7 @@ MacroStabilityInwardsCalculationsView macroStabilityInwardsCalculationsView = ShowMacroStabilityInwardsCalculationsView(); - macroStabilityInwardsCalculationsView.Data = new CalculationGroup("Group") + macroStabilityInwardsCalculationsView.Data = new CalculationGroup { Children = { @@ -1235,7 +1235,7 @@ MacroStabilityInwardsCalculationsView macroStabilityInwardsCalculationsView = ShowMacroStabilityInwardsCalculationsView(); - macroStabilityInwardsCalculationsView.Data = new CalculationGroup("Group") + macroStabilityInwardsCalculationsView.Data = new CalculationGroup { Children = { @@ -1324,7 +1324,7 @@ private static CalculationGroup ConfigureCalculationGroup(IAssessmentSection assessmentSection, MacroStabilityInwardsFailureMechanism failureMechanism) { MacroStabilityInwardsStochasticSoilModel stochasticSoilModelForCalculation2 = failureMechanism.StochasticSoilModels.Last(); - return new CalculationGroup("Group") + return new CalculationGroup { Children = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -334,7 +334,7 @@ MacroStabilityInwardsScenariosView macroStabilityInwardsScenarioView = ShowMacroStabilityInwardsScenarioView(); - macroStabilityInwardsScenarioView.Data = new CalculationGroup("Group") + macroStabilityInwardsScenarioView.Data = new CalculationGroup { Children = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -71,13 +71,15 @@ .SetName(testNameFormat); yield return new TestCaseData( "folderWithSubfolderAndCalculation", - new CalculationGroup("PK001_0001") + new CalculationGroup { + Name = "PK001_0001", Children = { MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationScenario(), - new CalculationGroup("PK001_0002") + new CalculationGroup { + Name = "PK001_0002", Children = { MacroStabilityInwardsTestDataGenerator.GetMacroStabilityInwardsCalculationScenario() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -108,7 +108,7 @@ Assert.AreEqual(19, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[hydraulicBoundaryLocationsColumnIndex]).Items.Count); // Add group and ensure the data grid view is not changed - var nestedCalculationGroup = new CalculationGroup("New group"); + var nestedCalculationGroup = new CalculationGroup(); assessmentSection.MacroStabilityInwards.CalculationsGroup.Children.Add(nestedCalculationGroup); assessmentSection.MacroStabilityInwards.CalculationsGroup.NotifyObservers(); Assert.AreEqual(1, dataGridView.Rows.Count); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -97,7 +97,7 @@ dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add group and ensure the data grid view is not changed - var nestedCalculationGroup = new CalculationGroup("New group"); + var nestedCalculationGroup = new CalculationGroup(); assessmentSection.MacroStabilityInwards.CalculationsGroup.Children.Add(nestedCalculationGroup); assessmentSection.MacroStabilityInwards.CalculationsGroup.NotifyObservers(); Assert.AreEqual("-", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -370,7 +370,7 @@ var elementToBeRemoved = new MacroStabilityInwardsCalculationScenario(); - var group = new CalculationGroup(""); + var group = new CalculationGroup(); group.Children.Add(elementToBeRemoved); group.Children.Add(new MacroStabilityInwardsCalculationScenario()); group.Attach(observer); @@ -422,7 +422,7 @@ } }; - var group = new CalculationGroup(""); + var group = new CalculationGroup(); group.Children.Add(elementToBeRemoved); group.Children.Add(new MacroStabilityInwardsCalculationScenario()); group.Attach(observer); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -45,7 +45,10 @@ GeneralInput = new GeneralPipingInput(); SurfaceLines = new PipingSurfaceLineCollection(); StochasticSoilModels = new PipingStochasticSoilModelCollection(); - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; sectionResults = new List(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -116,7 +116,10 @@ IEnumerable soilModels, GeneralPipingInput generalInput) { - var calculationGroup = new CalculationGroup(surfaceLine.Name); + var calculationGroup = new CalculationGroup + { + Name = surfaceLine.Name + }; IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (PipingStochasticSoilModel stochasticSoilModel in stochasticSoilModels) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -1355,7 +1355,7 @@ PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(); - pipingCalculationsView.Data = new CalculationGroup("Group") + pipingCalculationsView.Data = new CalculationGroup { Children = { @@ -1409,7 +1409,7 @@ PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(); - pipingCalculationsView.Data = new CalculationGroup("Group") + pipingCalculationsView.Data = new CalculationGroup { Children = { @@ -1502,7 +1502,7 @@ private static CalculationGroup ConfigureCalculationGroup(IAssessmentSection assessmentSection, PipingFailureMechanism failureMechanism) { PipingStochasticSoilModel stochasticSoilModelForCalculation2 = failureMechanism.StochasticSoilModels.Last(); - return new CalculationGroup("Group") + return new CalculationGroup { Children = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -52,20 +52,6 @@ private const int failureProbabilitySellmeijerColumnIndex = 6; private Form testForm; - public override void Setup() - { - base.Setup(); - - testForm = new Form(); - } - - public override void TearDown() - { - base.TearDown(); - - testForm.Dispose(); - } - [Test] public void Constructor_DefaultValues() { @@ -272,6 +258,20 @@ Assert.IsEmpty(dataGridView.Rows[0].ErrorText); } + public override void Setup() + { + base.Setup(); + + testForm = new Form(); + } + + public override void TearDown() + { + base.TearDown(); + + testForm.Dispose(); + } + [TestCase(isRelevantColumnIndex, true)] [TestCase(contributionColumnIndex, 30.0)] public void PipingScenarioView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified(int cellIndex, object newValue) @@ -343,7 +343,7 @@ PipingScenariosView pipingScenarioView = ShowPipingScenarioView(); - pipingScenarioView.Data = new CalculationGroup("Group") + pipingScenarioView.Data = new CalculationGroup { Children = { Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -71,13 +71,15 @@ .SetName(testNameFormat); yield return new TestCaseData( "folderWithSubfolderAndCalculation", - new CalculationGroup("PK001_0001") + new CalculationGroup { + Name = "PK001_0001", Children = { PipingTestDataGenerator.GetPipingCalculationScenario(), - new CalculationGroup("PK001_0002") + new CalculationGroup { + Name = "PK001_0002", Children = { PipingTestDataGenerator.GetPipingCalculationScenario() Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -111,7 +111,7 @@ Assert.AreEqual(19, ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[hydraulicBoundaryLocationsColumnIndex]).Items.Count); // Add group and ensure the data grid view is not changed - var nestedPipingCalculationGroup = new CalculationGroup("New group"); + var nestedPipingCalculationGroup = new CalculationGroup(); assessmentSection.Piping.CalculationsGroup.Children.Add(nestedPipingCalculationGroup); assessmentSection.Piping.CalculationsGroup.NotifyObservers(); Assert.AreEqual(1, dataGridView.Rows.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -97,7 +97,7 @@ dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add group and ensure the data grid view is not changed - var nestedPipingCalculationGroup = new CalculationGroup("New group"); + var nestedPipingCalculationGroup = new CalculationGroup(); assessmentSection.Piping.CalculationsGroup.Children.Add(nestedPipingCalculationGroup); assessmentSection.Piping.CalculationsGroup.NotifyObservers(); Assert.AreEqual("-", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -774,7 +774,7 @@ var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput()); - var group = new CalculationGroup(""); + var group = new CalculationGroup(); group.Children.Add(elementToBeRemoved); group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())); group.Attach(observer); @@ -826,7 +826,7 @@ } }; - var group = new CalculationGroup(""); + var group = new CalculationGroup(); group.Children.Add(elementToBeRemoved); group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput())); group.Attach(observer); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -45,7 +45,10 @@ public StabilityPointStructuresFailureMechanism() : base(Resources.StabilityPointStructuresFailureMechanism_DisplayName, Resources.StabilityPointStructuresFailureMechanism_Code) { - CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName); + CalculationsGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName + }; GeneralInput = new GeneralStabilityPointStructuresInput(); StabilityPointStructures = new StructureCollection(); sectionResults = new List(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -60,13 +60,15 @@ .SetName("Calculation configuration with all parameters set"); yield return new TestCaseData("folderWithSubfolderAndCalculation", new[] { - new CalculationGroup("Testmap") + new CalculationGroup { + Name = "Testmap", Children = { CreateFullCalculation(), - new CalculationGroup("Nested") + new CalculationGroup { + Name = "Nested", Children = { CreateSparseCalculation() Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresDataSynchronizationServiceTest.cs (.../StabilityPointStructuresDataSynchronizationServiceTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -267,7 +267,7 @@ Children = { calculation1, - new CalculationGroup("B") + new CalculationGroup { Children = { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -44,7 +44,10 @@ : base(Resources.StabilityStoneCoverFailureMechanism_DisplayName, Resources.StabilityStoneCoverFailureMechanism_Code) { sectionResults = new List(); - WaveConditionsCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName); + WaveConditionsCalculationGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName + }; GeneralInput = new GeneralStabilityStoneCoverWaveConditionsInput(); ForeshoreProfiles = new ForeshoreProfileCollection(); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -64,16 +64,18 @@ } }; - var calculationGroup2 = new CalculationGroup("PK001_0002") + var calculationGroup2 = new CalculationGroup { + Name = "PK001_0002", Children = { calculation2 } }; - var calculationGroup = new CalculationGroup("PK001_0001") + var calculationGroup = new CalculationGroup { + Name = "PK001_0001", Children = { calculation1, Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -45,7 +45,10 @@ : base(Resources.WaveImpactAsphaltCoverFailureMechanism_DisplayName, Resources.WaveImpactAsphaltCoverFailureMechanism_Code) { sectionResults = new List(); - WaveConditionsCalculationGroup = new CalculationGroup(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName); + WaveConditionsCalculationGroup = new CalculationGroup + { + Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName + }; ForeshoreProfiles = new ForeshoreProfileCollection(); GeneralInput = new GeneralWaveConditionsInput(1.0, 0.0, 0.0); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverCalculationConfigurationExporterTest.cs =================================================================== diff -u -r43b4218e6e71896eb4f3985555258caeb4c7f6f7 -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverCalculationConfigurationExporterTest.cs) (revision 43b4218e6e71896eb4f3985555258caeb4c7f6f7) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) @@ -64,16 +64,18 @@ } }; - var calculationGroup2 = new CalculationGroup("PK001_0002") + var calculationGroup2 = new CalculationGroup { + Name = "PK001_0002", Children = { calculation2 } }; - var calculationGroup = new CalculationGroup("PK001_0001") + var calculationGroup = new CalculationGroup { + Name = "PK001_0001", Children = { calculation1,