Changeset 144 for trunk/tests

Timestamp:

07/16/08 18:10:24 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/tests/org/expeditee

Files:

• actions/SimpleTest.java (modified) (2 diffs)
• simple/PrimitivesTest.java (modified) (2 diffs)

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

@@ -7 +7 @@
 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;
@@ -18 +19 @@
                 super.setUp();
                 context = new Context();
+                UserSettings.Init();
         }
 

trunk/tests/org/expeditee/simple/PrimitivesTest.java

@@ -139 +139 @@
             primitives.setValue("$i.4", "-5");
             primitives.setValue("$r.1", "-5.1");
+            primitives.setValue("$r.5", "-5.0");
             primitives.setValue("$s.1", "-4.9");
             primitives.setValue("$s.2", "-5.1");
             primitives.setValue("$s.3", "-5.6");
-            assertTrue(primitives.equalValues("$i.4", "$r.1"));
+            assertFalse(primitives.equalValues("$i.4", "$r.1"));
+            assertTrue(primitives.equalValues("$i.4", "$r.5"));
             assertFalse(primitives.equalValues("$r.1", "$s.3"));
             assertTrue(primitives.equalValues("$r.1", "$s.2"));
@@ -498 +500 @@
             primitives.setValue("$r.Test", "55.5");
             primitives.setValue("$i.Test", "55.1");
-            assertTrue(primitives.compareValues("$r.Test", "$i.Test") == 0);
+            assertFalse(primitives.compareValues("$r.Test", "$i.Test") == 0);
             primitives.setValue("$r.Test", "-55.5");
             primitives.setValue("$i.Test", "-55");
+            assertFalse(primitives.compareValues("$i.Test", "$r.Test") == 0);
+            primitives.setValue("$r.Test", "-0.1");
+            primitives.setValue("$i.Test", "0");
+            assertFalse(primitives.compareValues("$r.Test", "$i.Test") == 0);
+            primitives.setValue("$r.Test", "-55.0");
+            primitives.setValue("$i.Test", "-55");
             assertTrue(primitives.compareValues("$i.Test", "$r.Test") == 0);
-            primitives.setValue("$r.Test", "-0.1");
+            primitives.setValue("$r.Test", "-0.0");
             primitives.setValue("$i.Test", "0");
             assertTrue(primitives.compareValues("$r.Test", "$i.Test") == 0);