Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CombinedXmlSchemaDefinitionTest.cs =================================================================== diff -u -r85461eb2fda69be38558eb36a0d757fca4ddb125 -rc04a1ae67303b6029fe655a1fc7e57f6509e9a5f --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CombinedXmlSchemaDefinitionTest.cs (.../CombinedXmlSchemaDefinitionTest.cs) (revision 85461eb2fda69be38558eb36a0d757fca4ddb125) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CombinedXmlSchemaDefinitionTest.cs (.../CombinedXmlSchemaDefinitionTest.cs) (revision c04a1ae67303b6029fe655a1fc7e57f6509e9a5f) @@ -34,6 +34,8 @@ public class CombinedXmlSchemaDefinitionTest { private readonly string validMainSchemaDefinition; + private readonly string validNestedSchemaDefinition1; + private readonly string validNestedSchemaDefinition2; private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "CombinedXmlSchemaDefinition"); @@ -45,7 +47,15 @@ public void Constructor_EmptyMainSchemaDefinition_ThrowArgumentException(string emptyMainSchemaDefinition) { // Call - TestDelegate call = () => new CombinedXmlSchemaDefinition(emptyMainSchemaDefinition, new Dictionary()); + TestDelegate call = () => new CombinedXmlSchemaDefinition(emptyMainSchemaDefinition, new Dictionary + { + { + "NestedSchemaDefintion1.xsd", validNestedSchemaDefinition1 + }, + { + "NestedSchemaDefintion2.xsd", validNestedSchemaDefinition2 + } + }); // Assert var exception = Assert.Throws(call); @@ -73,7 +83,10 @@ TestDelegate call = () => new CombinedXmlSchemaDefinition(validMainSchemaDefinition, new Dictionary { { - "Test", emptyNestedSchemaDefinition + "NestedSchemaDefintion1.xsd", validNestedSchemaDefinition1 + }, + { + "NestedSchemaDefintion2.xsd", emptyNestedSchemaDefinition } }); @@ -97,7 +110,15 @@ string xsdPath = Path.Combine(testDirectoryPath, invalidMainSchemaDefinition); // Call - TestDelegate call = () => new CombinedXmlSchemaDefinition(File.ReadAllText(xsdPath), new Dictionary()); + TestDelegate call = () => new CombinedXmlSchemaDefinition(File.ReadAllText(xsdPath), new Dictionary + { + { + "NestedSchemaDefintion1.xsd", validNestedSchemaDefinition1 + }, + { + "NestedSchemaDefintion2.xsd", validNestedSchemaDefinition2 + } + }); // Assert var exception = Assert.Throws(call); @@ -108,6 +129,8 @@ public CombinedXmlSchemaDefinitionTest() { validMainSchemaDefinition = File.ReadAllText(Path.Combine(testDirectoryPath, "validMainSchemaDefinition.xsd")); + validNestedSchemaDefinition1 = File.ReadAllText(Path.Combine(testDirectoryPath, "validNestedSchemaDefinition1.xsd")); + validNestedSchemaDefinition2 = File.ReadAllText(Path.Combine(testDirectoryPath, "validNestedSchemaDefinition2.xsd")); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validMainSchemaDefinition.xsd =================================================================== diff -u -r85461eb2fda69be38558eb36a0d757fca4ddb125 -rc04a1ae67303b6029fe655a1fc7e57f6509e9a5f --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validMainSchemaDefinition.xsd (.../validMainSchemaDefinition.xsd) (revision 85461eb2fda69be38558eb36a0d757fca4ddb125) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validMainSchemaDefinition.xsd (.../validMainSchemaDefinition.xsd) (revision c04a1ae67303b6029fe655a1fc7e57f6509e9a5f) @@ -1,19 +1,19 @@ - + + - - + + + - + - + - - - - - + + + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition1.xsd =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition1.xsd (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition1.xsd (revision c04a1ae67303b6029fe655a1fc7e57f6509e9a5f) @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition2.xsd =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition2.xsd (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/CombinedXmlSchemaDefinition/validNestedSchemaDefinition2.xsd (revision c04a1ae67303b6029fe655a1fc7e57f6509e9a5f) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file