[power-architect] r3942 committed - Added to the Core Dependency JUnit test

[codesite-noreply]

Revision: 3942
Author: gtc.c...@gmail.com
Date: Wed Sep  8 08:38:50 2010
Log: Added to the Core Dependency JUnit test
http://code.google.com/p/power-architect/source/detail?r=3942
Modified:
 /trunk/regress/ca/sqlpower/architect/ArchitectCoreDependencyTest.java

=======================================
--- /trunk/regress/ca/sqlpower/architect/ArchitectCoreDependencyTest.java	 
Tue May 25 13:03:30 2010
+++ /trunk/regress/ca/sqlpower/architect/ArchitectCoreDependencyTest.java	 
Wed Sep  8 08:38:50 2010
@@ -65,10 +65,7 @@
                     if (javaFile.getName().equals("CoreUserSettings.java")  
&&
                             line.equals("import  
ca.sqlpower.architect.swingui.QFAUserSettings;")) continue;

-
-                    assertFalse("File " + javaFile + " contains swing  
components! " + line,
-                            line.trim().startsWith("import") &&
-                             
line.contains("ca.sqlpower.architect.swingui"));
+                    invalidImports(javaFile, line);
                     if (line.startsWith("public class")) break;
                     System.out.println(line);
                 } finally {
@@ -97,9 +94,7 @@
             String line = reader.readLine();
             while (line != null) {
                 try {
-                    assertFalse("File " + javaFile + " contains swing  
components! " + line,
-                            line.trim().startsWith("import") &&
-                             
line.contains("ca.sqlpower.architect.swingui"));
+                    invalidImports(javaFile, line);
                     if (line.startsWith("public class")) break;
                     System.out.println(line);
                 } finally {
@@ -134,10 +129,7 @@
                     if  
(javaFile.getName().equals("ObjectPropertyModificationDDLComponent.java") &&
                             line.equals("import  
ca.sqlpower.architect.swingui.Messages;")) continue;

-                    assertFalse("File " + javaFile + " contains swing  
components! " + line,
-                            line.trim().startsWith("import") &&
-                             
line.contains("ca.sqlpower.architect.swingui"));
-                    if (line.startsWith("public class")) break;
+                    invalidImports(javaFile, line);
                     System.out.println(line);
                 } finally {
                     line = reader.readLine();
@@ -165,9 +157,7 @@
             String line = reader.readLine();
             while (line != null) {
                 try {
-                    assertFalse("File " + javaFile + " contains swing  
components! " + line,
-                            line.trim().startsWith("import") &&
-                             
line.contains("ca.sqlpower.architect.swingui"));
+                    invalidImports(javaFile, line);
                     if (line.startsWith("public class")) break;
                     System.out.println(line);
                 } finally {
@@ -176,5 +166,22 @@
             }
         }
     }
-
-}
+
+    /**
+     * This tests for all imports in the architect library that should not  
be in there.
+     * @param javaFile the java file containing the error
+     * @param line the line of the error
+     */
+    private void invalidImports(File javaFile, String line)
+    {
+        if((line.trim().startsWith("import") &&  
(line.contains("ca.sqlpower.architect.swingui")))) {
+            System.out.println("File " + javaFile + " contains swing  
components! \n\t" + line);
+        }
+        if((line.trim().startsWith("import") &&  
(line.contains("ca.sqlpower.architect.enterprise")))) {
+            System.out.println("File " + javaFile + " contains enterprise  
components! \n\t" + line);
+        }
+        if((line.trim().startsWith("import") &&  
(line.contains("ca.sqlpower.architect.olap")))) {
+            System.out.println("File " + javaFile + " contains olap  
components! \n\t" + line);
+        }
+    }
+}