Changeset 32715

Timestamp:

2018-12-18T22:12:16+13:00 (5 years ago)

Author:

ak19

Message:

Turning off EDT (event dispatch thread) violation check doesn't help if the EDT violation still remains in GLI. In fact, by turning off the check and leaving the errors in, the robot suddenly stops working here and there, with tests failing cryptically. Committing the modifications for turning off the EDT violation check a separate file, but there seems to be no choice but to read up on SwingWorker and start doing the right thing in GLI.

File:

• gs3-extensions/testing/trunk/src/src/gstests/tutorials/RunGLITest.EDTcheckOff_NoHelp (copied) (copied from gs3-extensions/testing/trunk/src/src/gstests/tutorials/RunGLITest.java ) (4 diffs)

gs3-extensions/testing/trunk/src/src/gstests/tutorials/RunGLITest.EDTcheckOff_NoHelp

@@ -73 +73 @@
  * Class that will eventually go through all the Greenstone3 tutorials by running GLI and GEMS.
  */
-public class RunGLITest extends AssertJSwingJUnitTestCase {
+public class RunGLITest {
     // For aborting running test suite, with Ctrl+Shift+A by default
     // https://joel-costigliola.github.io/assertj/assertj-swing-running.html
     private static EmergencyAbortListener abortListener = EmergencyAbortListener.registerInToolkit();    
-    private static WebDriver _driver = new FirefoxDriver(); // selenium
+    private static WebDriver _driver = new FirefoxDriver(); // for browser tests with selenium
+    private static Robot robot; // for Java GUI tests with assertj-swing
     
     private FrameFixture window;
+    
+    @BeforeClass
+    public static void setUpOnce() {
+    //FailOnThreadViolationRepaintManager.install();
 
-    // Selenium
+    // Need to have the robot before we can call runGLI()
+    // Robot is the class that controls/drives user input by taking control over the keyboard and mouse
+    robot = BasicRobot.robotWithNewAwtHierarchy();
+    }
+    
+
     @Before
     public void init()
     {
+    // 1. Selenium
+    
     //https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr
     // GS3's build.xml would have set the webdriver.gecko.driver path System.Property to
@@ -90 +102 @@
     // So now we can continue to just do:
     _driver.get(System.getProperty("SERVERURL"));
-    }
     
 
-    // assertj-swing
-    // As init() above, onSetUp() gets called before every test method too,
-    // but is overridden from assertj-swing base class
-    @Override
-    protected void onSetUp() {
+    // 2. assertj-swing 
+
+    // Run GLI and show the window  
     // Launch GLI and then get a ref to the launched app window:
     runGLI();
-    
-    
-    // IMPORTANT, note the call to 'robot()': must use the Robot from AssertJSwingJUnitTestCase
+
+    // IMPORTANT, note the call to 'robot()': must use the Robot from AssertJSwingJUnitTestCase base class
     //window = findFrame("GUIManager").using(robot());
-    window = GSGUITestingUtil.getGLIApplicationWindow(robot());
+    window = GSGUITestingUtil.getGLIApplicationWindow(robot);
     }
     
@@ -150 +158 @@
       closeCollection(); // collection must be closed in order to be deleted
       deleteCollection("pinky");
+      
       // wait a few of seconds again?
       PAUSE(2);
@@ -165 +174 @@
       PAUSE(3);
   }
-
+    
+    @After
+    public void tearDown() {
+    // call FrameFixture's cleanUp() which
+    // "Cleans up any used resources (keyboard, mouse, open windows and ScreenLock) used by this robot."
+    window.cleanUp();
+    }
+    
     // Selenium
     // called once and only once: to quit the firefox driver geckodriver