From 144e00bedf72f261062ffd0759b9f1f98d6db352 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Fri, 3 Apr 2015 22:50:01 +0200
Subject: Add another test for the test math environment, remove old tests

---
 .../user_defined_syntax/math_various.in.osml       |   7 ++
 .../user_defined_syntax/math_various.out.osxml     | 109 +++++++++++++++++++++
 testdata/osmlparser/math_pythagoras.osml           |   4 -
 testdata/osmlparser/math_ranges.osml               |   6 --
 4 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100644 testdata/integration/user_defined_syntax/math_various.in.osml
 create mode 100644 testdata/integration/user_defined_syntax/math_various.out.osxml
 delete mode 100644 testdata/osmlparser/math_pythagoras.osml
 delete mode 100644 testdata/osmlparser/math_ranges.osml

diff --git a/testdata/integration/user_defined_syntax/math_various.in.osml b/testdata/integration/user_defined_syntax/math_various.in.osml
new file mode 100644
index 0000000..c003688
--- /dev/null
+++ b/testdata/integration/user_defined_syntax/math_various.in.osml
@@ -0,0 +1,7 @@
+\import[ontology]{./math}
+\begin{math}
+	\sum_{i=5}^{10} \\
+	\int_{\var{x} -> -1}^{\var{x} -> 1} \sqrt{x^{2} - 1} dx &= \frac{π}{2}\\
+	\fun{f}{x, y} |-> \frac{x^{2}}{2} + y^{2}\\
+	\var{a}^{2} + \var{b}^{2} &= \var{c}^{2}
+\end{math}
diff --git a/testdata/integration/user_defined_syntax/math_various.out.osxml b/testdata/integration/user_defined_syntax/math_various.out.osxml
new file mode 100644
index 0000000..37b8ef8
--- /dev/null
+++ b/testdata/integration/user_defined_syntax/math_various.out.osxml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document xmlns:math="math">
+	<math:math>
+		<math:equation>
+			<math:field>
+				<math:sum>
+					<math:limits>
+						<math:lowerLimit>
+							<math:text>i</math:text>
+							<math:equals/>
+							<math:number>5</math:number>
+						</math:lowerLimit>
+						<math:upperLimit>
+							<math:number>10</math:number>
+						</math:upperLimit>
+					</math:limits>
+				</math:sum>
+			</math:field>
+		</math:equation>
+		<math:equation>
+			<math:field>
+				<math:int>
+					<math:limits>
+						<math:lowerLimit>
+							<math:var>x</math:var>
+							<math:to/>
+							<math:minus/>
+							<math:number>1</math:number>
+						</math:lowerLimit>
+						<math:upperLimit>
+							<math:var>x</math:var>
+							<math:to/>
+							<math:number>1</math:number>
+						</math:upperLimit>
+					</math:limits>
+				</math:int>
+				<math:sqrt base="2">
+					<math:text>x</math:text>
+					<math:power>
+						<math:number>2</math:number>
+					</math:power>
+					<math:minus/>
+					<math:number>1</math:number>
+				</math:sqrt>
+				<math:text>dx</math:text>
+			</math:field>
+			<math:field>
+				<math:equals/>
+				<math:frac>
+					<denominator>
+						<math:text>π</math:text>
+					</denominator>
+					<nominator>
+						<math:number>2</math:number>
+					</nominator>
+				</math:frac>
+			</math:field>
+		</math:equation>
+		<math:equation>
+			<math:field>
+				<math:fun>
+					<name>f</name>
+					<arguments>
+						<math:text>x</math:text>
+						<math:comma/>
+						<math:text>y</math:text>
+					</arguments>
+				</math:fun>
+				<math:mapsto/>
+				<math:frac>
+					<denominator>
+						<math:text>x</math:text>
+						<math:power>
+							<math:number>2</math:number>
+						</math:power>
+					</denominator>
+					<nominator>
+						<math:number>2</math:number>
+					</nominator>
+				</math:frac>
+				<math:plus/>
+				<math:text>y</math:text>
+				<math:power>
+					<math:number>2</math:number>
+				</math:power>
+			</math:field>
+		</math:equation>
+		<math:equation>
+			<math:field>
+				<math:var>a</math:var>
+				<math:power>
+					<math:number>2</math:number>
+				</math:power>
+				<math:plus/>
+				<math:var>b</math:var>
+				<math:power>
+					<math:number>2</math:number>
+				</math:power>
+			</math:field>
+			<math:field>
+				<math:equals/>
+				<math:var>c</math:var>
+				<math:power>
+					<math:number>2</math:number>
+				</math:power>
+			</math:field>
+		</math:equation>
+	</math:math>
+</document>
diff --git a/testdata/osmlparser/math_pythagoras.osml b/testdata/osmlparser/math_pythagoras.osml
deleted file mode 100644
index e42cdb7..0000000
--- a/testdata/osmlparser/math_pythagoras.osml
+++ /dev/null
@@ -1,4 +0,0 @@
-\import[ontology]{./math}
-\begin{math}
-	a^{2} &= b^{2} + c^{2}
-\end{math}
diff --git a/testdata/osmlparser/math_ranges.osml b/testdata/osmlparser/math_ranges.osml
deleted file mode 100644
index a6ac4dd..0000000
--- a/testdata/osmlparser/math_ranges.osml
+++ /dev/null
@@ -1,6 +0,0 @@
-\import[ontology]{./math}
-\begin{math}
-	\sum^{10}_{i=5} \\
-	\int^{\var{x} -> 1}_{\var{x} -> -1} \sqrt{x^{2} - 1} dx &= \frac{π}{2}\\
-	\fun{f}{x, y} |-> \frac{x^{2}}{2} + y^{2}
-\end{math}
-- 
cgit v1.2.3