Moving tests for better mangement,

I'm not checkstyle-compliant now... But i'll do my best :-P

3 files changed, 42 insertions, 15 deletions

diff --git a/tests/GUI/addmember/AddMemberTest.java b/tests/GUI/addmember/AddMemberTest.java
index 560b3e7..961d3af 100644
--- a/tests/GUI/addmember/AddMemberTest.java
+++ b/tests/GUI/addmember/AddMemberTest.java
@@ -22,15 +22,28 @@ import org.scilab.modules.gui.tab.Tab;
  */
 public class AddMemberTest {
 
+        
+        private static final String TAB_DEFAULT_TITLE = "Tab";
+        private static final String START_BANNER = "-*- Starting Program -*-";
+        private static final String STOP_BANNER = "-*- Stoping Program -*-";
+        
+        /**
+         * 
+         */
+        protected AddMemberTest() {
+                super();
+                // TODO Auto-generated constructor stub
+        }
+
         /**
          * We want to be able to add a Frame in a Tab
          */
         @Test
         public void addFrameInTab() {
-                System.out.println("-*- Starting Program -*-");
+                System.out.println(START_BANNER);
 
                 /* Tab Creation */
-                Tab tab = ScilabTab.createTab("Tab");
+                Tab tab = ScilabTab.createTab(TAB_DEFAULT_TITLE);
 
                 /* Frame creation */
                 Frame frame = ScilabFrame.createFrame();
@@ -38,7 +51,7 @@ public class AddMemberTest {
                 // Try to add a Frame in a Tab
                 assertTrue("_MUST_ be able to add a Frame in a Tab", tab.addMember(frame) != -1);
                 assertTrue("_MUST_ be able to add a Frame in a Tab (Through the Bridge)", ScilabBridge.addMember(tab, frame) != -1);
-                System.out.println("-*- Stoping Program -*-");
+                System.out.println(STOP_BANNER);
         }
 
         /**
@@ -46,7 +59,7 @@ public class AddMemberTest {
          */
         @Test
         public void addConsoleInFrame() {
-                System.out.println("-*- Starting Program -*-");
+                System.out.println(START_BANNER);
 
                 /* Frame creation */
                 Frame frame = ScilabFrame.createFrame();
@@ -57,7 +70,7 @@ public class AddMemberTest {
                 // Try to add a Console in a Frame
                 assertTrue("_MUST_NOT_ be able to add a Console in a Frame", frame.addMember(console) == -1);
                 assertTrue("_MUST_ be able to add a Console in a Frame (Through the Bridge)", ScilabBridge.addMember(frame, console) != -1);
-                System.out.println("-*- Stoping Program -*-");
+                System.out.println(STOP_BANNER);
         }
 
         /**
@@ -65,10 +78,10 @@ public class AddMemberTest {
          */
         @Test
         public void addConsoleInTab() {
-                System.out.println("-*- Starting Program -*-");
+                System.out.println(START_BANNER);
 
                 /* Tab creation */
-                Tab tab = ScilabTab.createTab("Tab");
+                Tab tab = ScilabTab.createTab(TAB_DEFAULT_TITLE);
 
                 /* Console creation */
                 Console console = ScilabConsole.createConsole();
@@ -76,7 +89,7 @@ public class AddMemberTest {
                 // Try to add a Console in a Tab
                 assertTrue("_MUST_ be able to add a Console in a Tab", tab.addMember(console) != -1);
                 assertTrue("_MUST_ be able to add a Console in a Tab(Through the Bridge)", ScilabBridge.addMember(tab, console) != -1);
-                System.out.println("-*- Stoping Program -*-");
+                System.out.println(STOP_BANNER);
                 }
 
 }
diff --git a/tests/GUI/Scilab.java b/tests/GUI/overview/Scilab.java
index ac9ba0c..494e26a 100644
--- a/tests/GUI/Scilab.java
+++ b/tests/GUI/overview/Scilab.java
@@ -2,6 +2,7 @@
 /* Copyright INRIA 2007 */
 
 
+package overview;
 
 import java.awt.EventQueue;
 
@@ -36,6 +37,9 @@ public class Scilab {
         private static final int DEFAULTWIDTH = 500;
         private static final int DEFAULTHEIGHT = 500;
 
+        private static final String X = "x";
+        private static final String AND_Y_EQUAL = "and y=";
+        
         /**
          * Constructor
          */
@@ -71,24 +75,24 @@ public class Scilab {
                 /* DIMENSIONS */
                 /* Defaut dimensions */
                 Size windowSize = mainView.getDims();
-                System.out.println("Window Size = " + windowSize.getWidth() + "x" + windowSize.getHeight());
+                System.out.println("Window Size = " + windowSize.getWidth() + X + windowSize.getHeight());
                 /* User defined dimensions */
                 Size newWindowSize = new Size(NEWWIDTH, NEWHEIGHT);
                 mainView.setDims(newWindowSize);
                 windowSize = mainView.getDims();
                 System.out.println("-*- Has size changed ??? -*-");
-                System.out.println("Window Size: " + windowSize.getWidth() + "x" + windowSize.getHeight());
+                System.out.println("Window Size: " + windowSize.getWidth() + X + windowSize.getHeight());
 
                 /* POSITION */
                 /* Default position */
                 Position windowPosition = mainView.getPosition();
-                System.out.println("Window Position: x=" + windowPosition.getX() + " and y=" + windowPosition.getY());
+                System.out.println("Window Position: x=" + windowPosition.getX() + AND_Y_EQUAL + windowPosition.getY());
                 /* User defined position */
                 Position newWindowPosition = new Position(NEWXPOSITION, NEWYPOSITION);
                 mainView.setPosition(newWindowPosition);
                 windowPosition = mainView.getPosition();
                 System.out.println("-*- Has position changed ??? -*-");
-                System.out.println("New Window Position: x=" + windowPosition.getX() + " and y=" + windowPosition.getY());
+                System.out.println("New Window Position: x=" + windowPosition.getX() + AND_Y_EQUAL + windowPosition.getY());
 
                 /* TITLE */
                 System.out.println("Window Title: " + mainView.getTitle());
diff --git a/tests/GUI/ScilabConsoleTest.java b/tests/GUI/overview/ScilabConsoleTest.java
index 30a5c83..499ce12 100644
--- a/tests/GUI/ScilabConsoleTest.java
+++ b/tests/GUI/overview/ScilabConsoleTest.java
@@ -1,7 +1,7 @@
 
 /* Copyright INRIA 2007 */
 
-
+package overview;
 
 import java.awt.EventQueue;
 
@@ -27,6 +27,16 @@ import org.scilab.modules.gui.window.Window;
  */
 public class ScilabConsoleTest {
 
+        private static final int WIDTH = 200;
+        private static final int HEIGHT = 200;
+        
+        /**
+         * Constructor
+         */
+        protected ScilabConsoleTest() {
+        throw new UnsupportedOperationException(); /* Prevents calls from subclass */
+        }
+        
         /**
          * Launch main Scilab
          * @param args not used
@@ -82,9 +92,9 @@ public class ScilabConsoleTest {
                 mainView.draw();
 
                 JFrame f = new JFrame();
-                f.setSize(200,200);
+                f.setSize(WIDTH, HEIGHT);
                 SwingScilabConsole content = new SwingScilabConsole();
-                //f.add(content);
+                f.add(content);
                 f.setVisible(true);
 
                 //              JyConsole console = new JyConsole();