Changeset 155 for trunk/tests

Timestamp:

07/25/08 09:23:47 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/tests/org/expeditee

Files:

• actions/SimpleTest.java (modified) (3 diffs)
• gui/DisplayIOTest.java (modified) (1 diff)
• items/StringUtilsTest.java (modified) (1 diff)

trunk/tests/org/expeditee/actions/SimpleTest.java

@@ -3 +3 @@
 import junit.framework.TestCase;
 
-import org.expeditee.actions.Simple;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.UserSettings;
 import org.expeditee.items.Text;
 import org.expeditee.simple.Context;
 
 public class SimpleTest extends TestCase {
-        static Browser b = Browser._theBrowser;
+        static Browser b;
 
         Context context;
@@ -18 +16 @@
         protected void setUp() throws Exception {
                 super.setUp();
+                b = Browser.initialize();
                 context = new Context();
-                UserSettings.Init();
         }
 
@@ -192 +190 @@
                         Simple.RunSimpleTests("SimpleTestSuite",true,false);
                 } catch (Exception e) {
-                        System.out.println("EVALUATION ERROR: " + e.getMessage());
+                        e.printStackTrace();
                         fail(e.getMessage());
                 }

trunk/tests/org/expeditee/gui/DisplayIOTest.java

@@ -11 +11 @@
 
 public class DisplayIOTest extends TestCase {
-        static Browser b = Browser._theBrowser;
+        static Browser b;
 
         protected void setUp() throws Exception {
-                if (b == null) {
-                        Browser.main(null);
-                        while (!Browser.isInitComplete()) {
-                                Thread.sleep(10);
-                        }
-                        b = Browser._theBrowser;
-                }
+                b = Browser.initialize();
                 super.setUp();
         }

trunk/tests/org/expeditee/items/StringUtilsTest.java

@@ -1 +1 @@
 package org.expeditee.items;
 
-import static org.junit.Assert.*;
+import junit.framework.TestCase;
 
 import org.junit.Before;
 import org.junit.Test;
 
-public class StringUtilsTest {
+public class StringUtilsTest extends TestCase{
 
         @Before