Moved testdata path

16 files changed, 20 insertions, 19 deletions

diff --git a/testdata/xmlparser/affiliation.osxml b/testdata/osxmlparser/affiliation.osxml
index d84dc30..d84dc30 100644
--- a/testdata/xmlparser/affiliation.osxml
+++ b/testdata/osxmlparser/affiliation.osxml
diff --git a/testdata/xmlparser/bibliography_domain.osxml b/testdata/osxmlparser/bibliography_domain.osxml
index f1d25f8..6418c61 100644
--- a/testdata/xmlparser/bibliography_domain.osxml
+++ b/testdata/osxmlparser/bibliography_domain.osxml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <domain name="bibliography">
 
-	<import rel="domain" src="./book_domain.oxm"/>
-	<import rel="domain" src="./meta_domain.oxm"/>
+	<import rel="domain" src="./book_domain.osxml"/>
+	<import rel="domain" src="./meta_domain.osxml"/>
 
 	<struct name="bibliography" transparent="true">
 		<field>
diff --git a/testdata/xmlparser/book_domain.osxml b/testdata/osxmlparser/book_domain.osxml
index 4218915..4218915 100644
--- a/testdata/xmlparser/book_domain.osxml
+++ b/testdata/osxmlparser/book_domain.osxml
diff --git a/testdata/xmlparser/color.osxml b/testdata/osxmlparser/color.osxml
index 17adea4..17adea4 100644
--- a/testdata/xmlparser/color.osxml
+++ b/testdata/osxmlparser/color.osxml
diff --git a/testdata/xmlparser/comments_domain.osxml b/testdata/osxmlparser/comments_domain.osxml
index 6add2b3..dc7742e 100644
--- a/testdata/xmlparser/comments_domain.osxml
+++ b/testdata/osxmlparser/comments_domain.osxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="yes"?>
 <domain name="comments">
-	<import rel="domain" src="./book_domain.oxm"/>
+	<import rel="domain" src="./book_domain.osxml"/>
 
 	<!-- an annotation comment -->
 	<annotation name="comment">
diff --git a/testdata/xmlparser/complex_book.oxd b/testdata/osxmlparser/complex_book.osxml
index 7d69713..b610454 100644
--- a/testdata/xmlparser/complex_book.oxd
+++ b/testdata/osxmlparser/complex_book.osxml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <document>
 
-	<import rel="domain" src="./book_domain.oxm"/>
-	<import rel="domain" src="./headings_domain.oxm"/>
-	<import rel="domain" src="./meta_domain.oxm"/>
-	<import rel="domain" src="./bibliography_domain.oxm"/>
+	<import rel="domain" src="./book_domain.osxml"/>
+	<import rel="domain" src="./headings_domain.osxml"/>
+	<import rel="domain" src="./meta_domain.osxml"/>
+	<import rel="domain" src="./bibliography_domain.osxml"/>
 	<!--<import rel="domain" src="emphasis.oxm"/>
 	<import rel="domain" src="comments.oxm"/>
 	<import rel="domain" src="lists.oxm"/>
diff --git a/testdata/xmlparser/email.osxml b/testdata/osxmlparser/email.osxml
index 325f89a..325f89a 100644
--- a/testdata/xmlparser/email.osxml
+++ b/testdata/osxmlparser/email.osxml
diff --git a/testdata/xmlparser/generic.osxml b/testdata/osxmlparser/generic.osxml
index 45803c8..799ed41 100644
--- a/testdata/xmlparser/generic.osxml
+++ b/testdata/osxmlparser/generic.osxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="yes"?>
 <typesystem name="border">
-	<import>./color.oxm</import>
+	<import>./color.osxml</import>
 
 	<enum name="border-style">
 		<entry>none</entry>
diff --git a/testdata/xmlparser/headings_domain.osxml b/testdata/osxmlparser/headings_domain.osxml
index d421747..07d3db2 100644
--- a/testdata/xmlparser/headings_domain.osxml
+++ b/testdata/osxmlparser/headings_domain.osxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="yes"?>
 <domain name="headings">
 
