Improve test coverage to 100%

Author: physikerwelt

src/main/java/com/formulasearchengine/mathmlquerygenerator/XQueryGenerator.java

@@ -112,13 +112,8 @@ public static Node getMainElement( Document xml ) {
 			return new NonWhitespaceNodeList( expr ).item( 0 );
 		}
 		// if that fails try to get content MathML from an annotation tag
-		expr = xml.getElementsByTagName( "annotation-xml" );
-		for ( Node node : new NonWhitespaceNodeList( expr ) ) {
-			if ( node.hasAttributes() &&
-					node.getAttributes().getNamedItem( "encoding" ).getNodeValue().equals( "MathML-Content" ) ) {
-				return node;
-			}
-		}
+        Node node = getContentMathMLNode(xml);
+        if (node != null) return node;
 		// if that fails too interprete content of first semantic element as content MathML
 		expr = xml.getElementsByTagNameNS( "*", "semantics" );
 		if ( expr.getLength() > 0 ) {
@@ -133,7 +128,19 @@ public static Node getMainElement( Document xml ) {
 		return null;
 	}
 
-	public String getReturnFormat() {
+    private static Node getContentMathMLNode(Document xml) {
+        NodeList expr;
+        expr = xml.getElementsByTagName( "annotation-xml" );
+        for ( Node node : new NonWhitespaceNodeList( expr ) ) {
+            if ( node.hasAttributes() &&
+                    node.getAttributes().getNamedItem( "encoding" ).getNodeValue().equals( "MathML-Content" ) ) {
+                return node;
+            }
+        }
+        return null;
+    }
+
+    public String getReturnFormat() {
 		return returnFormat;
 	}
 

src/test/java/com/formulasearchengine/mathmlquerygenerator/XQueryGeneratorTest.java

@@ -105,6 +105,8 @@ public void testCustomization() throws Exception {
 		xQueryGenerator.setReturnFormat(testResultFormat).setNamespace(testNamespace)
 			.setPathToRoot(testPathToRoot);
 		assertEquals(expectedOutput, xQueryGenerator.toString());
+		assertEquals(testResultFormat, xQueryGenerator.getReturnFormat());
+		assertEquals(testNamespace, xQueryGenerator.getNamespace());
 	}
 
 	public void testNoRestriction() throws Exception {
@@ -142,9 +144,7 @@ public void testqVarGetter() throws Exception {
 		ArrayList<String> xPaths = firstEntry.getValue();
 		assertEquals( 2, xPaths.size() );
 		assertEquals( firstExpectedLocation, xPaths.get(0) );
-	}
-	public void testRecursion() throws Exception {
-
+        assertEquals(true, xQueryGenerator.isAddQvarMap());
 	}
 
 }

src/test/resources/com/formulasearchengine/mathmlquerygenerator/formats/otherAnnotations.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<math xmlns="http://www.w3.org/1998/Math/MathML">
+    <semantics>
+        <annotation-xml encoding="application/openmath+xml">
+            <OMA xmlns="http://www.openmath.org/OpenMath">
+                <OMV name="E"/>
+            </OMA>
+        </annotation-xml>
+        <annotation-xml encoding="MathML-Content"
+                        id="I1.i2.p1.1.m1.1.cmml"
+                        xref="I1.i2.p1.1.m1.1">
+            <ci xml:id="p1.1.m1.1.1.cmml" xref="p1.1.m1.1.1">E</ci>
+        </annotation-xml>
+    </semantics>
+</math>

src/test/resources/com/formulasearchengine/mathmlquerygenerator/formats/otherAnnotations.xq

@@ -0,0 +1,9 @@
+declare default element namespace "http://www.w3.org/1998/Math/MathML";
+for $m in db2-fn:xmlcolumn("math.math_mathml") return
+for $x in $m//*:ci
+[./text() = 'E']
+where
+fn:count($x/*) = 0
+
+return
+data($m/*[1]/@alttext)

src/test/resources/com/formulasearchengine/mathmlquerygenerator/recursive/qqx2x.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<mws:query xmlns:mws="http://search.mathweb.org/ns" xmlns:m="http://www.w3.org/1998/Math/MathML" limitmin="0"
+           answsize="30">
+    <mws:expr>
+        <m:apply xml:id="p1.1.m1.1.5.cmml" xref="p1.1.m1.1.5">
+            <m:plus xml:id="p1.1.m1.1.3.cmml" xref="p1.1.m1.1.3"/>
+            <m:apply xml:id="p1.1.m1.1.5.1.cmml" xref="p1.1.m1.1.5.1">
+                <m:csymbol cd="ambiguous" xml:id="p1.1.m1.1.5.1.1.cmml">superscript</m:csymbol>
+                <mws:qvar>x</mws:qvar>
+                <m:cn type="integer" xml:id="p1.1.m1.1.2.1.cmml" xref="p1.1.m1.1.2.1">2</m:cn>
+            </m:apply>
+            <mws:qvar>x</mws:qvar>
+        </m:apply>
+    </mws:expr>
+</mws:query>

src/test/resources/com/formulasearchengine/mathmlquerygenerator/recursive/qqx2x.xq

@@ -0,0 +1,23 @@
+declare default element namespace "http://www.w3.org/1998/Math/MathML";
+declare function local:qvarMap($x) {
+ map {"x" : (data($x/*[2]/*[2]/@xml:id),data($x/*[3]/@xml-id))}
+};
+
+declare function local:compareApply($rootApply, $depth, $x ) {
+(for $child in $x/* return local:compareApply(
+if (empty($rootApply) and $child/name() = "apply") then $child else $rootApply,
+if (empty($rootApply) and $child/name() = "apply") then 0 else $depth+1, $child),
+if ($x/name() = "apply"
+ and $x[*[1]/name() = 'plus' and *[2]/name() = 'apply' and *[2][*[1]/name() = 'csymbol' and *[1][./text() = 'superscript'] and *[3]/name() = 'cn' and *[3][./text() = '2']]]
+ and fn:count($x/*[2]/*[1]/*) = 0
+ and fn:count($x/*[2]/*[3]/*) = 0
+ and fn:count($x/*[2]/*) = 3
+ and fn:count($x/*) = 3
+ and $x/*[2]/*[2] = $x/*[3]
+ ) then
+data($m/*[1]/@alttext)
+else ()
+)};
+
+for $m in db2-fn:xmlcolumn("math.math_mathml") return
+local:compareApply((), 0, $m)