Changeset 32693

Timestamp:

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

Author:

ak19

Message:

Some cleanup and shifting commented out useful code about

Location:

gs3-extensions/testing/trunk/src/src

Files:

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

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

@@ -23 +23 @@
 API:
 https://joel-costigliola.github.io/assertj/swing/api/index.html
+
+JUNIT:
+- https://junit.org/junit4/faq.html#atests_2
+   How do I use a test fixture?
+- https://junit.org/junit4/faq.html#organize_3
+   How can I run setUp() and tearDown() code once for all of my tests?
+
 */
 
@@ -121 +128 @@
       String expectedWindowTitle = Gatherer.PROGRAM_NAME;
 
-   
-      // 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)
-          && window.isShowing();
-          }
-      }).using(robot());
-      */
-
       window = findFrame("GUIManager").using(robot());
         
@@ -137 +134 @@
 
     System.err.println("@@@ Second test: that Gather panel is selected and has right title");
-    
-    /*GenericTypeMatcher<JTabbedPane> textMatcher = new GenericTypeMatcher<JTabbedPane>(JTabbedPane.class) {
-        @Override protected boolean isMatching(JTabbedPane tabPane) {
-            int index = GuiActionRunner.execute(() -> tabPane.getSelectedIndex());
-            //int index = tabPane.getSelectedIndex();
-            String selectedTabTitle = GuiActionRunner.execute(() -> tabPane.getTitleAt(index));
-            System.err.println("### GOT TITLE: " + selectedTabTitle);
-            return gatherPaneLabel.equals(selectedTabTitle);
-        }
-        };
-    */
 
     JTabbedPaneFixture tab = window.tabbedPane("GUIManager.tab_pane");
-    /*
-    JTabbedPaneFixture tab = window.tabbedPane(new GenericTypeMatcher<JTabbedPane>(JTabbedPane.class) {
-        @Override protected boolean isMatching(JTabbedPane tabPane) {
-            System.err.println("### trying for match");
-            //int index = GuiActionRunner.execute(() -> tabPane.getSelectedIndex());
-            int index = tabPane.getSelectedIndex();
-            String selectedTabTitle = tabPane.getTitleAt(index); //GuiActionRunner.execute(() -> tabPane.getTitleAt(index));
-            System.err.println("### GOT TITLE: " + selectedTabTitle);
-            return gatherPaneLabel.equals(selectedTabTitle);
-        }
-        });
-    */
+
     
     tab.requireSelectedTab(Index.atIndex(1));

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

@@ -110 +110 @@
     }
 
+    // Moving these working bits of code here, in case I can use them to right
+    // general get methods that make use of the GenericTypeMatcher method of accessing components
+    // See https://joel-costigliola.github.io/assertj/assertj-swing-lookup.html
+
+    /*window = findFrame(new GenericTypeMatcher<JFrame>(JFrame.class) {
+          protected boolean isMatching(JFrame window) {
+          return window.getTitle().trim().startsWith(expectedWindowTitle)
+          && window.isShowing();
+          }
+      }).using(robot());
+      */
+    /*
+    JTabbedPaneFixture tab = window.tabbedPane(new GenericTypeMatcher<JTabbedPane>(JTabbedPane.class) {
+        @Override protected boolean isMatching(JTabbedPane tabPane) {
+            System.err.println("### trying for match");
+            //int index = GuiActionRunner.execute(() -> tabPane.getSelectedIndex());
+            int index = tabPane.getSelectedIndex();
+            String selectedTabTitle = tabPane.getTitleAt(index); //GuiActionRunner.execute(() -> tabPane.getTitleAt(index));
+            System.err.println("### GOT TITLE: " + selectedTabTitle);
+            return gatherPaneLabel.equals(selectedTabTitle);
+        }
+        });
+    */
 }