-	<import rel="domain" src="./book_domain.oxm"/>
+	<import rel="domain" src="./book_domain.osxml"/>
 
 	<struct name="heading" cardinality="1" transparent="true">
 		<!-- The parent mechanism is a curious thing. Remind yourself
diff --git a/testdata/xmlparser/lists_domain.osxml b/testdata/osxmlparser/lists_domain.osxml
index 4360a6d..cacb9cc 100644
--- a/testdata/xmlparser/lists_domain.osxml
+++ b/testdata/osxmlparser/lists_domain.osxml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <domain name="lists">
-	<import rel="domain" src="book.oxm"/>
+	<import rel="domain" src="book.osxml"/>
 
 	<struct name="ul" isa="book.paragraph">
 		<!-- Here we solve the problem of parents using the isa
diff --git a/testdata/xmlparser/meta_domain.osxml b/testdata/osxmlparser/meta_domain.osxml
index ffb5413..52dffc5 100644
--- a/testdata/xmlparser/meta_domain.osxml
+++ b/testdata/osxmlparser/meta_domain.osxml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <domain name="meta">
 
-	<import rel="typesystem" src="./affiliation.oxm"/>
-	<import rel="typesystem" src="./email.oxm"/>
-	<import rel="typesystem" src="./version.oxm"/>
-	<import rel="domain" src="./book_domain.oxm"/>
+	<import rel="typesystem" src="./affiliation.osxml"/>
+	<import rel="typesystem" src="./email.osxml"/>
+	<import rel="typesystem" src="./version.osxml"/>
+	<import rel="domain" src="./book_domain.osxml"/>
 
 	<struct name="meta" cardinality="{1}" transparent="true">
 		<field name="authors">
diff --git a/testdata/osxmlparser/mismatchedTag.osxml b/testdata/osxmlparser/mismatchedTag.osxml
new file mode 100644
index 0000000..5f15f0f
--- /dev/null
+++ b/testdata/osxmlparser/mismatchedTag.osxml
@@ -0,0 +1,3 @@
+<?xml version="1.0" standalone="yes"?>
+<document></document2>
+
diff --git a/testdata/xmlparser/simple_book.oxd b/testdata/osxmlparser/simple_book.osxml
index abf575f..310a413 100644
--- a/testdata/xmlparser/simple_book.oxd
+++ b/testdata/osxmlparser/simple_book.osxml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document>
-	<import rel="domain" src="book_domain.oxm"/>
+	<import rel="domain" src="book_domain.osxml"/>
 	<book>
 		This might be some introductory text or a dedication.
 		<!-- Note that a better version of the book domain might specify
diff --git a/testdata/xmlparser/test.osxml b/testdata/osxmlparser/test.osxml
index 911bbed..e492488 100644
--- a/testdata/xmlparser/test.osxml
+++ b/testdata/osxmlparser/test.osxml
@@ -1,8 +1,8 @@
 <?xml version="1.0" standalone="yes"?>
 <domain name="test">
 
-	<import rel="domain" src="./book_domain.oxm"/>
-	<import rel="typesystem" src="./color.oxm"/>
+	<import rel="domain" src="./book_domain.osxml"/>
+	<import rel="typesystem" src="./color.osxml"/>
 
 	<struct name="fancycolor">
 	
diff --git a/testdata/xmlparser/version.osxml b/testdata/osxmlparser/version.osxml
index 0d52736..0d52736 100644
--- a/testdata/xmlparser/version.osxml
+++ b/testdata/osxmlparser/version.osxml
diff --git a/testdata/xmlparser/mismatchedTag.osxml b/testdata/xmlparser/mismatchedTag.osxml
deleted file mode 100644
index 5dc9388..0000000
--- a/testdata/xmlparser/mismatchedTag.osxml
+++ /dev/null
@@ -1,2 +0,0 @@
-<document></document2>
-