Refactor simple Unit Tests

src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java

@@ -3,24 +3,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CrossRefEntryComparatorTest {
- private CrossRefEntryComparator comparator;
 
- @BeforeEach
- public void setUp() {
- comparator = new CrossRefEntryComparator();
- }
-
- @AfterEach
- public void tearDown() {
- comparator = null;
- }
+ private static final CrossRefEntryComparator comparator = new CrossRefEntryComparator();
 
  @Test
  public void isEqualForEntriesWithoutCrossRef() {

src/test/java/org/jabref/logic/bst/BibtexPurifyTest.java

@@ -1,23 +1,34 @@
 package org.jabref.logic.bst;
 
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class BibtexPurifyTest {
 
- @Test
- public void testPurify() {
- assertPurify("i", "i");
- assertPurify("0I ", "0I~ ");
- assertPurify("Hi Hi ", "Hi Hi ");
- assertPurify("oe", "{\\oe}");
- assertPurify("Hi oeHi ", "Hi {\\oe }Hi ");
- assertPurify("Jonathan Meyer and Charles Louis Xavier Joseph de la Vallee Poussin", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
- assertPurify("e", "{\\'e}");
- assertPurify("Edouard Masterly", "{\\'{E}}douard Masterly");
- assertPurify("Ulrich Underwood and Ned Net and Paul Pot", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
+ @ParameterizedTest
+ @MethodSource("provideTestStrings")
+ public void testPurify(String expected, String toBePurified) {
+ assertPurify(expected, toBePurified);
+ }
+
+ private static Stream<Arguments> provideTestStrings() {
+ return Stream.of(
+ Arguments.of("i", "i"),
+ Arguments.of("0I ", "0I~ "),
+ Arguments.of("Hi Hi ", "Hi Hi "),
+ Arguments.of("oe", "{\\oe}"),
+ Arguments.of("Hi oeHi ", "Hi {\\oe }Hi "),
+ Arguments.of("Jonathan Meyer and Charles Louis Xavier Joseph de la Vallee Poussin", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"),
+ Arguments.of("e", "{\\'e}"),
+ Arguments.of("Edouard Masterly", "{\\'{E}}douard Masterly"),
+ Arguments.of("Ulrich Underwood and Ned Net and Paul Pot", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot")
+ );
  }
 
  private void assertPurify(final String string, final String string2) {

src/test/java/org/jabref/logic/bst/BibtexWidthTest.java

@@ -1,6 +1,10 @@
 package org.jabref.logic.bst;
 
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -33,39 +37,39 @@
  */
 public class BibtexWidthTest {
 
- private void assertBibtexWidth(final int i, final String string) {
- assertEquals(i, BibtexWidth.width(string));
+ @ParameterizedTest
+ @MethodSource("provideTestWidth")
+ public void testWidth(int i, String str) {
+ assertEquals(i, BibtexWidth.width(str));
  }
 
- @Test
- public void testWidth() {
-
- assertBibtexWidth(278, "i");
-
- assertBibtexWidth(1639, "0I~ ");
-
- assertBibtexWidth(2612, "Hi Hi ");
-
- assertBibtexWidth(778, "{\\oe}");
-
- assertBibtexWidth(3390, "Hi {\\oe }Hi ");
-
- assertBibtexWidth(444, "{\\'e}");
-
- assertBibtexWidth(19762, "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
-
- assertBibtexWidth(7861, "{\\'{E}}douard Masterly");
-
- assertBibtexWidth(30514, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+ private static Stream<Arguments> provideTestWidth() {
+ return Stream.of(
+ Arguments.of(278, "i"),
+ Arguments.of(1639, "0I~ "),
+ Arguments.of(2612, "Hi Hi "),
+ Arguments.of(778, "{\\oe}"),
+ Arguments.of(3390, "Hi {\\oe }Hi "),
+ Arguments.of(444, "{\\'e}"),
+ Arguments.of(19762, "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"),
+ Arguments.of(7861, "{\\'{E}}douard Masterly"),
+ Arguments.of(30514, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin")
+ );
+ }
 
+ @ParameterizedTest
+ @MethodSource("provideTestGetCharWidth")
+ public void testGetCharWidth(int i, Character c) {
+ assertEquals(i, BibtexWidth.getCharWidth(c));
  }
 
- @Test
- public void testGetCharWidth() {
- assertEquals(500, BibtexWidth.getCharWidth('0'));
- assertEquals(361, BibtexWidth.getCharWidth('I'));
- assertEquals(500, BibtexWidth.getCharWidth('~'));
- assertEquals(500, BibtexWidth.getCharWidth('}'));
- assertEquals(278, BibtexWidth.getCharWidth(' '));
+ private static Stream<Arguments> provideTestGetCharWidth() {
+ return Stream.of(
+ Arguments.of(500, '0'),
+ Arguments.of(361, 'I'),
+ Arguments.of(500, '~'),
+ Arguments.of(500, '}'),
+ Arguments.of(278, ' ')
+ );
  }
 }

src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 class AddBracesFormatterTest {
 
- private AddBracesFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new AddBracesFormatter();
- }
+ private static final AddBracesFormatter formatter = new AddBracesFormatter();
 
  @Test
  public void formatAddsSingleEnclosingBraces() {

src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 class CleanupUrlFormatterTest {
 
- private CleanupUrlFormatter formatter;
-
- @BeforeEach
- void setUp() {
- formatter = new CleanupUrlFormatter();
- }
+ private static final CleanupUrlFormatter formatter = new CleanupUrlFormatter();
 
  @Test
  void removeSpecialSymbolsFromURLLink() {

src/test/java/org/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 public class ClearFormatterTest {
 
- private ClearFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new ClearFormatter();
- }
+ private static final ClearFormatter formatter = new ClearFormatter();
 
  /**
  * Check whether the clear formatter really returns the empty string for the empty string

src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java

@@ -1,18 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class EscapeAmpersandsFormatterTest {
 
- private EscapeAmpersandsFormatter formatter;
-
- @BeforeEach
- void setUp() {
- formatter = new EscapeAmpersandsFormatter();
- }
+ private static final EscapeAmpersandsFormatter formatter = new EscapeAmpersandsFormatter();
 
  @Test
  void formatReturnsSameTextIfNoAmpersandsPresent() throws Exception {

src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java

@@ -1,18 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class EscapeUnderscoresFormatterTest {
 
- private EscapeUnderscoresFormatter formatter;
-
- @BeforeEach
- void setUp() {
- formatter = new EscapeUnderscoresFormatter();
- }
+ private static final EscapeUnderscoresFormatter formatter = new EscapeUnderscoresFormatter();
 
  @Test
  void formatReturnsSameTextIfNoUnderscoresPresent() throws Exception {

src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 public class HtmlToLatexFormatterTest {
 
- private HtmlToLatexFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new HtmlToLatexFormatter();
- }
+ private static final HtmlToLatexFormatter formatter = new HtmlToLatexFormatter();
 
  @Test
  public void formatWithoutHtmlCharactersReturnsSameString() {

src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java

@@ -1,18 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HtmlToUnicodeFormatterTest {
 
- private HtmlToUnicodeFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new HtmlToUnicodeFormatter();
- }
+ private static final HtmlToUnicodeFormatter formatter = new HtmlToUnicodeFormatter();
 
  @Test
  public void formatWithoutHtmlCharactersReturnsSameString() {

src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java

@@ -1,18 +1,12 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class LatexCleanupFormatterTest {
 
- private LatexCleanupFormatter formatter;
-
- @BeforeEach
- void setUp() {
- formatter = new LatexCleanupFormatter();
- }
+ private static final LatexCleanupFormatter formatter = new LatexCleanupFormatter();
 
  @Test
  void test() {

src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 public class NormalizeDateFormatterTest {
 
- private NormalizeDateFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new NormalizeDateFormatter();
- }
+ private static final NormalizeDateFormatter formatter = new NormalizeDateFormatter();
 
  @Test
  public void formatDateYYYYMM0D() {

src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 public class NormalizeEnDashesFormatterTest {
 
- private NormalizeEnDashesFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new NormalizeEnDashesFormatter();
- }
+ private static final NormalizeEnDashesFormatter formatter = new NormalizeEnDashesFormatter();
 
  @Test
  public void formatExample() {

src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatterTest.java

@@ -1,6 +1,5 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -10,12 +9,7 @@
  */
 public class NormalizeMonthFormatterTest {
 
- private NormalizeMonthFormatter formatter;
-
- @BeforeEach
- public void setUp() {
- formatter = new NormalizeMonthFormatter();
- }
+ private static final NormalizeMonthFormatter formatter = new NormalizeMonthFormatter();
 
  @Test
  public void formatExample() {