add unit tests

kermitt2 · Sep 9, 2022 · 8bf7e96 · 8bf7e96
1 parent 761a1f6
commit 8bf7e96
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java b/grobid-core/src/main/java/org/grobid/core/document/TEIFormatter.java
@@ -1036,7 +1036,7 @@ private List<Footnote> getTeiNotes(Document doc) {
         return footnotes;
     }
 
-    private Footnote makeFootNote(List<LayoutToken> noteTokens, String footText) {
+    protected Footnote makeFootNote(List<LayoutToken> noteTokens, String footText) {
         // pattern is <note n="1" place="foot" xml:id="no1">
         Matcher ma = startNum.matcher(footText);
         int currentNumber = -1;
@@ -1050,8 +1050,9 @@ private Footnote makeFootNote(List<LayoutToken> noteTokens, String footText) {
                     String toConsume =  groupStr;
                     int start = 0;
                     for(LayoutToken token : noteTokens) {
-                        if ( (token.getText() == null) || (token.getText().length() == 0) )
+                        if (StringUtils.isEmpty(token.getText())) {
                             continue;
+                        }
                         if (toConsume.startsWith(token.getText())) {
                             start++;
                             toConsume = toConsume.substring(token.getText().length());

diff --git a/grobid-core/src/main/java/org/grobid/core/engines/citations/CalloutAnalyzer.java b/grobid-core/src/main/java/org/grobid/core/engines/citations/CalloutAnalyzer.java
@@ -1,8 +1,5 @@
 package org.grobid.core.engines.citations;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/grobid-core/src/test/java/org/grobid/core/document/TEIFormatterTest.java b/grobid-core/src/test/java/org/grobid/core/document/TEIFormatterTest.java
@@ -1,15 +1,18 @@
 package org.grobid.core.document;
 
+import org.grobid.core.analyzers.GrobidAnalyzer;
+import org.grobid.core.data.Footnote;
+import org.grobid.core.layout.LayoutToken;
 import org.grobid.core.utilities.GrobidProperties;
+import org.grobid.core.utilities.LayoutTokensUtil;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.io.File;
+import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.nullValue;
+import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertThat;
 
 public class TEIFormatterTest {
@@ -19,4 +22,17 @@ public static void setInitialContext() throws Exception {
         GrobidProperties.getInstance();
     }
 
+    @Test
+    public void testMakeFootNote() throws Exception {
+
+        String text = "1 This is a footnote";
+        List<LayoutToken> tokens = GrobidAnalyzer.getInstance().tokenizeWithLayoutToken(text);
+
+        Footnote footnote = new TEIFormatter(null, null).makeFootNote(tokens, text);
+
+        assertThat(footnote.getText(), is(" This is a footnote"));
+        assertThat(LayoutTokensUtil.toText(footnote.getTokens()), is(" This is a footnote"));
+        assertThat(footnote.getNumber(), is(1));
+    }
+
 }