Unify formatter tests

- No @before, because JUnit initializes the test class at each @test - No @after setting the variable to null, because Javas auto cleanup of variables takes care of this, too - Use "formatter" as class variable name (instead of other names and initialization within the class)
JabRef · Apr 10, 2016 · 5316148 · 5316148
1 parent 76a27d0
commit 5316148
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 130 deletions.
diff --git a/src/test/java/net/sf/jabref/logic/formatter/OrdinalsToSuperscriptFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/OrdinalsToSuperscriptFormatterTest.java
@@ -2,26 +2,15 @@
 
 
 import net.sf.jabref.logic.formatter.bibtexfields.OrdinalsToSuperscriptFormatter;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Tests in addition to the general tests from {@link net.sf.jabref.logic.formatter.FormatterTest}
  */
 public class OrdinalsToSuperscriptFormatterTest {
-    private OrdinalsToSuperscriptFormatter formatter;
 
-    @Before
-    public void setUp() {
-        formatter = new OrdinalsToSuperscriptFormatter();
-    }
-
-    @After
-    public void tearDown() {
-        formatter = null;
-    }
+    private final OrdinalsToSuperscriptFormatter formatter = new OrdinalsToSuperscriptFormatter();
 
     @Test
     public void replacesSuperscript() {

diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
@@ -12,52 +12,51 @@
  */
 public class HtmlToLatexFormatterTest {
 
-    private HtmlToLatexFormatter htmlToLatexFormatter;
+    private final HtmlToLatexFormatter formatter = new HtmlToLatexFormatter();
 
     @Before
     public void setUp() throws Exception {
         Globals.prefs = JabRefPreferences.getInstance();
-        htmlToLatexFormatter = new HtmlToLatexFormatter();
     }
 
     @Test
     public void formatWithoutHtmlCharactersReturnsSameString() {
-        assertEquals("abc", htmlToLatexFormatter.format("abc"));
+        assertEquals("abc", formatter.format("abc"));
     }
 
     @Test
     public void formatMultipleHtmlCharacters() {
-        assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", htmlToLatexFormatter.format("&aring;&auml;&ouml;"));
+        assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", formatter.format("&aring;&auml;&ouml;"));
     }
 
     @Test
     public void formatCombinedAccent() {
-        assertEquals("{\\'{\\i}}", htmlToLatexFormatter.format("i&#x301;"));
+        assertEquals("{\\'{\\i}}", formatter.format("i&#x301;"));
     }
 
     @Test
     public void testBasic() {
-        assertEquals("aaa", htmlToLatexFormatter.format("aaa"));
+        assertEquals("aaa", formatter.format("aaa"));
     }
 
     @Test
     public void testHTML() {
-        assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("&auml;"));
-        assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("&#228;"));
-        assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("&#xe4;"));
-        assertEquals("{$\\Epsilon$}", htmlToLatexFormatter.format("&Epsilon;"));
+        assertEquals("{\\\"{a}}", formatter.format("&auml;"));
+        assertEquals("{\\\"{a}}", formatter.format("&#228;"));
+        assertEquals("{\\\"{a}}", formatter.format("&#xe4;"));
+        assertEquals("{$\\Epsilon$}", formatter.format("&Epsilon;"));
     }
 
     @Test
     public void testHTMLRemoveTags() {
-        assertEquals("aaa", htmlToLatexFormatter.format("<b>aaa</b>"));
+        assertEquals("aaa", formatter.format("<b>aaa</b>"));
     }
 
     @Test
     public void testHTMLCombiningAccents() {
-        assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("a&#776;"));
-        assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("a&#x308;"));
-        assertEquals("{\\\"{a}}b", htmlToLatexFormatter.format("a&#776;b"));
-        assertEquals("{\\\"{a}}b", htmlToLatexFormatter.format("a&#x308;b"));
+        assertEquals("{\\\"{a}}", formatter.format("a&#776;"));
+        assertEquals("{\\\"{a}}", formatter.format("a&#x308;"));
+        assertEquals("{\\\"{a}}b", formatter.format("a&#776;b"));
+        assertEquals("{\\\"{a}}b", formatter.format("a&#x308;b"));
     }
 }
diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
@@ -9,16 +9,18 @@
  */
 public class LatexCleanupFormatterTest {
 
+    private final LatexCleanupFormatter formatter = new LatexCleanupFormatter();
+
     @Test
     public void test() {
-        LatexCleanupFormatter lf = new LatexCleanupFormatter();
 
-        assertEquals("$\\alpha\\beta$", lf.format("$\\alpha$$\\beta$"));
-        assertEquals("{VLSI DSP}", lf.format("{VLSI} {DSP}"));
-        assertEquals("\\textbf{VLSI} {DSP}", lf.format("\\textbf{VLSI} {DSP}"));
+        assertEquals("$\\alpha\\beta$", formatter.format("$\\alpha$$\\beta$"));
+        assertEquals("{VLSI DSP}", formatter.format("{VLSI} {DSP}"));
+        assertEquals("\\textbf{VLSI} {DSP}", formatter.format("\\textbf{VLSI} {DSP}"));
 
         assertEquals("A ${\\Delta\\Sigma}$ modulator for {FPGA DSP}",
-                lf.format("A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"));
+                formatter.format("A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"));
     }
 
+
 }
diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
@@ -8,141 +8,120 @@
  */
 public class NormalizeDateFormatterTest {
 
+    private final NormalizeDateFormatter formatter = new NormalizeDateFormatter();
+
     @Test
     public void formatDateYYYYMM0D() {
-        String formatted = new NormalizeDateFormatter().format("2015-11-08");
-        Assert.assertEquals("2015-11-08", formatted);
+        Assert.assertEquals("2015-11-08", formatter.format("2015-11-08"));
     }
 
     @Test
     public void formatDateYYYYM0D() {
-        String formatted = new NormalizeDateFormatter().format("2015-1-08");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("2015-1-08"));
     }
 
     @Test
     public void formatDateYYYYMD() {
-        String formatted = new NormalizeDateFormatter().format("2015-1-8");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("2015-1-8"));
     }
 
     @Test
     public void formatDateYYYYMM() {
-        String formatted = new NormalizeDateFormatter().format("2015-11");
-        Assert.assertEquals("2015-11", formatted);
+        Assert.assertEquals("2015-11", formatter.format("2015-11"));
     }
 
     @Test
     public void formatDateYYYYM() {
-        String formatted = new NormalizeDateFormatter().format("2015-1");
-        Assert.assertEquals("2015-01", formatted);
+        Assert.assertEquals("2015-01", formatter.format("2015-1"));
     }
 
     @Test
     public void formatDateMMYY() {
-        String formatted = new NormalizeDateFormatter().format("11/15");
-        Assert.assertEquals("2015-11", formatted);
+        Assert.assertEquals("2015-11", formatter.format("11/15"));
     }
 
     @Test
     public void formatDateMYY() {
-        String formatted = new NormalizeDateFormatter().format("1/15");
-        Assert.assertEquals("2015-01", formatted);
+        Assert.assertEquals("2015-01", formatter.format("1/15"));
     }
 
     @Test
     public void formatDate0MYY() {
-        String formatted = new NormalizeDateFormatter().format("01/15");
-        Assert.assertEquals("2015-01", formatted);
+        Assert.assertEquals("2015-01", formatter.format("01/15"));
     }
 
     @Test
     public void formatDateMMYYYY() {
-        String formatted = new NormalizeDateFormatter().format("11/2015");
-        Assert.assertEquals("2015-11", formatted);
+        Assert.assertEquals("2015-11", formatter.format("11/2015"));
     }
 
     @Test
     public void formatDateMYYYY() {
-        String formatted = new NormalizeDateFormatter().format("1/2015");
-        Assert.assertEquals("2015-01", formatted);
+        Assert.assertEquals("2015-01", formatter.format("1/2015"));
     }
 
     @Test
     public void formatDate0MYYYY() {
-        String formatted = new NormalizeDateFormatter().format("01/2015");
-        Assert.assertEquals("2015-01", formatted);
+        Assert.assertEquals("2015-01", formatter.format("01/2015"));
     }
 
     @Test
     public void formatDateMMMDDCommaYYYY() {
-        String formatted = new NormalizeDateFormatter().format("November 08, 2015");
-        Assert.assertEquals("2015-11-08", formatted);
+        Assert.assertEquals("2015-11-08", formatter.format("November 08, 2015"));
     }
 
     @Test
     public void formatDateMMMDCommaYYYY() {
-        String formatted = new NormalizeDateFormatter().format("November 8, 2015");
-        Assert.assertEquals("2015-11-08", formatted);
+        Assert.assertEquals("2015-11-08", formatter.format("November 8, 2015"));
     }
 
     @Test
     public void formatDateMMMCommaYYYY() {
-        String formatted = new NormalizeDateFormatter().format("November, 2015");
-        Assert.assertEquals("2015-11", formatted);
+        Assert.assertEquals("2015-11", formatter.format("November, 2015"));
     }
 
     @Test
     public void formatDate0DdotMMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("08.11.2015");
