diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml index 4ff560d876..49005e1214 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml @@ -359,4 +359,46 @@ + + hello + + + + hello + + + + + + + + + + + + + + + + + + + + + + + + hello + + Overlap is not allowed + + + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap1.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap1.dfdl.xsd new file mode 100644 index 0000000000..4454005a50 --- /dev/null +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap1.dfdl.xsd @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap2.dfdl.xsd new file mode 100644 index 0000000000..dcf0ba3350 --- /dev/null +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax_overlap2.dfdl.xsd @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala index 7cef9583f7..f42bf24ac8 100644 --- a/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala +++ b/daffodil-test/src/test/scala/org/apache/daffodil/section07/property_syntax/TestPropertySyntax.scala @@ -66,6 +66,13 @@ class TestPropertySyntax { @Test def test_ignoredPropertiesWarning(): Unit = { runner1.runOneTest("ignoredPropertiesWarning") } + // DFDL-1842 + @Test def test_overlappingProperties1(): Unit = { + runner1.runOneTest("overlappingProperties1") + } + @Test def test_overlappingProperties2(): Unit = { + runner1.runOneTest("overlappingProperties2") + } @Test def test_badElementFormProperty(): Unit = { runner1.runOneTest("badElementFormProperty")