Changeset 330 for trunk/tests
- Timestamp:
- 09/25/08 13:12:19 (16 years ago)
- Location:
- trunk/tests/org/expeditee/gui
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tests/org/expeditee/gui/DisplayIOTest.java
r327 r330 8 8 import org.expeditee.items.Item; 9 9 10 public class DisplayIOTest extends TestCase { 11 static Browser b; 12 13 protected void setUp() throws Exception { 14 b = Browser.initializeForTesting(); 15 super.setUp(); 16 } 10 public class DisplayIOTest extends GuiTestCase { 17 11 18 12 public final void testToggleTwinFrames() { 19 DisplayIO.setCurrentFrame(FrameIO.LoadFrame("ExpediteeTest1"), true); 13 showBlankFrame(); 14 20 15 DisplayIO.ToggleTwinFrames(); 21 16 assertTrue(DisplayIO.isTwinFramesOn()); … … 25 20 26 21 public final void testMouse() throws Exception{ 27 Frame testFrame = FrameIO.LoadFrame("ExpediteeTest1"); 28 testFrame.clear(false); 29 DisplayIO.setCurrentFrame(testFrame, true); 22 Frame testFrame = showBlankFrame(); 30 23 drawLine(); 24 31 25 //Draw a rectangle 32 26 DisplayIO.setCursorPosition(250, 250); … … 51 45 //Draw a line 52 46 DisplayIO.setCursorPosition(100, 100); 53 Thread.sleep( 1000);47 Thread.sleep(500); 54 48 DisplayIO.clickMouse(InputEvent.BUTTON2_MASK); 55 49 Thread.sleep(100); -
trunk/tests/org/expeditee/gui/FrameMouseActionsTest.java
r310 r330 8 8 import org.expeditee.items.Text; 9 9 10 public class FrameMouseActionsTest extends TestCase { 11 static Browser b; 12 13 protected void setUp() throws Exception { 14 b = Browser.initializeForTesting(); 15 super.setUp(); 16 } 10 public class FrameMouseActionsTest extends GuiTestCase { 17 11 18 12 public final void testLeftHighlight() throws Exception { 19 Frame testFrame = FrameIO.LoadFrame("ExpediteeTest1"); 20 testFrame.clear(false); 21 DisplayIO.setCurrentFrame(testFrame, true); 13 Frame testFrame = showBlankFrame(); 14 22 15 // LeftRange the title text for unlinked title 23 16 Text title = testFrame.getTitleItem(); … … 35 28 testLeftRanging(title); 36 29 37 Thread.sleep( 1000);30 Thread.sleep(500); 38 31 39 32 DisplayIOTest.drawLine(); … … 42 35 Navigation.Back(); 43 36 37 Thread.sleep(500); 44 38 // Make sure the newly created frame is saved when the user goes back 45 39 assertNotNull(FrameIO.LoadFrame(newFrameName)); … … 54 48 int y = title.getY() - 2; 55 49 DisplayIO.setCursorPosition(title.getX(), y); 56 Thread.sleep( 1000);50 Thread.sleep(500); 57 51 DisplayIO.pressMouse(InputEvent.BUTTON1_MASK); 58 52 Thread.sleep(100); 59 53 DisplayIO.setCursorPosition(title.getX() + title.getBoundsWidth() / 2, 60 54 y); 61 Thread.sleep( 1000);55 Thread.sleep(500); 62 56 DisplayIO.releaseMouse(InputEvent.BUTTON1_MASK); 63 57 Thread.sleep(100); … … 68 62 // Highlight then unhighlight 69 63 DisplayIO.setCursorPosition(title.getX(), y); 70 Thread.sleep( 1000);64 Thread.sleep(500); 71 65 DisplayIO.pressMouse(InputEvent.BUTTON1_MASK); 72 66 Thread.sleep(100); 73 67 DisplayIO.setCursorPosition(title.getX() + title.getBoundsWidth() / 2, 74 68 y); 75 Thread.sleep( 1000);69 Thread.sleep(500); 76 70 DisplayIO.setCursorPosition(title.getX(), y); 77 Thread.sleep( 1000);71 Thread.sleep(500); 78 72 DisplayIO.releaseMouse(InputEvent.BUTTON1_MASK); 79 Thread.sleep( 1000);73 Thread.sleep(500); 80 74 81 75 // Make sure TDFC was performed -
trunk/tests/org/expeditee/gui/FreeItemsTest.java
r310 r330 1 1 package org.expeditee.gui; 2 2 3 import junit.framework.TestCase;4 3 5 public class FreeItemsTest extends TestCase { 6 static Browser b; 7 8 protected void setUp() throws Exception { 9 b = Browser.initializeForTesting(); 10 super.setUp(); 11 } 4 public class FreeItemsTest extends GuiTestCase { 12 5 13 6 /** … … 17 10 */ 18 11 public final void testAttachedToCursor() throws Exception { 19 Frame testFrame = FrameIO.LoadFrame("ExpediteeTest2"); 20 DisplayIO.setCurrentFrame(testFrame, true); 12 Frame testFrame = showFrame("ExpediteeTest2"); 21 13 22 /* Just incase previous tests left something on the cursor clear it now! */23 FreeItems.getInstance().clear();24 14 FrameMouseActions.pickup(testFrame.getTitleItem()); 25 15 assertTrue(FreeItems.itemsAttachedToCursor());
Note:
See TracChangeset
for help on using the changeset viewer.