Changeset 39034

Timestamp:

2024-05-19T20:03:07+12:00 (3 weeks ago)

Author:

anupama

Message:

Working on the 2nd tutorial

Location:

gs3-extensions/testing/trunk/src

Files:

• lib/java/GSTestingUtil.jar (modified) ( previous)
• src/gstests/tutorials/RunGLITest.java (modified) (10 diffs)
• src/org/greenstone/gsdl3/testing/GSBasicTestingUtil.java (added)
• src/org/greenstone/gsdl3/testing/GSGUITestingUtil.java (modified) (6 diffs)

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

@@ -64 +64 @@
 import org.greenstone.gsdl3.testing.GSTestingUtil;
 import org.greenstone.gsdl3.testing.GSGUITestingUtil;
+import org.greenstone.gsdl3.testing.GSBasicTestingUtil;
 
 // Java imports
 import javax.swing.*;
 import java.util.Properties;
-import java.io.InputStream;
+import java.io.*;
+import java.awt.event.InputEvent;
+//import java.io.InputStream;
 //import java.io.IOException;
 
@@ -99 +102 @@
     // to prevent system.exit from causing issues
     //org.assertj.swing.security.NoExitSecurityManagerInstaller.installNoExitSecurityManager();
+
+    if(System.getenv("GSDL3SRCHOME") == null) {
+        System.err.println("@@@ GS3 environment not set. Terminating tests.");
+        System.exit(-1);
+    }
 
     props = new Properties();
@@ -214 +222 @@
     
     // First tutorial
-    simpleHTML();
+    //simpleHTML();
+
+    backdrop();
     
     }
@@ -237 +247 @@
     switchToPane(GATHER_PANE);
     changeUserMode("expert");
-    //openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());
+    //openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString());
 
     /*
@@ -245 +255 @@
     openCollectionPath("b17mie/b17mie.htm", CLICK);
     PAUSE(3);
-    openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());  
+    openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString());  
     */
 
@@ -259 +269 @@
 
     
-    String dragNodePath = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString()+"simple_html/html_files", SELECT);
+    String dragNodePath = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString()+"simple_html/html_files", SELECT);
 
     String collPath = dragNDrop(dragNodePath, "");
@@ -265 +275 @@
     
     openCollectionPath("html_files", DOUBLE_CLICK);
-    PAUSE(2);   
-    
-    
+    PAUSE(2);
     
     //changeUserMode("librarian");
@@ -288 +296 @@
     
 
-    String path = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString(), RIGHT_CLICK);
+    String path = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString(), RIGHT_CLICK);
     //workspaceRightClickOption(dragNodePath, );
     PAUSE(2);
@@ -300 +308 @@
 
 
+    public void backdrop() {
+    System.err.println("@@@ Tutorial 1: simple HTML");  
+    stealAnyCollectionLock(1);
+    switchToPane(GATHER_PANE);
+    /*
+    changeUserMode("librarian");
+
+    String image_e_coll = props.get("samplefiles.path")+File.separator+"images"+File.separator+"image-e";
+    File newFolder = GSBasicTestingUtil.copyIntoCollect(image_e_coll);
+    System.err.println("Trying to create the folder " + newFolder);
+    Assert.assertTrue(newFolder.exists());
+    PAUSE(2);
+    System.err.println("Successfully created folder " + newFolder);
+    
+    // Start a new collection within the Librarian Interface:
+    createCollection("backdrop",
+             "A simple image collection",
+             "Simple image collection");
+    
+    loadCollection("backdrop");
+    PAUSE(3);
+    */
+    //String startDragNodePath = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString()+"images/Bear.jpg", SELECT);
+    //https://joel-costigliola.github.io/assertj/swing/api/index.html?org/assertj/swing/core/Robot.html
+    final String wksFolder = openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.treepath").toString()+"images", EXPAND);
+    robot().pressModifiersWhileRunning(InputEvent.SHIFT_MASK, new Runnable() {
+        //https://joel-costigliola.github.io/assertj/swing/api/index.html?org/assertj/swing/core/Robot.html
+        public void run() {
+            String startFile = openInExpandedWorkspace(wksFolder + "/Bear.jpg", CLICK);
+            String endFile = openInExpandedWorkspace(wksFolder + "/Tiger.jpg", CLICK);
+        }
+        });
+    robot().pressModifiersWhileRunning(InputEvent.CTRL_MASK, new Runnable() {
+        //https://joel-costigliola.github.io/assertj/swing/api/index.html?org/assertj/swing/core/Robot.html
+        public void run() {
+            String skipFile = openInExpandedWorkspace(wksFolder + "/README.txt", CLICK);
+        }
+        });
+    
+    PAUSE(2);
+    //String collPath = dragNDrop(dragNodePath, "");
+    //dragNDrop(wksFolder + "/Cat.jpg", "");
+    //dropSelectionIntoCollection("");
+    robot().pressModifiersWhileRunning(
+       InputEvent.SHIFT_MASK|InputEvent.CTRL_MASK, new Runnable() {     
+        public void run() {
+            dragNDrop(wksFolder + "/Cat.jpg", "");
+        }
+        });
+    PAUSE(2);
+    }
+    
     public static void loadProperties() {
     //System.err.println("@@@ Classpath: " + System.getProperty("java.class.path"));
@@ -319 +379 @@
         System.exit(-1);
     }
