Changeset 32694 for gs3-extensions

Timestamp:

2018-12-16T20:36:15+13:00 (5 years ago)

Author:

ak19

Message:

Started implementing GSGUITestingUtil.java and simultaneously testing it out. To compile it now needs GLI.jar in classpath which also needs GS3 env script run, so update to build.xml as well.

Location:

gs3-extensions/testing/trunk/src

Files:

• build.xml (modified) (2 diffs)
• lib/java/GSTestingUtil.jar (modified) ( previous)
• src/gstests/tutorials/RunGLITest.java (modified) (2 diffs)
• src/org/greenstone/gsdl3/testing/GSGUITestingUtil.java (modified) (2 diffs)

gs3-extensions/testing/trunk/src/build.xml

@@ -7 +7 @@
   <property name="gli.home" value="${env.GSDL3SRCHOME}/gli"/>
   
-  <target name="build-util-jar">
+  <target name="build-util-jar" depends="needs-gs3-setup, needs-make-gli-jar">
     <mkdir dir="${basedir}/build"/>
     <javac srcdir="${basedir}/src"
@@ -16 +16 @@
       <include name="*.jar"/>
     </fileset>
+    <fileset dir="${gli.home}">
+    <include name="GLI.jar"/>
+      </fileset>
       </classpath>
       <include name="org/greenstone/gsdl3/testing/*.java"/>         

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

@@ -68 +68 @@
 import static org.assertj.swing.launcher.ApplicationLauncher.*;
 import static org.assertj.swing.finder.WindowFinder.findFrame;
+
+import static org.greenstone.gsdl3.testing.GSGUITestingUtil.*;
 
 public class RunGLITest extends AssertJSwingJUnitTestCase {
@@ -140 +142 @@
     tab.requireSelectedTab(Index.atIndex(1));
     tab.requireTitle(gatherPaneLabel, Index.atIndex(1));
+
+    // attempt to switch to enrich pane, uses static methods of GSGUITestingUtil
+    // through static import of that class
+    switchToPane(window, DOWNLOAD_PANE);
+    
   }
 

gs3-extensions/testing/trunk/src/src/org/greenstone/gsdl3/testing/GSGUITestingUtil.java

@@ -8 +8 @@
 import org.assertj.swing.fixture.*;
 
+// GLI imports
+import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.GathererProg; // main GLI class we'll be testing
+import org.greenstone.gatherer.Dictionary; // access to display strings
+
 /*
- * 
+ * Utility class containing helper functions for GLI GUI testing using AsssertJ Swing 
 */
 
 public class GSGUITestingUtil
-{
+{ 
+    public static final String DOWNLOAD_PANE = "GUI.Download"; 
+    public static final String GATHER_PANE = "GUI.Gather"; 
+    public static final String ENRICH_PANE = "GUI.Enrich"; 
+    public static final String DESIGN_PANE = "GUI.Design"; 
+    public static final String CREATE_PANE = "GUI.Create"; 
+    public static final String FORMAT_PANE = "GUI.Format";
     
-    
-    public static final String DOWNLOAD_PANE = "DownloadPane";
-    public static final String GATHER_PANE = "GatherPane";
-    public static final String ENRICH_PANE = "EnrichPane";
-    public static final String DESIGN_PANE = "DesignPane";
-    public static final String CREATE_PANE = "CreatePane";
-    public static final String FORMAT_PANE = "FormatPane";
-
     /************** NEEDED FOR TESTING *************/
     // There's now a new method in GLI: GUIManager.setNamesRecursively()
@@ -31 +34 @@
     //https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/fixture/FrameFixture.html
     public static void switchToPane(FrameFixture window, String pane) {
-    //JTabbedPaneFixture tab = window.tabbedPane("GUIManager.tab_pane");
-    JPanelFixture tab = window.panel(pane);
+    String paneLabel = Dictionary.get(pane); // e.g. GUI.Enrich
+    //JPanelFixture tab = window.panel(pane); // this just gets us the JPanel of controls within
+    JTabbedPaneFixture tab = window.tabbedPane("GUIManager.tab_pane");
+    tab.selectTab(paneLabel); // select tab by its title
     }
     public static void getMenu(String menu, String subMenu) {}