Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -rcecb97ce5adb57cec9f89b557d6fafce09c9ed65 -rd3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision cecb97ce5adb57cec9f89b557d6fafce09c9ed65) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision d3eaf9dfba5fcc97f9a4b2e901e37ea83387bac2) @@ -71,16 +71,15 @@ } [Test] - [TestCase("A", 1)] - [TestCase("b", 0)] + [TestCase("A")] + [TestCase("b")] public void ReadAsPipingCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { - Name = name, - IsEditable = isEditable + Name = name }; var collector = new ReadConversionCollector(); @@ -91,7 +90,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -107,25 +105,21 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 }, new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 }, new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 } }, @@ -142,25 +136,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -284,16 +273,15 @@ } [Test] - [TestCase("HAbba", 1)] - [TestCase("Dooeis", 0)] + [TestCase("HAbba")] + [TestCase("Dooeis")] public void ReadAsGrassCoverErosionInwardsCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { - Name = name, - IsEditable = isEditable + Name = name }; var collector = new ReadConversionCollector(); @@ -303,7 +291,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -319,19 +306,16 @@ new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 }, new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 } }, @@ -340,7 +324,6 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 } } @@ -353,25 +336,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -489,16 +467,15 @@ } [Test] - [TestCase("HAbba", 1)] - [TestCase("Dooeis", 0)] + [TestCase("HAbba")] + [TestCase("Dooeis")] public void ReadAsGrassCoverErosionOutwardsWaveConditionsCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { - Name = name, - IsEditable = isEditable + Name = name }; var collector = new ReadConversionCollector(); @@ -508,7 +485,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -524,19 +500,16 @@ new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 }, new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 } }, @@ -545,7 +518,6 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 } } @@ -558,25 +530,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -694,16 +661,15 @@ } [Test] - [TestCase("HAbba", 1)] - [TestCase("Dooeis", 0)] + [TestCase("HAbba")] + [TestCase("Dooeis")] public void ReadAsHeightStructuresCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { Name = name, - IsEditable = isEditable }; var collector = new ReadConversionCollector(); @@ -713,7 +679,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -729,19 +694,16 @@ new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 }, new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 } }, @@ -750,7 +712,6 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 } } @@ -763,25 +724,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -899,16 +855,15 @@ } [Test] - [TestCase("HAbba", 1)] - [TestCase("Dooeis", 0)] + [TestCase("HAbba")] + [TestCase("Dooeis")] public void ReadAsStabilityStoneCoverWaveConditionsCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { Name = name, - IsEditable = isEditable }; var collector = new ReadConversionCollector(); @@ -918,7 +873,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -934,19 +888,16 @@ new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 }, new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 } }, @@ -955,7 +906,6 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 } } @@ -968,25 +918,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } @@ -1104,16 +1049,15 @@ } [Test] - [TestCase("HAbba", 1)] - [TestCase("Dooeis", 0)] + [TestCase("HAbba")] + [TestCase("Dooeis")] public void ReadAsWaveImpactAsphaltCoverWaveConditionsCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - string name, byte isEditable) + string name) { // Setup var entity = new CalculationGroupEntity { Name = name, - IsEditable = isEditable }; var collector = new ReadConversionCollector(); @@ -1123,7 +1067,6 @@ // Assert Assert.AreEqual(name, group.Name); - Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable); CollectionAssert.IsEmpty(group.Children); } @@ -1139,19 +1082,16 @@ new CalculationGroupEntity { Name = "AB", - IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { Name = "ABA", - IsEditable = 0, Order = 0 }, new CalculationGroupEntity { Name = "ABB", - IsEditable = 1, Order = 1 } }, @@ -1160,7 +1100,6 @@ new CalculationGroupEntity { Name = "AA", - IsEditable = 1, Order = 0 } } @@ -1173,25 +1112,20 @@ // Assert Assert.AreEqual("A", rootGroup.Name); - Assert.IsFalse(rootGroup.IsNameEditable); ICalculationBase[] rootChildren = rootGroup.Children.ToArray(); var rootChildGroup1 = (CalculationGroup) rootChildren[0]; Assert.AreEqual("AA", rootChildGroup1.Name); - Assert.IsTrue(rootChildGroup1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1.Children); var rootChildGroup2 = (CalculationGroup) rootChildren[1]; Assert.AreEqual("AB", rootChildGroup2.Name); - Assert.IsFalse(rootChildGroup2.IsNameEditable); ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray(); var rootChildGroup1Child1 = (CalculationGroup) rootChildGroup2Children[0]; Assert.AreEqual("ABA", rootChildGroup1Child1.Name); - Assert.IsFalse(rootChildGroup1Child1.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child1.Children); var rootChildGroup1Child2 = (CalculationGroup) rootChildGroup2Children[1]; Assert.AreEqual("ABB", rootChildGroup1Child2.Name); - Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); }