diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-04-10 14:01:02 +0200 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2016-04-25 22:24:12 +0200 |
| commit | bf6c2496cc230d8688caae43c36ae240df508801 (patch) | |
| tree | 7021ffad8cf080a791cd3551a723244638b5c1ae /testdata/integration | |
| parent | 2ab5a0bc2589e36b4e8b8dfcc93116c7bffaf51a (diff) | |
Got rid of some unecessary output in ontology serialization.
Diffstat (limited to 'testdata/integration')
5 files changed, 14 insertions, 31 deletions
diff --git a/testdata/integration/basic_functionality/lots_of_empty_elements.out.osxml b/testdata/integration/basic_functionality/lots_of_empty_elements.out.osxml index 07caa33..21935f2 100644 --- a/testdata/integration/basic_functionality/lots_of_empty_elements.out.osxml +++ b/testdata/integration/basic_functionality/lots_of_empty_elements.out.osxml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <document> <ontology name="test"> - <struct cardinality="{*}" name="a" root="true" transparent="false"> - <syntax/> - <attributes/> - <field name="afield" optional="false" subtree="true"> - <syntax/> + <struct name="a" root="true"> + <field name="afield" subtree="true"> <childRef ref="a"/> </field> </struct> diff --git a/testdata/integration/ontology_serialization/attributes_descriptor.out.osxml b/testdata/integration/ontology_serialization/attributes_descriptor.out.osxml index 00f21f5..44b7aef 100644 --- a/testdata/integration/ontology_serialization/attributes_descriptor.out.osxml +++ b/testdata/integration/ontology_serialization/attributes_descriptor.out.osxml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <document> <ontology name="test"> - <struct cardinality="{*}" name="a" root="true" transparent="false"> - <syntax/> + <struct name="a" root="true"> <attributes> <attribute default="4" name="myAttr" type="int"/> </attributes> </struct> - <struct cardinality="{*}" isa="a" name="b" root="false" transparent="false"> - <syntax/> + <struct isa="a" name="b"> <attributes> <attribute default="bla" name="myOtherAttr" type="string"/> </attributes> diff --git a/testdata/integration/ontology_serialization/simple.out.osxml b/testdata/integration/ontology_serialization/simple.out.osxml index 4aa15a6..2d00fc5 100644 --- a/testdata/integration/ontology_serialization/simple.out.osxml +++ b/testdata/integration/ontology_serialization/simple.out.osxml @@ -1,22 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <document> <ontology name="test"> - <struct cardinality="{*}" name="a" root="true" transparent="false"> - <syntax/> - <attributes/> - <field name="afield" optional="false" subtree="true"> - <syntax/> + <struct name="a" root="true"> + <field name="afield" subtree="true"> <childRef ref="a"/> </field> - <field optional="true" subtree="false"> - <syntax/> + <field optional="true"> <childRef ref="b"/> </field> </struct> - <struct cardinality="{1, 7-8}" name="b" root="false" transparent="true"> - <syntax/> - <attributes/> - </struct> + <struct cardinality="{1, 7-8}" name="b" transparent="true"/> </ontology> <test:a> <afield/> diff --git a/testdata/integration/ontology_serialization/syntax.out.osxml b/testdata/integration/ontology_serialization/syntax.out.osxml index 3e8190a..79909fe 100644 --- a/testdata/integration/ontology_serialization/syntax.out.osxml +++ b/testdata/integration/ontology_serialization/syntax.out.osxml @@ -1,17 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <document> <ontology name="test"> - <struct cardinality="{*}" name="a" root="true" transparent="false"> + <struct name="a" root="true"> + <field> + <childRef ref="a"/> + </field> <syntax> <short>§</short> <open><<</open> <close>>></close> </syntax> - <attributes/> - <field optional="false" subtree="false"> - <syntax/> - <childRef ref="a"/> - </field> </struct> </ontology> <test:a> diff --git a/testdata/integration/ontology_serialization/typesystem.out.osxml b/testdata/integration/ontology_serialization/typesystem.out.osxml index a822191..4811b87 100644 --- a/testdata/integration/ontology_serialization/typesystem.out.osxml +++ b/testdata/integration/ontology_serialization/typesystem.out.osxml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <document> <ontology name="test"> - <struct cardinality="{*}" name="a" root="true" transparent="false"> - <syntax/> + <struct name="a" root="true"> <attributes> <attribute name="type" type="bla.myEnum"/> </attributes> - <primitive optional="false" subtree="false" type="bla.myStruct"> - <syntax/> - </primitive> + <primitive type="bla.myStruct"/> </struct> </ontology> <typesystem name="bla"> |