-        Assert.assertEquals("2015-11-08", formatted);
+        Assert.assertEquals("2015-11-08", formatter.format("08.11.2015"));
     }
 
     @Test
     public void formatDateDdotMMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("8.11.2015");
-        Assert.assertEquals("2015-11-08", formatted);
+        Assert.assertEquals("2015-11-08", formatter.format("8.11.2015"));
     }
 
     @Test
     public void formatDateDDdotMMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("15.11.2015");
-        Assert.assertEquals("2015-11-15", formatted);
+        Assert.assertEquals("2015-11-15", formatter.format("15.11.2015"));
     }
 
     @Test
     public void formatDate0Ddot0MdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("08.01.2015");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("08.01.2015"));
     }
 
     @Test
     public void formatDateDdot0MdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("8.01.2015");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("8.01.2015"));
     }
 
     @Test
     public void formatDateDDdot0MdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("15.01.2015");
-        Assert.assertEquals("2015-01-15", formatted);
+        Assert.assertEquals("2015-01-15", formatter.format("15.01.2015"));
     }
 
     @Test
     public void formatDate0DdotMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("08.1.2015");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("08.1.2015"));
     }
 
     @Test
     public void formatDateDdotMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("8.1.2015");
-        Assert.assertEquals("2015-01-08", formatted);
+        Assert.assertEquals("2015-01-08", formatter.format("8.1.2015"));
     }
 
     @Test
     public void formatDateDDdotMdotYYYY() {
-        String formatted = new NormalizeDateFormatter().format("15.1.2015");
-        Assert.assertEquals("2015-01-15", formatted);
+        Assert.assertEquals("2015-01-15", formatter.format("15.1.2015"));
     }
 }
diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
@@ -4,7 +4,6 @@
 import java.util.Collection;
 
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
@@ -16,12 +15,8 @@
  */
 @RunWith(Parameterized.class)
 public class NormalizeNamesFormatterTest {
-    private NormalizeNamesFormatter formatter;
 
-    @Before
-    public void setUp() {
-        formatter = new NormalizeNamesFormatter();
-    }
+    private final NormalizeNamesFormatter formatter = new NormalizeNamesFormatter();
 
     @Parameter
     public String input;

diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
@@ -2,19 +2,14 @@
 
 import net.sf.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Tests in addition to the general tests from {@link net.sf.jabref.logic.formatter.FormatterTest}
  */
 public class NormalizePagesFormatterTest {
-    private NormalizePagesFormatter formatter;
 
-    @Before
-    public void setUp() {
-        formatter = new NormalizePagesFormatter();
-    }
+    private final NormalizePagesFormatter formatter = new NormalizePagesFormatter();
 
     @Test
     public void formatSinglePageResultsInNoChange() {

diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
@@ -10,63 +10,56 @@
  */
 public class RemoveBracesFormatterTest {
 
+    private final RemoveBracesFormatter formatter = new RemoveBracesFormatter();
+
+
     @Test
     public void formatRemovesSingleEnclosingBraces() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("test", formatter.format("{test}"));
     }
 
     @Test
     public void formatKeepsUnmatchedBracesAtBeginning() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("{test", formatter.format("{test"));
     }
 
     @Test
     public void formatKeepsUnmatchedBracesAtEnd() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("test}", formatter.format("test}"));
     }
 
     @Test
     public void formatKeepsShortString() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("t", formatter.format("t"));
     }
 
     @Test
     public void formatKeepsEmptyString() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("", formatter.format(""));
     }
 
     @Test
     public void formatRemovesDoubleEnclosingBraces() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("test", formatter.format("{{test}}"));
     }
 
     @Test
     public void formatRemovesTripleEnclosingBraces() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("test", formatter.format("{{{test}}}"));
     }
 
     @Test
     public void formatKeepsNonMatchingBraces() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("{A} and {B}", formatter.format("{A} and {B}"));
     }
 
     @Test
     public void formatRemovesOnlyMatchingBraces() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         assertEquals("{A} and {B}", formatter.format("{{A} and {B}}"));
     }
 
     @Test
     public void formatDoesNotRemoveBracesInBrokenString() {
-        RemoveBracesFormatter formatter = new RemoveBracesFormatter();
         // We opt here for a conservative approach although one could argue that "A} and {B}" is also a valid return
         assertEquals("{A} and {B}}", formatter.format("{A} and {B}}"));
     }