some testcode that should be in the testing branch, but w/e. A method to composite to xml trees,

and a unit test to test it.

5 files changed, 55 insertions, 2 deletions

diff --git a/tests/TestConfigLoaders.py b/tests/TestConfigLoaders.py
index 6ea4f59..73b4987 100644
--- a/tests/TestConfigLoaders.py
+++ b/tests/TestConfigLoaders.py
@@ -1,10 +1,25 @@
 import unittest
+import util.Config as Config
+import pdb
+from xml.etree.ElementTree import *
+import filecmp
+import xml
 class TestConfigLoaders(unittest.TestCase):
     def setUp(self):
         pass
     def tearDown(self):
         pass
-    def test_something(self):
-        pass
+    def test_composite(self):
+        parent = ElementTree()
+        overrider = ElementTree()
+        
+        parent.parse('tests/testdata/parent.xml')
+        overrider.parse('tests/testdata/override.xml')
+
+        result = Config.compositeXMLTrees(parent,overrider)
+        result = ElementTree(result)
+        result.write('tests/testdata/compositeTEST.xml')
+        assert filecmp.cmp('tests/testdata/compositeTEST.xml','tests/testdata/compositeTRUTH.xml') 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/testdata/compositeTEST.xml b/tests/testdata/compositeTEST.xml
new file mode 100644
index 0000000..ded1666
--- /dev/null
+++ b/tests/testdata/compositeTEST.xml
@@ -0,0 +1,10 @@
+<Override>
+<A>
+    <override>overide parameter</override>
+</A>
+<B OverrideBehavior="Merge">
+    <this>taht</this>
+    <that>this</that>
+<SomeNewParam>blah</SomeNewParam>
+</B>
+</Override>
\ No newline at end of file
diff --git a/tests/testdata/compositeTRUTH.xml b/tests/testdata/compositeTRUTH.xml
new file mode 100644
index 0000000..ded1666
--- /dev/null
+++ b/tests/testdata/compositeTRUTH.xml
@@ -0,0 +1,10 @@
+<Override>
+<A>
+    <override>overide parameter</override>
+</A>
+<B OverrideBehavior="Merge">
+    <this>taht</this>
+    <that>this</that>
+<SomeNewParam>blah</SomeNewParam>
+</B>
+</Override>
\ No newline at end of file
diff --git a/tests/testdata/override.xml b/tests/testdata/override.xml
new file mode 100644
index 0000000..5d703ed
--- /dev/null
+++ b/tests/testdata/override.xml
@@ -0,0 +1,8 @@
+<Override>
+<A>
+    <override>overide parameter</override>
+</A>
+<B OverrideBehavior="Merge">
+    <SomeNewParam>blah</SomeNewParam>
+</B>
+</Override>
diff --git a/tests/testdata/parent.xml b/tests/testdata/parent.xml
new file mode 100644
index 0000000..740edf0
--- /dev/null
+++ b/tests/testdata/parent.xml
@@ -0,0 +1,10 @@
+<Parent>
+<A>
+    <blah>test</blah>
+    <foo>bar</foo>
+</A>
+<B>
+    <this>taht</this>
+    <that>this</that>
+</B>
+</Parent>