Changeset 39024

Timestamp:

2024-05-14T23:04:30+12:00 (4 weeks ago)

Author:

anupama

Message:

1. Properties file needd in lib to specify samplefiles.path, the file location of sample-files, so it can be located in GLI's workspace view for dragging and drop it into a collection. 2. Selection in the GatherPane's workspace and collection views implemented. Next up will be to implement dragging and dropping here.

Location:

gs3-extensions/testing/trunk/src

Files:

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

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

@@ -94 +94 @@
 <!-- https://stackoverflow.com/questions/10704324/how-to-add-to-classpath-all-classes-from-set-of-directories-in-ant -->
 <path id="tutorials.path">
-
+  <!-- Path to properties file -->
+  <pathelement path="${ext.test.folder}/lib"/>
+  
   <!-- Includes ant-nodeps-1.8.1 from 2010 that replaces 2005's optional.jar of ant
        for generating reports -->
@@ -112 +114 @@
   <fileset dir="${gli.home}/lib">
     <include name="*.jar"/>
-  </fileset>  
+  </fileset>
 </path>
 

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

@@ -67 +67 @@
 // Java imports
 import javax.swing.*;
+import java.util.Properties;
+import java.io.InputStream;
+//import java.io.IOException;
 
 // static imports - call static functions without class as namespace qualifier
@@ -82 +85 @@
     private FrameFixture window;
 
+    private static Properties props;
+    
     // Changing Exit SecurityManager is now unused as GLI now doesn't System.exit in testing mode
     // https://stackoverflow.com/questions/50815329/close-application-after-test-without-test-failure-using-assertj
     // https://stackoverflow.com/questions/23139321/testing-java-gui-application-closing-window-during-test-ends-test-suite
     // https://stackoverflow.com/questions/5401281/preventing-system-exit-from-api
-    /*
+    
     @BeforeClass
     public static void initOnce() {
     // to prevent system.exit from causing issues
     //org.assertj.swing.security.NoExitSecurityManagerInstaller.installNoExitSecurityManager();
-    }
-    */
+
+    props = new Properties();
+    loadProperties();
+    }
+    
     // Selenium
     @Before
@@ -126 +134 @@
     
     
-  @Test
+    //@Test
   public void testGLIRunning() {
       // waiting a few seconds for window, so we can see it
@@ -156 +164 @@
       // For testing, want GLI to be in librarian mode by default
       changeUserMode("librarian");
-      
+      /*      
       switchToPane(GATHER_PANE);
       
@@ -179 +187 @@
       
       switchToPane(GATHER_PANE);      
-
+      */
       exitGLI(); //System.exit() on GLI won't allow quit to be called on Selenium's web _driver, why? Because System.exit exited the JUnit tests too
       
@@ -225 +233 @@
     stealAnyCollectionLock(1);
     switchToPane(GATHER_PANE);
-    changeUserMode("librarian");
-    }
-    
+    //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);
+    PAUSE(2);
+    openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());
+    */
+    loadCollection("lucene-jdbm-demo");
+    // wait a couple of seconds for loading to be done
+    PAUSE(2);
+    openCollectionPath("b17mie/b17mie.htm", false);
+    PAUSE(3);
+    openWorkspacePath(WKS_TOP_FOLDER_LOCAL, props.get("samplefiles.path").toString());
+    PAUSE(2);
+    }
+
+
+    public static void loadProperties() {
+    //System.err.println("@@@ Classpath: " + System.getProperty("java.class.path"));
+    
+    // try with resources >= Java 7 
+    // "A try-with-resources statement can have catch and finally
+    // blocks just like an ordinary try statement. In a
+    // try-with-resources statement, any catch or finally block is
+    // run after the resources declared have been closed."
+    // https://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
+    // https://stackoverflow.com/questions/8285595/reading-properties-file-in-java
+    try (InputStream istream = Thread.currentThread().getContextClassLoader().getResourceAsStream("GLItest.properties")) {
+        //FileInputStream fstream = new FileInputStream("GLItest.properties")) {
+         props.load(istream);
+         System.err.println("sampleFilesPath: " + props.get("samplefiles.path"));
+    } catch(Exception e) {
+        e.printStackTrace();
+        System.err.println("Could not find GLItest.properties in classpath (in testing/lib) with samplefiles.path set");
+        System.exit(-1);
+    }
+    }
 }

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

@@ -55 +55 @@
     public static final String CREATE_PANE = "Create"; 
     public static final String FORMAT_PANE = "Format";
