Removed last Globals in logic tests and introduced architecture test (#…

…1965)
JabRef · Sep 13, 2016 · 2f73d74 · 2f73d74
1 parent d8ec439
commit 2f73d74
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/test/java/net/sf/jabref/ArchitectureTests.java b/src/test/java/net/sf/jabref/ArchitectureTests.java
@@ -22,6 +22,7 @@ public class ArchitectureTests {
     public static final String PACKAGE_NET_SF_JABREF_GUI = "net.sf.jabref.gui";
     public static final String PACKAGE_NET_SF_JABREF_LOGIC = "net.sf.jabref.logic";
     public static final String PACKAGE_NET_SF_JABREF_MODEL = "net.sf.jabref.model";
+    public static final String CLASS_NET_SF_JABREF_GLOBALS = "net.sf.jabref.Globals";
 
     private final String firstPackage;
     private final String secondPackage;
@@ -38,11 +39,13 @@ public static Iterable<Object[]> data() {
                         {PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVA_AWT},
                         {PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_JAVAX_SWING},
                         {PACKAGE_NET_SF_JABREF_LOGIC, PACKAGE_NET_SF_JABREF_GUI},
+                        {PACKAGE_NET_SF_JABREF_LOGIC, CLASS_NET_SF_JABREF_GLOBALS},
 
                         {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVA_AWT},
                         {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_JAVAX_SWING},
                         {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_GUI},
-                        {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_LOGIC}
+                        {PACKAGE_NET_SF_JABREF_MODEL, PACKAGE_NET_SF_JABREF_LOGIC},
+                        {PACKAGE_NET_SF_JABREF_MODEL, CLASS_NET_SF_JABREF_GLOBALS}
                 }
         );
     }

diff --git a/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -9,7 +9,6 @@
 import java.util.Optional;
 
 import net.sf.jabref.BibDatabaseContext;
-import net.sf.jabref.Globals;
 import net.sf.jabref.MetaData;
 import net.sf.jabref.logic.exporter.FieldFormatterCleanups;
 import net.sf.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
@@ -49,11 +48,6 @@ public class CleanupWorkerTest {
 
     @Before
     public void setUp() throws IOException {
-        // Needed for ExternalFileTypes
-        if (Globals.prefs == null) {
-            Globals.prefs = JabRefPreferences.getInstance();
-        }
-
         pdfFolder = bibFolder.newFolder();
 
         MetaData metaData = new MetaData();

diff --git a/src/test/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/net/sf/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import net.sf.jabref.Globals;
 import net.sf.jabref.logic.importer.FetcherException;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.BibLatexEntryTypes;
+import net.sf.jabref.preferences.JabRefPreferences;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -20,7 +20,7 @@ public class IsbnFetcherTest {
 
     @Before
     public void setUp() {
-        fetcher = new IsbnFetcher(Globals.prefs.getImportFormatPreferences ());
+        fetcher = new IsbnFetcher(JabRefPreferences.getInstance().getImportFormatPreferences());
 
         bibEntry = new BibEntry();
         bibEntry.setType(BibLatexEntryTypes.BOOK);