Changeset 32713 for gs3-extensions/testing/trunk/src/src/gstests/tutorials/RunGLITest.java

Timestamp:

2018-12-18T19:31:51+13:00 (5 years ago)

Author:

ak19

Message:

No longer passing around the FrameFixture window object between the test class and the testutil class of helper functions. The helper class (GSGUITestingUtil) keeps a reference to it, but it's still instantiated in the test class to ensure JUnit setup and teardown works normally on a per test basis (or however will turn out best when we finally get tutorial tests implemented).

File:

• gs3-extensions/testing/trunk/src/src/gstests/tutorials/RunGLITest.java (modified) (2 diffs)

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

@@ -129 +129 @@
       window = findFrame("GUIManager").using(robot());
       
+      GSGUITestingUtil.setWindow(window); // set this first before calling any of Util's other methods
+      
       String gatherPaneLabel = Dictionary.get("GUI.Gather");
       System.err.println("@@@ Expecting label: " + gatherPaneLabel);
@@ -142 +144 @@
       // attempt to switch to enrich pane, uses static methods of GSGUITestingUtil
       // through static import of that class
-      switchToPane(window, DOWNLOAD_PANE);
+      switchToPane(DOWNLOAD_PANE);
 
       // For testing, want GLI to be in librarian mode by default
-      changeUserMode(window, "librarian");
+      changeUserMode("librarian");
 
-      switchToPane(window, GATHER_PANE);
+      switchToPane(GATHER_PANE);
       
-      loadCollection(window, "lucene-jdbm-demo");
+      loadCollection("lucene-jdbm-demo");
 
       // wait a couple of seconds again?
       PAUSE(2);      
-      closeCollection(window);
+      closeCollection();
       
-      createCollection(window, "pinky", "Pinky was here", null);
-      closeCollection(window); // collection must be closed in order to be deleted
-      deleteCollection(window, "pinky");
+      createCollection("pinky", "Pinky was here", null);
+      closeCollection(); // collection must be closed in order to be deleted
+      deleteCollection("pinky");
       // wait a few of seconds again?
       PAUSE(2);
       
-      exportCollection(window, "GreenstoneMETS", "lucene-jdbm-demo");
+      exportCollection("GreenstoneMETS", "lucene-jdbm-demo");
 
       // Reset GLI to expert mode for regular GLI use
-      changeUserMode(window, "expert");
+      changeUserMode("expert");
       
       PAUSE(5);
-      //exitGLI(window);
+      //exitGLI();
       
-      switchToPane(window, GATHER_PANE);
+      switchToPane(GATHER_PANE);
   }