Changeset 39029

Timestamp:

2024-05-15T21:48:53+12:00 (4 weeks ago)

Author:

anupama

Message:

1. Drop part of dragging and dropping folder from workspace into coltree works. TODO: Will still need to implement multi file drag and drop (shift+select or ctrl+shift+select is allowed in GLI), but I'll implement as and when needed for writing tests for tutorials. 2. Collection Building and previewing (waiting for build to complete is waiting for preview button to become active) now works.

Location:

gs3-extensions/testing/trunk/src

Files:

• README (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) (9 diffs)

gs3-extensions/testing/trunk/src/README

@@ -33 +33 @@
 - https://junit.org/junit4/ (we appear to use junit4)
 - there's also the older wiki page by Sam that has his own work (not yet incorporated): https://wiki.greenstone.org/doku.php?id=internal:gs3_automated_testing
+
+Pages that are useful
+- https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/exception/EdtViolationException.html
+- VERY USEFUL BASICS: https://docs.oracle.com/javase/6/docs/api/javax/swing/package-summary.html#threading
+- EDT and AssertJ Swing: https://joel-costigliola.github.io/assertj/assertj-swing-edt.html
 
 ----------------------
@@ -91 +96 @@
 Reminder: to shift code into the Event Dispatch Thread/EDT, there's SwingUtilities.invokeLater(), which is asynchronous. To be synchronous (code that Must happen now because the code that follows is dependent on results/successful finish of the sequence of events being shifted into the EDT), use SwingUtilities.invokeAndWait() in a try/catch.
 
-Pages that are useful
-- https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/exception/EdtViolationException.html
-- VERY USEFUL BASICS: https://docs.oracle.com/javase/6/docs/api/javax/swing/package-summary.html#threading
 
 

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

@@ -86 +86 @@
 
     private static Properties props;
+    // TODO: Do we ever expect tutorials to take more than a minute or 2 mins to build?
+    // And do we think a test can get stuck waiting for the entire time before it bails?
+    public static final int MAX_BUILD_TIMEOUT = 60;
     
     // Changing Exit SecurityManager is now unused as GLI now doesn't System.exit in testing mode
@@ -235 +238 @@
     //changeUserMode("librarian");
     //openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());
-    
-    // Start a new collection within the Librarian Interface:
-    /*createCollection("Small HTML Collection",
-             "A small collection of HTML pages.",
-             null);                  
-    */
-    loadCollection("smallhtm"); // TODO
-    PAUSE(3);
-    
-    String dragNodePath = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString()+"simple_html/html_files", SELECT);
-
-    dragNDrop(dragNodePath, "");
-    
+
     /*
     loadCollection("lucene-jdbm-demo");
     // wait a couple of seconds for loading to be done
     PAUSE(2);
-    openCollectionPath("b17mie/b17mie.htm", false);
+    openCollectionPath("b17mie/b17mie.htm", CLICK);
     PAUSE(3);
     openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());
     
     */
-    PAUSE(2);
+    
+    // Start a new collection within the Librarian Interface:
+    createCollection("Small HTML Collection",
+             "A small collection of HTML pages.",
+             null);                  
+    
+    //loadCollection("smallhtm"); // TODO
+    PAUSE(3);
+
+    
+    String dragNodePath = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString()+"simple_html/html_files", SELECT);
+
+    dragNDrop(dragNodePath, "");
+    
+    
+    
+    switchToPane(CREATE_PANE);
+    buildCollection();
+    previewCollectionWhenReady(MAX_BUILD_TIMEOUT);
+    PAUSE(4);
     }
 

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

@@ -9 +9 @@
 import org.junit.Assert;
 import org.assertj.swing.fixture.*;
-import org.assertj.swing.timing.Timeout ;
-
+import org.assertj.swing.timing.Timeout;
+
+import org.assertj.swing.timing.Pause;
+import org.assertj.swing.timing.Condition;
+import java.util.concurrent.TimeUnit;
+    
 // GLI imports
 import org.greenstone.gatherer.Gatherer;
@@ -82 +86 @@
     
     /****************************** APPLICATION  *******************************/
