Changeset 32692 for gs3-extensions

Timestamp:

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

Author:

ak19

Message:

Success in next step: am able to use the shorter component access methods which access a by component by name to repeat the original sample testing code of launching GLI, checking it launched eventually and checking that the Gather pane is selected and has the expected label.

Location:

gs3-extensions/testing/trunk/src/src

Files:

• gstests/tutorials/RunGLITest.java (modified) (4 diffs)
• org/greenstone/gsdl3/testing/GSGUITestingUtil.java (modified) (3 diffs)

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

@@ -122 +122 @@
 
    
-      // https://joel-costigliola.github.io/assertj/assertj-swing-launch.html
-      window = findFrame(new GenericTypeMatcher<JFrame>(JFrame.class) {
+      // https://joel-costigliola.github.io/assertj/assertj-swing-launch.html      
+      /*window = findFrame(new GenericTypeMatcher<JFrame>(JFrame.class) {
           protected boolean isMatching(JFrame window) {
           return window.getTitle().trim().startsWith(expectedWindowTitle)
@@ -129 +129 @@
           }
       }).using(robot());
+      */
 
+      window = findFrame("GUIManager").using(robot());
         
     String gatherPaneLabel = Dictionary.get("GUI.Gather");
@@ -146 +148 @@
         };
     */
+
+    JTabbedPaneFixture tab = window.tabbedPane("GUIManager.tab_pane");
+    /*
     JTabbedPaneFixture tab = window.tabbedPane(new GenericTypeMatcher<JTabbedPane>(JTabbedPane.class) {
         @Override protected boolean isMatching(JTabbedPane tabPane) {
@@ -156 +161 @@
         }
         });
+    */
+    
     tab.requireSelectedTab(Index.atIndex(1));
     tab.requireTitle(gatherPaneLabel, Index.atIndex(1));

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

@@ -6 +6 @@
 // only JUnit and JAssert-Swing, no Selenium in this class
 import org.junit.Assert;
+import org.assertj.swing.fixture.*;
 
 /*
@@ -15 +16 @@
     
     
-    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 *************/
@@ -28 +29 @@
 
     /************************ GENERAL *******************************/
-    public static void switchToPane(String pane) {
-    
+    //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);
     }
     public static void getMenu(String menu, String subMenu) {}