diff options
| author |  rcoh <rcoh@mit.edu> | 2011-01-02 10:23:48 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-01-02 10:23:48 -0500 |
| commit | b02b461c2a6b94fa9b27d26bfa4918f39769363c (patch) | |
| tree | 41b66b694594ee5b1b269de2c3b6d2ce33c3515d /tests | |
| parent | 93dfb8e3003b483c1041c6f7b4ff293935aeb7c0 (diff) | |
Changed default mode of xml merging to merge instead of replace. Added some syntactic sugar in xml
file -- attributes on Class-Level items will be automatically added to their args dict. This is
designed for easy specification of Id etc. when you are Inheriting from another class.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testdata/compositeTESTout.xml | 10 | ||||
| -rw-r--r-- | tests/testdata/compositeTRUTH.xml | 10 | ||||
| -rw-r--r-- | tests/testdata/inheritanceTESTout.xml | 2 | ||||
| -rw-r--r-- | tests/testdata/override.xml | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/tests/testdata/compositeTESTout.xml b/tests/testdata/compositeTESTout.xml index 435b75a..a306190 100644 --- a/tests/testdata/compositeTESTout.xml +++ b/tests/testdata/compositeTESTout.xml @@ -1,11 +1,11 @@ <Override> <A> - <override>overide parameter</override> + <blah>test</blah> + <foo>bar</foo> +<override>overide parameter</override> </A> -<B OverrideBehavior="Merge"> - <this>taht</this> - <that>this</that> -<SomeNewParam>blah</SomeNewParam> +<B OverrideBehavior="Replace"> + <SomeNewParam>blah</SomeNewParam> </B> <A> <someparam>appenedA</someparam> diff --git a/tests/testdata/compositeTRUTH.xml b/tests/testdata/compositeTRUTH.xml index 435b75a..a306190 100644 --- a/tests/testdata/compositeTRUTH.xml +++ b/tests/testdata/compositeTRUTH.xml @@ -1,11 +1,11 @@ <Override> <A> - <override>overide parameter</override> + <blah>test</blah> + <foo>bar</foo> +<override>overide parameter</override> </A> -<B OverrideBehavior="Merge"> - <this>taht</this> - <that>this</that> -<SomeNewParam>blah</SomeNewParam> +<B OverrideBehavior="Replace"> + <SomeNewParam>blah</SomeNewParam> </B> <A> <someparam>appenedA</someparam> diff --git a/tests/testdata/inheritanceTESTout.xml b/tests/testdata/inheritanceTESTout.xml index e8fb228..0d4bba0 100644 --- a/tests/testdata/inheritanceTESTout.xml +++ b/tests/testdata/inheritanceTESTout.xml @@ -2,7 +2,7 @@ <B> <SubB> <SubSubB> - <A> + <A param3="val3"> <param1>1</param1> <param2>2</param2> </A> diff --git a/tests/testdata/override.xml b/tests/testdata/override.xml index 1108fb0..722554a 100644 --- a/tests/testdata/override.xml +++ b/tests/testdata/override.xml @@ -2,7 +2,7 @@ <A> <override>overide parameter</override> </A> -<B OverrideBehavior="Merge"> +<B OverrideBehavior="Replace"> <SomeNewParam>blah</SomeNewParam> </B> <APPEND> |