+    //TODO
     public static void PAUSE() {    
     PAUSE(5);
+    //Pause.pause(5, TimeUnit.SECONDS);
     }
     public static void PAUSE(int seconds) {
+    //if(!PAUSE_ON) return; // ignore calls to PAUSE
+    //Pause.pause(seconds, TimeUnit.SECONDS);
+    
+    
     if(!PAUSE_ON) return; // ignore calls to PAUSE
-    
     // wait a couple of seconds again?
      try{
@@ -383 +392 @@
 
     /********************** CREATE PANEL ********************/
-    public static void buildOpenCollection() {}
-    public static void buildOpenCollection(boolean minimalRebuild) {}
+    public static JButtonFixture waitForPreviewReady(int maxWaitSeconds) {
+    return waitForPreviewReady(maxWaitSeconds, true);
+    }
+    public static JButtonFixture waitForPreviewReady(int maxWaitSeconds, boolean bailTestingOnBuildFailure) {
+    //while(!previewButton.isEnabled()) {}
+    
+    JButtonFixture previewButtonTester = window.button("CreatePane.preview_button");
+    javax.swing.JButton previewButton = previewButtonTester.target();
+    Pause.pause(new Condition("Preview button to be enabled") {
+        public boolean test() {
+            return previewButton.isEnabled();
+        }
+        
+        }, Timeout.timeout(maxWaitSeconds, TimeUnit.SECONDS));
+
+    if(bailTestingOnBuildFailure) {
+        JTextComponentFixture txtArea = window.textBox("CreatePane.log_textarea");
+        //txtArea.requireText("************** Build Finished **************");
+        //txtArea.requireText(java.util.regex.Pattern.compile("Build Finished|buildcol.pl> Command complete"));
+        //System.err.println("@@@@ text: " + txtArea.text());
+    }
+    
+    return previewButtonTester;
+    }
+    public static void buildCollection() {
+    window.button("CreatePane.build_button").click();
+    }
+    public static void buildCollectionTillReady(int maxWaitSeconds) {
+    buildCollection();
+    waitForPreviewReady(maxWaitSeconds);
+    }
+    public static void buildCollection(boolean minimalRebuild) {
+    if(minimalRebuild) {
+        // try with or without s in sincremental
+        window.button("CreatePane.sincremental_build_radio_button").click(); // JRadioButtonFixture
+    } else {
+        buildCollection();
+    }
+    }
+    public static void previewCollection() {    
+    window.button("CreatePane.preview_button").click();
+    }
+
+    // Usage of AssertJ Swing Condition, and Pause on Condition
+    // https://gist.github.com/hashrock/26afb842db35eb03699acf735a692f2e
+    // https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/timing/Pause.html
+    // https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/timing/Condition.html
+    public static void previewCollectionWhenReady(int maxWaitSeconds) {
+    JButtonFixture preview = waitForPreviewReady(maxWaitSeconds);
+        preview.click();    
+    }
+    
+    public static void buildAndPreviewCollection(int maxWaitForBuilding) {
+    buildCollection();
+    //JButtonFixture preview = waitForPreviewReady(maxWaitSeconds);
+    //previewCollection();
+    previewCollectionWhenReady(maxWaitForBuilding);
+    }
+
     public static void configureImportOptions(Map params) {}
     public static void configureBuildOptions(Map params) {}
     
-    public static void buildOutputContains(String ... n) {}
-
+    public static void buildOutputContains(String ... n) {}    
+    
     /******************** GATHER PANE ********************/
     public static void createWorkspaceShortcut(){}
@@ -403 +469 @@
     workspaceTree.drag(workspacePath);
     if(collPath == null || collPath.equals("")) {
-        collTree.drop("bla");
+        collTree.drop(); // empty tree, call ancestor method AbstractComponentFixture.drop()
     } else {
-        collTree.drop(collPath);
-    }
-    }
-
-
-    public static String openWorkspacePath(String topGLIFolder, String workspacePath, int leafNodeAction) {
+        collTree.drop(collPath); // call a JTreeFixture.drop() method
+    }
+    System.err.println("@@@ New collPath: " + collPath);
+    String newPath = workspacePath.substring(workspacePath.lastIndexOf("/")+1);
+    collPath = (collPath==null || collPath.equals("")) ? newPath : (collPath + "/" + newPath);
+    openCollectionPath(collPath, SELECT);
+    System.err.println("@@@ New collPath: " + collPath);
+    }
+
+
+    public static String openWorkspacePath(String topGLIFolder, String workspacePath, int mouseAction) {
     if(workspacePath.startsWith("/")) {
         workspacePath = workspacePath.substring(1);
@@ -449 +520 @@
         wks_ptr = workspaceTree.expandPath(nodes[i]);
         } else { // final node
-        switch(leafNodeAction) {
+        /*switch(leafNodeAction) {
         case EXPAND:
             wks_ptr = workspaceTree.expandPath(nodes[i]);
@@ -468 +539 @@
             System.err.println("GSGUITestingUtil.openWorkspacePath - unknown action " + leafNodeAction);
         }
+        */
+        wks_ptr = handleLeafNode(workspaceTree, nodes[i], mouseAction);
         }
     }
@@ -478 +551 @@
     
     }
-    public static JTreeFixture openCollectionPath(String collPath, boolean openFile) {
+
+    public static JTreeFixture handleLeafNode(JTreeFixture tree, String node, int mouseAction){
+    JTreeFixture tree_ptr = tree;
+    switch(mouseAction) {
+        case EXPAND:
+            tree_ptr = tree.expandPath(node);
+            break;
+        case CLICK:
+            tree_ptr = tree.clickPath(node);
+            break;
+        case DOUBLE_CLICK:
+            tree_ptr = tree.doubleClickPath(node);
+            break;
+        case SELECT:
+            tree_ptr = tree.doubleClickPath(node);
+            break;
+        case RIGHT_CLICK:
+            tree_ptr = tree.rightClickPath(node);
+            break;
+        default:
+            System.err.println("GSGUITestingUtil.handleLeafNode - unknown action " + mouseAction);
+    }
+    return tree_ptr;
+    }
+    
+    public static JTreeFixture openCollectionPath(String collPath, int mouseAction) {
     /*
     JTreeFixture tree = window.tree();
@@ -509 +607 @@
         
         System.err.println("\t" + nodes[i]);
-        
+        if(i < nodes.length) {
+            collTree = collTree.expandPath(nodes[i]);
+        } else {
+            collTree = handleLeafNode(collTree, nodes[i], mouseAction);
+        }
+        /*
         if(i == (nodes.length-1) && !openFile) {
             collTree = collTree.clickPath(nodes[i]);
@@ -517 +620 @@
             // which can open it in browser. This may not be what we want.
         }
+        */
         
         }