aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2010-12-29 17:27:33 -0500
committerGravatar rcoh <rcoh@mit.edu>2010-12-29 17:27:33 -0500
commit93dfb8e3003b483c1041c6f7b4ff293935aeb7c0 (patch)
tree6b0e336f664fa519cad164756b68840e56b50b16 /tests
parentc8209d01f9ddf4c6670caee08073924cb33e447f (diff)
Inheritence now happens at all levels on reading of config files. No additional resolution of
inheritances should be necessary. RCOH
Diffstat (limited to 'tests')
-rw-r--r--tests/testdata/inheritanceTEST.xml21
-rw-r--r--tests/testdata/inheritanceTESTout.xml14
-rw-r--r--tests/testdata/inheritanceTRUTH.xml14
3 files changed, 46 insertions, 3 deletions
diff --git a/tests/testdata/inheritanceTEST.xml b/tests/testdata/inheritanceTEST.xml
index c2efd71..d90e9af 100644
--- a/tests/testdata/inheritanceTEST.xml
+++ b/tests/testdata/inheritanceTEST.xml
@@ -1,3 +1,22 @@
<A>
- <InheritsFrom>tests/testdata/aParent.xml</InheritsFrom>
+ <B>
+ <SubB>
+ <SubSubB>
+ <A>
+ <InheritsFrom>tests/testdata/aParent.xml</InheritsFrom>
+ </A>
+ </SubSubB>
+ </SubB>
+ <A>
+ <InheritsFrom>tests/testdata/aParent.xml</InheritsFrom>
+ </A>
+ </B>
</A>
+
+<!--
+<Parent>
+ <A>
+ <InheritsFrom>tests/testdata/aParent.xml</InheritsFrom>
+ </A>
+</Parent>
+-->
diff --git a/tests/testdata/inheritanceTESTout.xml b/tests/testdata/inheritanceTESTout.xml
index ffa6667..e8fb228 100644
--- a/tests/testdata/inheritanceTESTout.xml
+++ b/tests/testdata/inheritanceTESTout.xml
@@ -1,4 +1,16 @@
<A>
- <param1>1</param1>
+ <B>
+ <SubB>
+ <SubSubB>
+ <A>
+ <param1>1</param1>
<param2>2</param2>
+</A>
+ </SubSubB>
+ </SubB>
+ <A>
+ <param1>1</param1>
+ <param2>2</param2>
+</A>
+ </B>
</A> \ No newline at end of file
diff --git a/tests/testdata/inheritanceTRUTH.xml b/tests/testdata/inheritanceTRUTH.xml
index ffa6667..e8fb228 100644
--- a/tests/testdata/inheritanceTRUTH.xml
+++ b/tests/testdata/inheritanceTRUTH.xml
@@ -1,4 +1,16 @@
<A>
- <param1>1</param1>
+ <B>
+ <SubB>
+ <SubSubB>
+ <A>
+ <param1>1</param1>
<param2>2</param2>
+</A>
+ </SubSubB>
+ </SubB>
+ <A>
+ <param1>1</param1>
+ <param2>2</param2>
+</A>
+ </B>
</A> \ No newline at end of file