+
+    public static final String WKS_TOP_FOLDER_DOCS_GS = "Documents in Greenstone Collections";
+    public static final String WKS_TOP_FOLDER_LOCAL = "Local Filespace";
+    // TODO: generalise across users, OS etc
+    public static final String WKS_TOP_FOLDER_HOME_ME = "Home Folder (TODO)";
+    public static final String WKS_TOP_FOLDER_DOWNLOADS = "Downloaded Files";
+    public static final String WKS_TOP_FOLDER_SAMPLEFILES = "sample_files";
     
     public static Robot robot = null;
@@ -142 +149 @@
     
     //https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/fixture/FrameFixture.html
-    public static void switchToPane(String pane) {
+    public static JTabbedPaneFixture switchToPane(String pane) {
     String paneLabel = Dictionary.get("GUI." + 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
+    return tab.selectTab(paneLabel); // select tab by its title
     }
     public static void openMenuItem(String menu, String subMenu) {
@@ -179 +186 @@
         stealCollectionLock(timeoutSeconds);
     } catch(Exception e) {
-        System.err.println("@@@@@@@@@@@@@ No lockfile dialog appeared.");
+        System.err.println("@@@@@@@@@@@@@ No lockfile dialog appeared.\n");
     }
     }
@@ -384 +391 @@
     public static void dragNDrop(String workspacePath, String collPath) {}
 
+    public static JTreeFixture openWorkspacePath(String topGLIFolder, String workspacePath) {
+    if(workspacePath.startsWith("/")) {
+        workspacePath = workspacePath.substring(1);
+    }
+    
+    //JTabbedPaneFixture gatherPane = switchToPane(GATHER_PANE);
+    //BasicComponentFinder(gatherPane, "GatherPane.workspace_tree");
+    /*JTreeFixture workspaceTree = window.tree();
+    if(workspaceTree != null) {
+        System.err.println("Found a tree " + workspaceTree.target().getName());
+
+    } else {
+        System.err.println("No tree");
+    }
+    */  
+    JTreeFixture workspaceTree = window.tree("GatherPane.workspace_tree");
+    // https://joel-costigliola.github.io/assertj/swing/api/org/assertj/swing/fixture/JTreeFixture.html
+    
+    //String treePath = topGLIFolder + "/" + workspacePath;
+    //workspaceTree.clickPath(treePath);    
+
+    //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);
+    String[] nodes = workspacePath.split("/");
+    for(int i = 0; i < nodes.length; i++) {
+        //String node = nodes[i];
+        String prevNode = (i==0) ? topGLIFolder : nodes[i-1];
+        nodes[i] = prevNode + "/" + nodes[i];       
+        System.err.println("\t" + nodes[i]);
+        wks_ptr = workspaceTree.expandPath(nodes[i]);
+    }
+    
+    //PAUSE(5); 
+    
+    // If wks_ptr stores the expanded workspace treeview, it's useful for dragging and dropping,
+    return wks_ptr; //return treePath;
+    
+    }
+    public static JTreeFixture openCollectionPath(String collPath, boolean openFile) {
+    /*
+    JTreeFixture tree = window.tree();
+    if(tree != null) {
+        System.err.println("Found a tree " + tree.target().getName());
+        // throws exception: that Multiple trees have been found and prints their names
+    } else {
+        System.err.println("No tree");
+    }   
+    */
+    
+    // See GLI's collection/CollectionManager.java: collection_tree shared
+    // between GatherPane and EnrichPane    
+    JTreeFixture collTree = null;
+    try {
+        collTree = window.tree("GatherPane.collection_tree");
+    } catch(Exception e) {
+        collTree = window.tree("EnrichPane.collection_tree");
+    }
+    if(collPath != "") {
+        // same problem: GLI does lazy expansion, so childnodes not visible and are unknown
+        //collTree = collTree.expandPath(collPath);
+
+        String[] nodes = collPath.split("/");
+        for(int i = 0; i < nodes.length; i++) {
+        if(i > 0) { // build up path to each node to be expanded next
+            nodes[i] = nodes[i-1] + "/" + nodes[i];
+        }
+        //collTree = collTree.expandPath(nodes[i]); // if leaf, this opens file
+        
+        System.err.println("\t" + nodes[i]);
+        
+        if(i == (nodes.length-1) && !openFile) {
+            collTree = collTree.clickPath(nodes[i]);
+
+        } else {
+            collTree = collTree.expandPath(nodes[i]); // if leaf, expandPath opens file
+            // which can open it in browser. This may not be what we want.
+        }
+        
+        }
+    }
+    return collTree;
+    }
+    
     /********************* ENRICH PANE ******************/
     // docPath can be just docName or collectionSubfolder/Subfolder2/docName