Changeset 1102 for trunk/tests
- Timestamp:
- 05/10/18 16:04:51 (6 years ago)
- Location:
- trunk/tests/org/expeditee
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tests/org/expeditee/gui/AttributeValuePairTest.java
r310 r1102 1 1 package org.expeditee.gui; 2 3 import java.awt.Color;4 2 5 3 import junit.framework.TestCase; 6 4 5 import org.expeditee.core.Colour; 7 6 import org.expeditee.items.Text; 8 7 … … 35 34 attributes.setText("c:red"); 36 35 assertTrue(AttributeUtils.setAttribute(attributes, attributes)); 37 assertEquals(Colo r.red, attributes.getColor());36 assertEquals(Colour.RED, attributes.getColor()); 38 37 attributes.setText("color:green"); 39 38 assertTrue(AttributeUtils.setAttribute(attributes, attributes)); 40 assertEquals(Colo r.green, attributes.getColor());39 assertEquals(Colour.GREEN, attributes.getColor()); 41 40 } 42 41 -
trunk/tests/org/expeditee/gui/DisplayIOTest.java
r361 r1102 11 11 showBlankFrame(); 12 12 13 Display IO.ToggleTwinFrames();14 assertTrue(Display IO.isTwinFramesOn());15 Display IO.ToggleTwinFrames();16 assertFalse(Display IO.isTwinFramesOn());13 DisplayController.toggleTwinFrames(); 14 assertTrue(DisplayController.isTwinFramesOn()); 15 DisplayController.toggleTwinFrames(); 16 assertFalse(DisplayController.isTwinFramesOn()); 17 17 } 18 18 … … 22 22 23 23 //Draw a rectangle 24 Display IO.setCursorPosition(250, 250);24 DisplayController.setCursorPosition(250, 250); 25 25 Thread.sleep(100); 26 Display IO.clickMouse(InputEvent.BUTTON3_MASK);26 DisplayController.clickMouse(InputEvent.BUTTON3_MASK); 27 27 Thread.sleep(100); 28 Display IO.setCursorPosition(500, 500);28 DisplayController.setCursorPosition(500, 500); 29 29 Thread.sleep(100); 30 Display IO.clickMouse(InputEvent.BUTTON3_MASK);30 DisplayController.clickMouse(InputEvent.BUTTON3_MASK); 31 31 Thread.sleep(1000); 32 32 //Check that the line is there … … 42 42 public static void drawLine() throws InterruptedException { 43 43 //Draw a line 44 Display IO.setCursorPosition(100, 100);44 DisplayController.setCursorPosition(100, 100); 45 45 Thread.sleep(500); 46 Display IO.clickMouse(InputEvent.BUTTON2_MASK);46 DisplayController.clickMouse(InputEvent.BUTTON2_MASK); 47 47 Thread.sleep(100); 48 Display IO.setCursorPosition(200, 200);48 DisplayController.setCursorPosition(200, 200); 49 49 Thread.sleep(100); 50 Display IO.clickMouse(InputEvent.BUTTON2_MASK);50 DisplayController.clickMouse(InputEvent.BUTTON2_MASK); 51 51 Thread.sleep(100); 52 52 } -
trunk/tests/org/expeditee/gui/FrameKeyboardsActionsTest.java
r347 r1102 12 12 public final void testTypeText() throws Exception { 13 13 Frame testFrame = showBlankFrame(); 14 Display IO.typeKey(KeyEvent.VK_ESCAPE);15 Display IO.typeText("hello");14 DisplayController.typeKey(KeyEvent.VK_ESCAPE); 15 DisplayController.typeText("hello"); 16 16 // Pick the item up in the middle 17 17 Item currentItem = FrameUtils.getCurrentItem(); 18 18 assertNotNull(currentItem); 19 Display IO.setCursorPosition(currentItem.getX()19 DisplayController.setCursorPosition(currentItem.getX() 20 20 + currentItem.getBoundsWidth() / 2, 21 21 FrameMouseActions.MouseY - 2); 22 22 Thread.sleep(DELAY); 23 Display IO.clickMouse(InputEvent.BUTTON2_MASK);23 DisplayController.clickMouse(InputEvent.BUTTON2_MASK); 24 24 Thread.sleep(DELAY); 25 Display IO.setCursorPosition(25 DisplayController.setCursorPosition( 26 26 Math.round(FrameGraphics.getMaxFrameSize().getWidth() / 2), 27 27 FrameMouseActions.MouseY); 28 28 Thread.sleep(DELAY); 29 Display IO.typeKey(KeyEvent.VK_ESCAPE);29 DisplayController.typeKey(KeyEvent.VK_ESCAPE); 30 30 Thread.sleep(DELAY); 31 Display IO.clickMouse(InputEvent.BUTTON2_MASK);31 DisplayController.clickMouse(InputEvent.BUTTON2_MASK); 32 32 Thread.sleep(DELAY); 33 33 … … 35 35 assertEquals(currentItem.getX(), FrameMouseActions.getX()); 36 36 37 Display IO.typeKey(KeyEvent.VK_ESCAPE);37 DisplayController.typeKey(KeyEvent.VK_ESCAPE); 38 38 39 Display IO.typeStringDirect(0.05, "Hello Again!");39 DisplayController.typeStringDirect(0.05, "Hello Again!"); 40 40 41 Display IO.typeKey(KeyEvent.VK_ESCAPE);41 DisplayController.typeKey(KeyEvent.VK_ESCAPE); 42 42 43 Display IO.typeText("Hello Again");43 DisplayController.typeText("Hello Again"); 44 44 45 45 assertEquals(4, testFrame.getItems(false).size()); -
trunk/tests/org/expeditee/gui/FrameMouseActionsTest.java
r361 r1102 16 16 testLeftRanging(title); 17 17 18 String newFrameName = Display IO.getCurrentFrame().getName();18 String newFrameName = DisplayController.getCurrentFrame().getName(); 19 19 Navigation.Back(); 20 20 … … 30 30 DisplayIOTest.drawLine(); 31 31 32 newFrameName = Display IO.getCurrentFrame().getName();32 newFrameName = DisplayController.getCurrentFrame().getName(); 33 33 Navigation.Back(); 34 34 … … 45 45 private void testLeftRanging(Text title) throws InterruptedException { 46 46 int y = title.getY() - 2; 47 Display IO.setCursorPosition(title.getX(), y);47 DisplayController.setCursorPosition(title.getX(), y); 48 48 Thread.sleep(500); 49 Display IO.pressMouse(InputEvent.BUTTON1_MASK);49 DisplayController.pressMouse(InputEvent.BUTTON1_MASK); 50 50 Thread.sleep(100); 51 Display IO.setCursorPosition(title.getX() + title.getBoundsWidth() / 2,51 DisplayController.setCursorPosition(title.getX() + title.getBoundsWidth() / 2, 52 52 y); 53 53 Thread.sleep(500); 54 Display IO.releaseMouse(InputEvent.BUTTON1_MASK);54 DisplayController.releaseMouse(InputEvent.BUTTON1_MASK); 55 55 Thread.sleep(100); 56 56 … … 59 59 60 60 // Highlight then unhighlight 61 Display IO.setCursorPosition(title.getX(), y);61 DisplayController.setCursorPosition(title.getX(), y); 62 62 Thread.sleep(500); 63 Display IO.pressMouse(InputEvent.BUTTON1_MASK);63 DisplayController.pressMouse(InputEvent.BUTTON1_MASK); 64 64 Thread.sleep(100); 65 Display IO.setCursorPosition(title.getX() + title.getBoundsWidth() / 2,65 DisplayController.setCursorPosition(title.getX() + title.getBoundsWidth() / 2, 66 66 y); 67 67 Thread.sleep(500); 68 Display IO.setCursorPosition(title.getX(), y);68 DisplayController.setCursorPosition(title.getX(), y); 69 69 Thread.sleep(500); 70 Display IO.releaseMouse(InputEvent.BUTTON1_MASK);70 DisplayController.releaseMouse(InputEvent.BUTTON1_MASK); 71 71 Thread.sleep(500); 72 72 -
trunk/tests/org/expeditee/gui/FreeItemsTest.java
r330 r1102 13 13 14 14 FrameMouseActions.pickup(testFrame.getTitleItem()); 15 assertTrue(FreeItems. itemsAttachedToCursor());15 assertTrue(FreeItems.hasItemsAttachedToCursor()); 16 16 assertTrue(FreeItems.textOnlyAttachedToCursor()); 17 17 18 18 FrameMouseActions.anchor(FreeItems.getInstance()); 19 assertFalse(FreeItems. itemsAttachedToCursor());19 assertFalse(FreeItems.hasItemsAttachedToCursor()); 20 20 assertFalse(FreeItems.textOnlyAttachedToCursor()); 21 21 22 22 FrameMouseActions.pickup(testFrame.getAllItems()); 23 assertTrue(FreeItems. itemsAttachedToCursor());23 assertTrue(FreeItems.hasItemsAttachedToCursor()); 24 24 assertFalse(FreeItems.textOnlyAttachedToCursor()); 25 25 assertEquals(8, FreeItems.getTextItems().size()); … … 31 31 32 32 FrameMouseActions.anchor(FreeItems.getInstance()); 33 assertFalse(FreeItems. itemsAttachedToCursor());33 assertFalse(FreeItems.hasItemsAttachedToCursor()); 34 34 assertFalse(FreeItems.textOnlyAttachedToCursor()); 35 35 } -
trunk/tests/org/expeditee/gui/GuiTestCase.java
r330 r1102 18 18 Frame testFrame = FrameIO.LoadFrame("ExpediteeTest1"); 19 19 testFrame.clear(false); 20 Display IO.setCurrentFrame(testFrame, true);20 DisplayController.setCurrentFrame(testFrame, true); 21 21 return testFrame; 22 22 } … … 25 25 Frame testFrame = FrameIO.LoadFrame(frameName); 26 26 testFrame.clear(false); 27 Display IO.setCurrentFrame(testFrame, true);27 DisplayController.setCurrentFrame(testFrame, true); 28 28 return testFrame; 29 29 } -
trunk/tests/org/expeditee/io/ConversionTest.java
r428 r1102 1 1 package org.expeditee.io; 2 2 3 import java.awt.Color;4 3 import java.awt.Font; 5 4 import java.awt.Point; … … 10 9 import junit.framework.TestCase; 11 10 11 import org.expeditee.core.Colour; 12 12 import org.expeditee.items.Item; 13 13 import org.expeditee.items.Justification; … … 17 17 18 18 public final void testGetColor() { 19 assertEquals(null, Conversion.getColor("TrAnSpArEnT", Colo r.white));20 assertEquals(null, Conversion.getColor("Clear", Colo r.white));21 assertEquals(null, Conversion.getColor("Auto", Colo r.white));22 assertEquals(null, Conversion.getColor("Default", Colo r.white));23 assertEquals(null, Conversion.getColor("adf", Colo r.red));24 assertEquals(null, Conversion.getColor("none", Colo r.red));25 assertEquals(null, Conversion.getColor("null", Colo r.red));26 assertEquals(null, Conversion.getColor(null, Colo r.red));27 assertEquals(null, Conversion.getColor("a0a0a0", Colo r.white));28 29 assertEquals(Colo r.red, Conversion.getColor("100 0 0", Color.white));30 assertEquals(Colo r.green, Conversion.getColor("0 100 0", Color.white));31 assertEquals(Colo r.blue, Conversion.getColor("0 0 100", Color.white));32 assertEquals(Colo r.white, Conversion.getColor("100 100 100",33 Colo r.white));34 assertEquals(Colo r.gray, Conversion.getColor("50 50 50", Color.white));35 assertEquals(Colo r.green, Conversion.getColor("-100 +0 -100",36 Colo r.white));37 assertEquals(Colo r.green, Conversion.getColor("-10 +100 +0",38 Colo r.black));39 assertEquals(Colo r.green, Conversion.getColor("+0 +110 +0", null));40 41 assertEquals(Conversion.getColor("red9", Colo r.white), new Color(0.9F,19 assertEquals(null, Conversion.getColor("TrAnSpArEnT", Colour.WHITE)); 20 assertEquals(null, Conversion.getColor("Clear", Colour.WHITE)); 21 assertEquals(null, Conversion.getColor("Auto", Colour.WHITE)); 22 assertEquals(null, Conversion.getColor("Default", Colour.WHITE)); 23 assertEquals(null, Conversion.getColor("adf", Colour.RED)); 24 assertEquals(null, Conversion.getColor("none", Colour.RED)); 25 assertEquals(null, Conversion.getColor("null", Colour.RED)); 26 assertEquals(null, Conversion.getColor(null, Colour.RED)); 27 assertEquals(null, Conversion.getColor("a0a0a0", Colour.WHITE)); 28 29 assertEquals(Colour.RED, Conversion.getColor("100 0 0", Colour.WHITE)); 30 assertEquals(Colour.GREEN, Conversion.getColor("0 100 0", Colour.WHITE)); 31 assertEquals(Colour.BLUE, Conversion.getColor("0 0 100", Colour.WHITE)); 32 assertEquals(Colour.WHITE, Conversion.getColor("100 100 100", 33 Colour.WHITE)); 34 assertEquals(Colour.GREY, Conversion.getColor("50 50 50", Colour.WHITE)); 35 assertEquals(Colour.GREEN, Conversion.getColor("-100 +0 -100", 36 Colour.WHITE)); 37 assertEquals(Colour.GREEN, Conversion.getColor("-10 +100 +0", 38 Colour.BLACK)); 39 assertEquals(Colour.GREEN, Conversion.getColor("+0 +110 +0", null)); 40 41 assertEquals(Conversion.getColor("red9", Colour.WHITE), new Colour(0.9F, 42 42 0.0F, 0.0F)); 43 assertEquals(Conversion.getColor("BlUe15", Colo r.white), new Color(43 assertEquals(Conversion.getColor("BlUe15", Colour.WHITE), new Colour( 44 44 0.0F, 0.0F, 1.0F)); 45 assertEquals(Conversion.getColor("GREEN0", Colo r.white), new Color(45 assertEquals(Conversion.getColor("GREEN0", Colour.WHITE), new Colour( 46 46 0.0F, 0.0F, 0.0F)); 47 assertEquals(Conversion.getColor("GREEN3", Colo r.white), new Color(47 assertEquals(Conversion.getColor("GREEN3", Colour.WHITE), new Colour( 48 48 0.0F, 0.3F, 0.0F)); 49 assertEquals(Conversion.getColor("Blue1", Colo r.white), new Color(0.0F,49 assertEquals(Conversion.getColor("Blue1", Colour.WHITE), new Colour(0.0F, 50 50 0.0F, 0.1F)); 51 51 } 52 52 53 53 public final void testGetExpediteeColorCode() { 54 assertTrue(Conversion.getExpediteeColorCode(Colo r.red)54 assertTrue(Conversion.getExpediteeColorCode(Colour.RED) 55 55 .equals("100 0 0")); 56 assertTrue(Conversion.getExpediteeColorCode(Colo r.green).equals(56 assertTrue(Conversion.getExpediteeColorCode(Colour.GREEN).equals( 57 57 "0 100 0")); 58 assertTrue(Conversion.getExpediteeColorCode(Colo r.blue).equals(58 assertTrue(Conversion.getExpediteeColorCode(Colour.BLUE).equals( 59 59 "0 0 100")); 60 60 } … … 127 127 128 128 // Test Color Conversion 129 assertEquals(Colo r.darkGray, Conversion.Convert(Color.class,129 assertEquals(Colour.DARK_GREY, Conversion.Convert(Colour.class, 130 130 "dark_gray")); 131 assertEquals(Colo r.darkGray, Conversion132 .Convert(Colo r.class, "DARKGRAY"));133 assertEquals(Colo r.red, Conversion.Convert(Color.class, "red"));134 assertEquals(Colo r.red, Conversion.Convert(Color.class, "Red"));135 assertEquals(Colo r.red, Conversion.Convert(Color.class, "RED"));136 assertEquals(Colo r.red, Conversion.Convert(Color.class, " 100 "));137 assertEquals(Colo r.green, Conversion.Convert(Color.class, "0 100"));138 assertEquals(Colo r.blue, Conversion.Convert(Color.class, "0 0 100"));131 assertEquals(Colour.DARK_GREY, Conversion 132 .Convert(Colour.class, "DARKGRAY")); 133 assertEquals(Colour.RED, Conversion.Convert(Colour.class, "red")); 134 assertEquals(Colour.RED, Conversion.Convert(Colour.class, "Red")); 135 assertEquals(Colour.RED, Conversion.Convert(Colour.class, "RED")); 136 assertEquals(Colour.RED, Conversion.Convert(Colour.class, " 100 ")); 137 assertEquals(Colour.GREEN, Conversion.Convert(Colour.class, "0 100")); 138 assertEquals(Colour.BLUE, Conversion.Convert(Colour.class, "0 0 100")); 139 139 // Test Boolean Conversion 140 140 assertEquals(true, Conversion.Convert(boolean.class, "")); … … 151 151 152 152 public final void testConvertClassStringObject() { 153 assertEquals( new Color(255, 0, 255), Conversion.Convert(Color.class,153 assertEquals(Colour.FromRGB255(255, 0, 255), Conversion.Convert(Colour.class, 154 154 "+100 +0 +100", null)); 155 assertEquals(Colo r.red, Conversion.Convert(Color.class, "+100 +0 -100",156 Colo r.blue));157 assertEquals(Colo r.black, Conversion.Convert(Color.class, "-0 +0 -100",158 Colo r.blue));155 assertEquals(Colour.RED, Conversion.Convert(Colour.class, "+100 +0 -100", 156 Colour.BLUE)); 157 assertEquals(Colour.BLACK, Conversion.Convert(Colour.class, "-0 +0 -100", 158 Colour.BLUE)); 159 159 // Float test 160 160 assertEquals(2.0F, Conversion.Convert(float.class, "2.0", null)); … … 305 305 306 306 assertEquals("100 0 0", Conversion.ConvertToExpeditee(getPosition, 307 Colo r.red));307 Colour.RED)); 308 308 309 309 assertEquals(null, Conversion.ConvertToExpeditee(getPosition, null)); … … 325 325 326 326 public final void testGetCssColor() { 327 assertEquals("rgb(255,0,0)", Conversion.getCssColor(Colo r.red));328 assertEquals("rgb(255,0,255)", Conversion.getCssColor(Colo r.magenta));329 assertEquals("rgb(128,128,128)", Conversion.getCssColor(Colo r.gray));327 assertEquals("rgb(255,0,0)", Conversion.getCssColor(Colour.RED)); 328 assertEquals("rgb(255,0,255)", Conversion.getCssColor(Colour.MAGENTA)); 329 assertEquals("rgb(128,128,128)", Conversion.getCssColor(Colour.GREY)); 330 330 } 331 331 } -
trunk/tests/org/expeditee/items/widgets/InteractiveWidgetTest.java
r227 r1102 7 7 public void testParseArgs1() { 8 8 9 assertNull( InteractiveWidget.parseArgs(null));10 assertNull( InteractiveWidget.parseArgs(""));11 assertNull( InteractiveWidget.parseArgs(" "));9 assertNull(Widget.parseArgs(null)); 10 assertNull(Widget.parseArgs("")); 11 assertNull(Widget.parseArgs(" ")); 12 12 13 String[] args = InteractiveWidget.parseArgs("arg1");13 String[] args = Widget.parseArgs("arg1"); 14 14 assertEquals(1, args.length); 15 15 assertEquals("arg1", args[0]); 16 16 17 args = InteractiveWidget.parseArgs("arg1 arg2");17 args = Widget.parseArgs("arg1 arg2"); 18 18 assertEquals(2, args.length); 19 19 assertEquals("arg1", args[0]); 20 20 assertEquals("arg2", args[1]); 21 21 22 args = InteractiveWidget.parseArgs(" )*^*$^ 24224 5775 13 : ");22 args = Widget.parseArgs(" )*^*$^ 24224 5775 13 : "); 23 23 assertEquals(5, args.length); 24 24 assertEquals(")*^*$^", args[0]); … … 31 31 public void testParseArgs2() { 32 32 33 String[] args = InteractiveWidget.parseArgs("\"");33 String[] args = Widget.parseArgs("\""); 34 34 assertNull(args); 35 35 36 args = InteractiveWidget.parseArgs("\"\"");36 args = Widget.parseArgs("\"\""); 37 37 assertEquals(1, args.length); 38 38 assertEquals("\"", args[0]); 39 39 40 args = InteractiveWidget.parseArgs("\"\"\"\"\"\"\"");40 args = Widget.parseArgs("\"\"\"\"\"\"\""); 41 41 assertEquals(1, args.length); 42 42 assertEquals("\"\"\"", args[0]); 43 43 44 args = InteractiveWidget.parseArgs(" \" \" ");44 args = Widget.parseArgs(" \" \" "); 45 45 assertEquals(1, args.length); 46 46 assertEquals(" ", args[0]); 47 47 48 args = InteractiveWidget.parseArgs("arg1\" \"");48 args = Widget.parseArgs("arg1\" \""); 49 49 assertEquals(1, args.length); 50 50 assertEquals("arg1 ", args[0]); 51 51 52 args = InteractiveWidget.parseArgs("arg1\" \"+8");52 args = Widget.parseArgs("arg1\" \"+8"); 53 53 assertEquals(1, args.length); 54 54 assertEquals("arg1 +8", args[0]); 55 55 56 args = InteractiveWidget.parseArgs("abc\" \"de 123\" \"45");56 args = Widget.parseArgs("abc\" \"de 123\" \"45"); 57 57 assertEquals(2, args.length); 58 58 assertEquals("abc de", args[0]); 59 59 assertEquals("123 45", args[1]); 60 60 61 args = InteractiveWidget.parseArgs("adgdag\" adgdgadag");61 args = Widget.parseArgs("adgdag\" adgdgadag"); 62 62 assertEquals(1, args.length); 63 63 assertEquals("adgdag adgdgadag", args[0]); 64 64 65 args = InteractiveWidget.parseArgs("abc\"\"\" s \" ggg");65 args = Widget.parseArgs("abc\"\"\" s \" ggg"); 66 66 assertEquals(2, args.length); 67 67 assertEquals("abc\" s ", args[0]); 68 68 assertEquals("ggg", args[1]); 69 69 70 args = InteractiveWidget.parseArgs("abc\"\"123");70 args = Widget.parseArgs("abc\"\"123"); 71 71 assertEquals(1, args.length); 72 72 assertEquals("abc\"123", args[0]); 73 73 74 args = InteractiveWidget.parseArgs("file=\"a URL with spaces\" title=\"A title with spaces and \"\"quotes\"\"\"");74 args = Widget.parseArgs("file=\"a URL with spaces\" title=\"A title with spaces and \"\"quotes\"\"\""); 75 75 assertEquals(2, args.length); 76 76 assertEquals("file=a URL with spaces", args[0]); … … 101 101 private void AssertArgParsingAndFormatting(String str) { 102 102 103 String[] args1 = InteractiveWidget.parseArgs(str);103 String[] args1 = Widget.parseArgs(str); 104 104 105 String formatted = InteractiveWidget.formatArgs(args1);105 String formatted = Widget.formatArgs(args1); 106 106 107 String[] args2 = InteractiveWidget.parseArgs(formatted);107 String[] args2 = Widget.parseArgs(formatted); 108 108 109 109 if (args1 == null || args2 == null) assertEquals(args1, args2);
Note:
See TracChangeset
for help on using the changeset viewer.