Improve test coverage

Signed-off-by: Moritz Schubotz (physikerwelt) <wiki@physikerwelt.de>

Author: physikerwelt

mathml-core/src/main/java/com/formulasearchengine/mathmltools/mml/CIdentifier.java

@@ -14,10 +14,6 @@ public Integer getOrdinal() {
 
     private int ordinal = -1;
 
-    public CIdentifier(Element n) {
-        this.n = n;
-    }
-
     public CIdentifier(Element n, int i) {
         this.n = n;
         this.ordinal = i;

mathml-core/src/main/java/com/formulasearchengine/mathmltools/mml/MathDoc.java

@@ -23,6 +23,7 @@
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import org.apache.commons.lang3.NotImplementedException;
 import org.apache.logging.log4j.LogManager;
@@ -254,22 +255,28 @@ public List<CSymbol> getCSymbols() {
     public List<CIdentifier> getIdentifiers() {
         if (cIdentifiers == null) {
             final IterableNodeList nodeList;
-            try {
-                XPath xpath = XMLHelper.namespaceAwareXpath("m", NS_MATHML);
-                nodeList = new IterableNodeList(getElementsB(dom, xpath.compile("//m:ci")));
+                nodeList = getXNodes("//m:ci");
                 cIdentifiers = new ArrayList<>();
                 int i = 0;
                 for (Node node : nodeList) {
                     cIdentifiers.add(new CIdentifier((Element) node, i));
                     i++;
                 }
-            } catch (XPathExpressionException e) {
-                e.printStackTrace();
-            }
         }
         return cIdentifiers;
     }
 
+    private IterableNodeList getXNodes(String xPath)  {
+        XPath xpath = XMLHelper.namespaceAwareXpath("m", NS_MATHML);
+        try {
+            final XPathExpression pattern = xpath.compile(xPath);
+            final NodeList elements = getElementsB(dom, pattern);
+            return new IterableNodeList(elements);
+        } catch (XPathExpressionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public Document getDom() {
         return dom;
     }
@@ -320,7 +327,7 @@ private void highlightIdentifier(CIdentifier identifier) {
         try {
             final Element identifierPresentation = identifier.getPresentation();
             if (identifierPresentation.hasAttribute("class")) {
-                log.warn("Presentation node " + identifier.getXref() + "has already class attribute. Cannot highlight!");
+                log.warn("Presentation node " + identifier.getXref() + " has already class attribute. Cannot highlight!");
             } else {
                 identifierPresentation.setAttribute("class", "highlightedIdentifier");
             }

mathml-core/src/test/java/com/formulasearchengine/mathmltools/mml/CIdentifierTest.java

@@ -55,4 +55,9 @@ void equalsTo()  throws Exception {
         final CIdentifier E2 = getE();
         assertEquals(E2, E);
     }
+    @Test
+    void equalsTo2()  throws Exception {
+        final CIdentifier E = getE();
+        assertNotEquals("E", E);
+    }
 }

mathml-core/src/test/java/com/formulasearchengine/mathmltools/mml/MathTest.java

@@ -21,6 +21,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -201,6 +202,38 @@ void HighlightMTestFirst2k() throws Exception {
         isHighlighted(mml, PID_k2);
         isNotHighlighted(mml, PID_k3);
     }
+
+    @Test
+    void HighlightMTestFirstk2() throws Exception {
+        final String sampleMML = getFileContents(TEST_DIR + "Van_der_Waerden_CI.mml");
+        final MathDoc mml = new MathDoc(sampleMML);
+        final int WHash = "Q7913892".hashCode();
+        final int kHash = "Q12503".hashCode();
+        final ArrayList<Integer> toHighlight = new ArrayList<>();
+        toHighlight.add(kHash);
+        toHighlight.add(WHash);
+        mml.highlightConsecutiveIdentifiers(toHighlight, false);
+        isHighlighted(mml, PID_k1);
+        isNotHighlighted(mml, PID_k2);
+        isNotHighlighted(mml, PID_k3);
+    }
+
+    @Test
+    void HighlightTestDefun() throws Exception {
+        final String sampleMML = getFileContents(TEST_DIR + "Van_der_Waerden_CI.mml");
+        final MathDoc mml = new MathDoc(sampleMML);
+        final int kHash = "Q12503".hashCode();
+        final ArrayList<Integer> toHighlight = new ArrayList<>();
+        toHighlight.add(kHash);
+        final CIdentifier k1 = mml.getIdentifiers().get(1);
+        k1.getPresentation().setAttribute("class","other");
+        mml.highlightConsecutiveIdentifiers(toHighlight, false);
+        assertTrue(k1.getPresentation().hasAttribute("class"));
+        assertEquals("other",k1.getPresentation().getAttribute("class"));
+
+        isNotHighlighted(mml, PID_k2);
+        isNotHighlighted(mml, PID_k3);
+    }
 }
 
 /*