Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r578d9ed2cd2330f233659f25ff91910533cabf39 -r77628d5f2ea3b6237adfca49e4f801250138243d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 578d9ed2cd2330f233659f25ff91910533cabf39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) @@ -507,40 +507,44 @@ { yield return testCaseData.SetName(testName); } + foreach (TestCaseData testCaseData in InvalidTypeTestCases()) + { + yield return testCaseData.SetName(testName); + } } private static IEnumerable InvalidTypeTestCases() { - const string message = "The '{0}' element is invalid - The value '{1}' is invalid according to its datatype '{2}'"; + const string message = "The '{0}' element is invalid - The value '{1}' is invalid according to its datatype"; const string dataTypeDouble = "Double"; foreach (NameAdapter adapter in GetNameAdaptersOfDoubleProperties()) { yield return new TestCaseData($"invalid{adapter.PropertyName}Empty.xml", - string.Format(message, adapter.ElementName, "", dataTypeDouble)); + string.Format(message, adapter.ElementName, "")); yield return new TestCaseData($"invalid{adapter.PropertyName}No{dataTypeDouble}.xml", - string.Format(message, adapter.ElementName, "string", dataTypeDouble)); + string.Format(message, adapter.ElementName, "string")); } const string dataTypeBoolean = "Boolean"; foreach (NameAdapter adapter in GetNameAdaptersOfBoolProperties()) { yield return new TestCaseData($"invalid{adapter.PropertyName}Empty.xml", - string.Format(message, adapter.ElementName, "", dataTypeBoolean)); + string.Format(message, adapter.ElementName, "")); yield return new TestCaseData($"invalid{adapter.PropertyName}No{dataTypeBoolean}.xml", - string.Format(message, adapter.ElementName, "string", dataTypeBoolean)); + string.Format(message, adapter.ElementName, "string")); } const string dataTypeInteger = "Integer"; foreach (NameAdapter adapter in GetNameAdaptersOfIntegerProperties()) { yield return new TestCaseData($"invalid{adapter.PropertyName}Empty.xml", - string.Format(message, adapter.ElementName, "", dataTypeInteger)); + string.Format(message, adapter.ElementName, "")); yield return new TestCaseData($"invalid{adapter.PropertyName}No{dataTypeInteger}.xml", - string.Format(message, adapter.ElementName, "string", dataTypeInteger)); + string.Format(message, adapter.ElementName, "string")); } - const string stringMessage = "The '{0}' element is invalid - The value '' is invalid according to its datatype 'String' - The actual length is less than the MinLength value."; + const string stringMessage = "The '{0}' element is invalid - The value '' is invalid according to its datatype"; foreach (NameAdapter adapter in GetNameAdaptersOfStringProperties()) { yield return new TestCaseData($"invalid{adapter.PropertyName}Empty.xml", @@ -640,6 +644,25 @@ yield return new NameAdapter("RightGridZBottom", "zonder"); } + private static IEnumerable GetTagElements() + { + yield return "waterspanningen"; + yield return "drainage"; + yield return "initielehoogtepl1"; + yield return "leklengtespl3"; + yield return "leklengtespl4"; + yield return "stijghoogtespl2"; + yield return "dagelijks"; + yield return "extreem"; + yield return "offsets"; + yield return "zonering"; + yield return "grids"; + yield return "tangentlijnen"; + yield return "linkergrid"; + yield return "rechtergrid"; + yield return "scenario"; + } + private static IEnumerable InvalidDuplicateElements() { const string message = "Element '{0}' cannot appear more than once if content model type is \"all\"."; @@ -649,6 +672,11 @@ yield return new TestCaseData($"invalidCalculationMultiple{adapter.PropertyName}.xml", string.Format(message, adapter.ElementName)); } + foreach (string tagElement in GetTagElements()) + { + yield return new TestCaseData($"invalidCalculationMultiple{tagElement}Tag.xml", + string.Format(message, tagElement)); + } yield return new TestCaseData("invalidContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml", string.Format(message, "hrlocatie"));