From a7019614896fdd3e29b9a28f6a8cfd2c1b365983 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Sun, 1 Mar 2015 20:47:25 +0100 Subject: Renamed domain to ontology. --- testdata/osmlparser/empty_domain.osml | 2 -- testdata/osmlparser/empty_ontology.osml | 2 ++ testdata/osmlparser/explicit_fields.osml | 2 +- testdata/osmlparser/include_recursive_root.osml | 2 +- testdata/osmlparser/include_root.osml | 2 +- testdata/osmlparser/inline_domain.osml | 14 -------------- testdata/osmlparser/inline_ontology.osml | 14 ++++++++++++++ testdata/osmlparser/invalid_explicit_fields.osml | 2 +- testdata/osmlparser/rollback_on_invalid_element.osml | 2 +- testdata/osmlparser/struct_with_no_field.osml | 2 +- testdata/osmlparser/structure_inheritance.osml | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 testdata/osmlparser/empty_domain.osml create mode 100644 testdata/osmlparser/empty_ontology.osml delete mode 100644 testdata/osmlparser/inline_domain.osml create mode 100644 testdata/osmlparser/inline_ontology.osml (limited to 'testdata/osmlparser') diff --git a/testdata/osmlparser/empty_domain.osml b/testdata/osmlparser/empty_domain.osml deleted file mode 100644 index e8d6452..0000000 --- a/testdata/osmlparser/empty_domain.osml +++ /dev/null @@ -1,2 +0,0 @@ -\begin{domain#testDomain} -\end{domain} diff --git a/testdata/osmlparser/empty_ontology.osml b/testdata/osmlparser/empty_ontology.osml new file mode 100644 index 0000000..ffc9d80 --- /dev/null +++ b/testdata/osmlparser/empty_ontology.osml @@ -0,0 +1,2 @@ +\begin{ontology#testOntology} +\end{ontology} diff --git a/testdata/osmlparser/explicit_fields.osml b/testdata/osmlparser/explicit_fields.osml index a9ba1a3..ea13c02 100644 --- a/testdata/osmlparser/explicit_fields.osml +++ b/testdata/osmlparser/explicit_fields.osml @@ -1,6 +1,6 @@ \document -\domain#test +\ontology#test \struct#a[isRoot=true] \primitive#b[type=string,isSubtree=true] \primitive#c[type=string,isSubtree=true] diff --git a/testdata/osmlparser/include_recursive_root.osml b/testdata/osmlparser/include_recursive_root.osml index b3e433f..b29f1f4 100644 --- a/testdata/osmlparser/include_recursive_root.osml +++ b/testdata/osmlparser/include_recursive_root.osml @@ -1,6 +1,6 @@ \begin{document} -\domain#testDomain +\ontology#testOntology \struct#test[isRoot=true] \begin{test} diff --git a/testdata/osmlparser/include_root.osml b/testdata/osmlparser/include_root.osml index 1d1d660..3c65ca1 100644 --- a/testdata/osmlparser/include_root.osml +++ b/testdata/osmlparser/include_root.osml @@ -1,6 +1,6 @@ \begin{document} -\domain#testDomain +\ontology#testOntology \struct#test[isRoot=true] \field \childRef[ref=a] diff --git a/testdata/osmlparser/inline_domain.osml b/testdata/osmlparser/inline_domain.osml deleted file mode 100644 index 1d71df4..0000000 --- a/testdata/osmlparser/inline_domain.osml +++ /dev/null @@ -1,14 +0,0 @@ -\begin{document} - -\domain#testDomain - \struct#test[isRoot=true] - \field - \childRef[ref=a] - \struct#a - -\begin{test} -\a -\end{test} - -\end{document} - diff --git a/testdata/osmlparser/inline_ontology.osml b/testdata/osmlparser/inline_ontology.osml new file mode 100644 index 0000000..1bba1f6 --- /dev/null +++ b/testdata/osmlparser/inline_ontology.osml @@ -0,0 +1,14 @@ +\begin{document} + +\ontology#testOntology + \struct#test[isRoot=true] + \field + \childRef[ref=a] + \struct#a + +\begin{test} +\a +\end{test} + +\end{document} + diff --git a/testdata/osmlparser/invalid_explicit_fields.osml b/testdata/osmlparser/invalid_explicit_fields.osml index 9986204..eeecc0a 100644 --- a/testdata/osmlparser/invalid_explicit_fields.osml +++ b/testdata/osmlparser/invalid_explicit_fields.osml @@ -1,6 +1,6 @@ \document -\domain#test +\ontology#test \struct#a[isRoot=true] \primitive#b[type=string,isSubtree=true] \primitive#c[type=string,isSubtree=true] diff --git a/testdata/osmlparser/rollback_on_invalid_element.osml b/testdata/osmlparser/rollback_on_invalid_element.osml index 671c76d..282e741 100644 --- a/testdata/osmlparser/rollback_on_invalid_element.osml +++ b/testdata/osmlparser/rollback_on_invalid_element.osml @@ -1,6 +1,6 @@ \begin{document} -\domain#testDomain +\ontology#testOntology \struct#test[isRoot=true] \field \childRef[ref=a] diff --git a/testdata/osmlparser/struct_with_no_field.osml b/testdata/osmlparser/struct_with_no_field.osml index 8cf2d02..4f27998 100644 --- a/testdata/osmlparser/struct_with_no_field.osml +++ b/testdata/osmlparser/struct_with_no_field.osml @@ -1,6 +1,6 @@ \document -\domain#test +\ontology#test \struct#a[isRoot=true] \field \childRef[ref=b] diff --git a/testdata/osmlparser/structure_inheritance.osml b/testdata/osmlparser/structure_inheritance.osml index 6b88f2f..008778a 100644 --- a/testdata/osmlparser/structure_inheritance.osml +++ b/testdata/osmlparser/structure_inheritance.osml @@ -1,4 +1,4 @@ -\domain#test +\ontology#test \struct#a \primitive[type=string] \struct#b[isa=a] -- cgit v1.2.3