Changeset 310

Timestamp:

09/22/08 16:22:14 (16 years ago)

Author:

ra33

Message:

Fixed a couple of bugs that were makin unit tests fail

Location:

trunk/tests/org/expeditee/gui

Files:

• AttributeValuePairTest.java (modified) (1 diff)
• DisplayIOTest.java (modified) (2 diffs)
• FrameMouseActionsTest.java (added)
• FreeItemsTest.java (modified) (2 diffs)

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

@@ -63 +63 @@
                                 { "  Att2  :  Value2  ", "Att2" }, { "@NoValue", "NoValue" },
                                 { "@Att3 : Value", null }, { "@ Att3: Value", null },
-                                { " @Att3: Value ", "@Att3" }, { ": value3", null },
-                                { "@1Test: value3", null }, { "@t est: value3", null },
+                                { " @Att3: Value ", "Att3" }, { ": value3", null },
+                                { "@1Test: value3", "1Test" }, { "@t est: value3", null },
                                 { "Att4 : test : value4", "Att4 : test" }, { "@", null },
                                 { "a", null }, { "*!*", null }, { "*!*: @%@", "*!*" } };

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

@@ -30 +30 @@
                 testFrame.clear(false);
                 DisplayIO.setCurrentFrame(testFrame, true);
-                //Draw a line
-                DisplayIO.setCursorPosition(100, 100);
-                Thread.sleep(1000);
-                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
-                Thread.sleep(100);
-                DisplayIO.setCursorPosition(200, 200);
-                Thread.sleep(100);
-                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
-                Thread.sleep(100);
+                drawLine();
                 //Draw a rectangle
                 DisplayIO.setCursorPosition(250, 250);
@@ -53 +45 @@
                 Map<String, Integer> itemCounts = getItemCount(items);
                 
+        }
+
+        /**
+         * @throws InterruptedException
+         */
+        public static void drawLine() throws InterruptedException {
+                //Draw a line
+                DisplayIO.setCursorPosition(100, 100);
+                Thread.sleep(1000);
+                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                Thread.sleep(100);
+                DisplayIO.setCursorPosition(200, 200);
+                Thread.sleep(100);
+                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                Thread.sleep(100);
         }
 

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

@@ -13 +13 @@
         /**
          * Test the picking up and putting down of objects on a frame.
+         * 
          * @throws Exception
          */
@@ -19 +20 @@
                 DisplayIO.setCurrentFrame(testFrame, true);
 
+                /* Just incase previous tests left something on the cursor clear it now! */
+                FreeItems.getInstance().clear();
                 FrameMouseActions.pickup(testFrame.getTitleItem());
                 assertTrue(FreeItems.itemsAttachedToCursor());