From 65f9f50ad92ff614e1108baac4e07e58565ae35c Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Mon, 8 Aug 2016 23:59:17 +0200
Subject: [PATCH] Removed bst from architecture tests and prepared for Globals

---
 .../java/net/sf/jabref/ArchitectureTests.java | 55 ++++++++-----------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/test/java/net/sf/jabref/ArchitectureTests.java b/src/test/java/net/sf/jabref/ArchitectureTests.java
index 684b1020919..7297d7cb914 100644
--- a/src/test/java/net/sf/jabref/ArchitectureTests.java
+++ b/src/test/java/net/sf/jabref/ArchitectureTests.java
@@ -22,10 +22,12 @@ 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 GLOBALS = "net.sf.jabref.Globals";
 
     private final String firstPackage;
     private final String secondPackage;
 
+
     public ArchitectureTests(String firstPackage, String secondPackage) {
         this.firstPackage = firstPackage;
         this.secondPackage = secondPackage;
@@ -33,52 +35,41 @@ public ArchitectureTests(String firstPackage, String secondPackage) {
 
     @Parameterized.Parameters(name = "{index} -- is {0} independent of {1}?")
     public static Iterable<Object[]> data() {
-        return Arrays.asList(
-                new Object[][] {
-                        {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_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},
+        return Arrays.asList(new Object[][] {{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, GLOBALS},
 
-                        {"net.sf.jabref.bst", PACKAGE_JAVA_AWT},
-                        {"net.sf.jabref.bst", PACKAGE_JAVAX_SWING},
-                        {"net.sf.jabref.bst", PACKAGE_NET_SF_JABREF_GUI},
-                        {"net.sf.jabref.bst", PACKAGE_NET_SF_JABREF_LOGIC}
-                }
-        );
+                {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, GLOBALS},
+        });
     }
 
-
-
     @Test
     public void testLogicIndependentOfSwingAndGui() throws IOException {
         assertIndependenceOfPackages();
     }
 
     private void assertIndependenceOfPackages() throws IOException {
-        List<Path> files = Files.walk(Paths.get("src"))
-                .filter(p -> p.toString().endsWith(".java"))
-                .filter(p -> {
-                    try {
+        List<Path> files = Files.walk(Paths.get("src")).filter(p -> p.toString().endsWith(".java")).filter(p -> {
+            try {
                 return Files.readAllLines(p, StandardCharsets.UTF_8).stream()
                         .filter(s -> s.startsWith("package " + firstPackage)).findAny().isPresent();
-                    } catch (IOException e) {
-                        return false;
-                    }
-                }).filter(p -> {
-                    try {
+            } catch (IOException e) {
+                return false;
+            }
+        }).filter(p -> {
+            try {
                 return Files.readAllLines(p, StandardCharsets.UTF_8).stream()
                         .filter(s -> s.startsWith("import " + secondPackage)).findAny().isPresent();
-                    } catch (IOException e) {
-                        return false;
-                    }
-                }).collect(Collectors.toList());
+            } catch (IOException e) {
+                return false;
+            }
+        }).collect(Collectors.toList());
 
-        if(!files.isEmpty()) {
+        if (!files.isEmpty()) {
             Assert.fail(files.toString());
         }
     }