+
+    String sampleFilesTreePath = (String)props.get("samplefiles.path");
+    // JTreeFixtures denote paths with /
+    sampleFilesTreePath = sampleFilesTreePath.replace('\\', '/');
+    props.put("samplefiles.treepath", sampleFilesTreePath);
     }
 }

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

@@ -90 +90 @@
     public static final boolean OPTIONAL = true;
     public static final boolean COMPULSORY = true;
+
+    public static final int WORKSPACE_VIEW = 1;
+    public static final int COLLECTION_VIEW = 2;
     
     public static Robot robot = null;
@@ -588 +591 @@
     // in current open collection
     public static void createCollectionSubfolder() {}
-    
+
+    public static void dropSelectionIntoCollection(String collPath) {
+    JTreeFixture collTree = window.tree("EnrichPane.collection_tree");  
+    if(collPath == null || collPath.equals("")) {
+        collTree.drop(); // empty tree, call ancestor method AbstractComponentFixture.drop()
+    } else {
+        collTree.drop(collPath); // call a JTreeFixture.drop() method
+    }
+    }
     public static String dragNDrop(String workspacePath, String collPath) {
     JTreeFixture workspaceTree = window.tree("GatherPane.workspace_tree");
@@ -626 +637 @@
     }
     /*if(workspacePath.endsWith("/")) {
-        workspacePath = workspacePath.substring(0, workspacePath.length()-1);
-        }*/
+      workspacePath = workspacePath.substring(0, workspacePath.length()-1);
+      }*/
     
     //JTabbedPaneFixture gatherPane = switchToPane(GATHER_PANE);
@@ -644 +655 @@
     String treePath = topGLIFolder + "/" + workspacePath;
     //workspaceTree.clickPath(treePath);    
-
+    
+    JTreeFixture wks_ptr = workspaceTree.expandPath(topGLIFolder);
+    
     //PAUSE(2);
     
-
     // I think GLI works out what the child nodes are as the workspace tree is expanded,
     // so childnodes don't exist when a toplevel node is closed/collapsed: so we can't
     // pass the entire path in here, but have to mimic expanding one node at a time like
     // a user: expand parent, then childnode, where each node is denoted by its Fullpath
-    // from root ancestor
-    JTreeFixture wks_ptr = workspaceTree.expandPath(topGLIFolder);
+    // from root ancestor   
     String[] nodes = workspacePath.split("/");
     for(int i = 0; i < nodes.length; i++) {
@@ -688 +699 @@
         }
     }
+    return treePath;
+    }
+    public static String openWorkspacePath(String workspacePath, int mouseAction) {
+    // I think GLI works out what the child nodes are as the workspace tree is expanded,
+    // so childnodes don't exist when a toplevel node is closed/collapsed: so we can't
+    // pass the entire path in here, but have to mimic expanding one node at a time like
+    // a user: expand parent, then childnode, where each node is denoted by its Fullpath
+    // from root ancestor
+    JTreeFixture workspaceTree = window.tree("GatherPane.workspace_tree");
+    
+    String[] nodes = workspacePath.split("/");
+    JTreeFixture wks_ptr = workspaceTree.expandPath(nodes[0]);
+    for(int i = 1; i < nodes.length; i++) {
+        String prevNode = nodes[i-1];
+        nodes[i] = prevNode + "/" + nodes[i];       
+        System.err.println("\t" + nodes[i]);
+        if(i < (nodes.length-1)) {
+        wks_ptr = workspaceTree.expandPath(nodes[i]);
+        System.err.println("\tExpanded node: " + nodes[i]);
+        } else { // final node
+        System.err.println("\tFinal node: " + nodes[i]);        
+        wks_ptr = handleLeafNode(workspaceTree, nodes[i], mouseAction);
+        }
+    }
     
     //PAUSE(5); 
@@ -693 +728 @@
     // If wks_ptr stores the expanded workspace treeview, it's useful for dragging and dropping,
     //return wks_ptr;
-    return treePath;
-    
-    }
-
+    return workspacePath;   
+    }
+    public static String openInExpandedWorkspace(String nodePath, int mouseAction) {
+    JTreeFixture workspaceTree = window.tree("GatherPane.workspace_tree");
+    JTreeFixture wks_ptr = handleLeafNode(workspaceTree, nodePath, mouseAction);    
+    return nodePath;
+    }
+    public static JTreeFixture selectPaths(int view, String folderPath, String[] nodes)
+    {
+    //https://joel-costigliola.github.io/assertj/swing/api/index.html?org/assertj/swing/core/Robot.html
+
+    
+    final String startFolder = (view == WORKSPACE_VIEW) ? openInExpandedWorkspace(folderPath, EXPAND) : openCollectionPath(folderPath, EXPAND);
+    
+
+    JTreeFixture tree = (view == WORKSPACE_VIEW) ? window.tree("GatherPane.workspace_tree") : window.tree("EnrichPane.collection_tree");
+
+    for(i = 0; i < nodes.length; i++) {
+        nodes[i] = startFolder + "/" + nodes[i];
+    }
+    // String... param: varargs
+    // https://stackoverflow.com/questions/2367398/what-is-the-ellipsis-for-in-this-method-signature
+    //"Note that the arguments may also be passed as an array of param type (this makes varargs backward compatible)."
+    // "Also note that passing 0 varargs (nothing) is legal."
+    tree = tree.selectPaths(nodes);
+
+    return tree;
+    }
+    
     public static JTreeFixture handleLeafNode(JTreeFixture tree, String node, int mouseAction){
     JTreeFixture tree_ptr = tree;