Changeset 1102 for trunk/tests/org/expeditee/gui/DisplayIOTest.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/tests/org/expeditee/gui/DisplayIOTest.java (modified) (3 diffs)

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

@@ -11 +11 @@
                 showBlankFrame();
 
-                DisplayIO.ToggleTwinFrames();
-                assertTrue(DisplayIO.isTwinFramesOn());
-                DisplayIO.ToggleTwinFrames();
-                assertFalse(DisplayIO.isTwinFramesOn());
+                DisplayController.toggleTwinFrames();
+                assertTrue(DisplayController.isTwinFramesOn());
+                DisplayController.toggleTwinFrames();
+                assertFalse(DisplayController.isTwinFramesOn());
         }
 
@@ -22 +22 @@
                 
                 //Draw a rectangle
-                DisplayIO.setCursorPosition(250, 250);
+                DisplayController.setCursorPosition(250, 250);
                 Thread.sleep(100);
-                DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
+                DisplayController.clickMouse(InputEvent.BUTTON3_MASK);
                 Thread.sleep(100);
-                DisplayIO.setCursorPosition(500, 500);
+                DisplayController.setCursorPosition(500, 500);
                 Thread.sleep(100);
-                DisplayIO.clickMouse(InputEvent.BUTTON3_MASK);
+                DisplayController.clickMouse(InputEvent.BUTTON3_MASK);
                 Thread.sleep(1000);
                 //Check that the line is there
@@ -42 +42 @@
         public static void drawLine() throws InterruptedException {
                 //Draw a line
-                DisplayIO.setCursorPosition(100, 100);
+                DisplayController.setCursorPosition(100, 100);
                 Thread.sleep(500);
-                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                DisplayController.clickMouse(InputEvent.BUTTON2_MASK);
                 Thread.sleep(100);
-                DisplayIO.setCursorPosition(200, 200);
+                DisplayController.setCursorPosition(200, 200);
                 Thread.sleep(100);
-                DisplayIO.clickMouse(InputEvent.BUTTON2_MASK);
+                DisplayController.clickMouse(InputEvent.BUTTON2_MASK);
                 Thread.sleep(100);
         }