diff options
author | rcoh <rcoh@mit.edu> | 2010-12-26 14:38:25 -0500 |
---|---|---|
committer | rcoh <rcoh@mit.edu> | 2010-12-26 14:38:25 -0500 |
commit | bbb31f8213d61b7c91d8b17c543d12491dd2df1b (patch) | |
tree | 587be5cb3b64fb5797dc311ac082e3e7503635c2 /tests | |
parent | b09a41f0891c041ad4fcecca59d03f52fe9ee9e8 (diff) |
a bugfix in APL. Support and a unit test for behavior inheritance. It now happens automatically
when the config is loaded. Simply use Config.loadConfigFile(fileName) to leverage the
functionality.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/TestConfigLoaders.py | 10 | ||||
-rw-r--r-- | tests/testdata/aParent.xml | 4 | ||||
-rw-r--r-- | tests/testdata/compositeTEST.xml | 3 | ||||
-rw-r--r-- | tests/testdata/compositeTESTout.xml | 13 | ||||
-rw-r--r-- | tests/testdata/compositeTRUTH.xml | 3 | ||||
-rw-r--r-- | tests/testdata/inheritanceTEST.xml | 3 | ||||
-rw-r--r-- | tests/testdata/inheritanceTESTout.xml | 4 | ||||
-rw-r--r-- | tests/testdata/inheritanceTRUTH.xml | 4 | ||||
-rw-r--r-- | tests/testdata/override.xml | 5 |
9 files changed, 47 insertions, 2 deletions
diff --git a/tests/TestConfigLoaders.py b/tests/TestConfigLoaders.py index 73b4987..17fc2d9 100644 --- a/tests/TestConfigLoaders.py +++ b/tests/TestConfigLoaders.py @@ -18,8 +18,14 @@ class TestConfigLoaders(unittest.TestCase): 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') + result.write('tests/testdata/compositeTESTout.xml') + assert filecmp.cmp('tests/testdata/compositeTESTout.xml','tests/testdata/compositeTRUTH.xml') + def test_inheritance(self): + result = Config.loadConfigFile('tests/testdata/inheritanceTEST.xml') + + result.write('tests/testdata/inheritanceTESTout.xml') + assert filecmp.cmp('tests/testdata/inheritanceTESTout.xml',\ + 'tests/testdata/inheritanceTRUTH.xml') if __name__ == '__main__': unittest.main() diff --git a/tests/testdata/aParent.xml b/tests/testdata/aParent.xml new file mode 100644 index 0000000..b07c192 --- /dev/null +++ b/tests/testdata/aParent.xml @@ -0,0 +1,4 @@ +<A> + <param1>1</param1> + <param2>2</param2> +</A> diff --git a/tests/testdata/compositeTEST.xml b/tests/testdata/compositeTEST.xml index ded1666..435b75a 100644 --- a/tests/testdata/compositeTEST.xml +++ b/tests/testdata/compositeTEST.xml @@ -7,4 +7,7 @@ <that>this</that> <SomeNewParam>blah</SomeNewParam> </B> +<A> + <someparam>appenedA</someparam> + </A> </Override>
\ No newline at end of file diff --git a/tests/testdata/compositeTESTout.xml b/tests/testdata/compositeTESTout.xml new file mode 100644 index 0000000..435b75a --- /dev/null +++ b/tests/testdata/compositeTESTout.xml @@ -0,0 +1,13 @@ +<Override> +<A> + <override>overide parameter</override> +</A> +<B OverrideBehavior="Merge"> + <this>taht</this> + <that>this</that> +<SomeNewParam>blah</SomeNewParam> +</B> +<A> + <someparam>appenedA</someparam> + </A> +</Override>
\ No newline at end of file diff --git a/tests/testdata/compositeTRUTH.xml b/tests/testdata/compositeTRUTH.xml index ded1666..435b75a 100644 --- a/tests/testdata/compositeTRUTH.xml +++ b/tests/testdata/compositeTRUTH.xml @@ -7,4 +7,7 @@ <that>this</that> <SomeNewParam>blah</SomeNewParam> </B> +<A> + <someparam>appenedA</someparam> + </A> </Override>
\ No newline at end of file diff --git a/tests/testdata/inheritanceTEST.xml b/tests/testdata/inheritanceTEST.xml new file mode 100644 index 0000000..c2efd71 --- /dev/null +++ b/tests/testdata/inheritanceTEST.xml @@ -0,0 +1,3 @@ +<A> + <InheritsFrom>tests/testdata/aParent.xml</InheritsFrom> +</A> diff --git a/tests/testdata/inheritanceTESTout.xml b/tests/testdata/inheritanceTESTout.xml new file mode 100644 index 0000000..ffa6667 --- /dev/null +++ b/tests/testdata/inheritanceTESTout.xml @@ -0,0 +1,4 @@ +<A> + <param1>1</param1> + <param2>2</param2> +</A>
\ No newline at end of file diff --git a/tests/testdata/inheritanceTRUTH.xml b/tests/testdata/inheritanceTRUTH.xml new file mode 100644 index 0000000..ffa6667 --- /dev/null +++ b/tests/testdata/inheritanceTRUTH.xml @@ -0,0 +1,4 @@ +<A> + <param1>1</param1> + <param2>2</param2> +</A>
\ No newline at end of file diff --git a/tests/testdata/override.xml b/tests/testdata/override.xml index 5d703ed..1108fb0 100644 --- a/tests/testdata/override.xml +++ b/tests/testdata/override.xml @@ -5,4 +5,9 @@ <B OverrideBehavior="Merge"> <SomeNewParam>blah</SomeNewParam> </B> +<APPEND> + <A> + <someparam>appenedA</someparam> + </A> +</APPEND> </Override> |