Changeset 32671 for main/trunk/greenstone3/web/sites/localsite/collect

Timestamp:

2018-12-12T19:03:36+13:00 (5 years ago)

Author:

ak19

Message:

Changes necessary to get Sam's basic Selenium tests of the lucene-jdbm-demo collection working again: 1. The change to jquery.min.js is that the first hash character now used to be an at-sign which was deprecated and issued warnings. 2. build.xml now points the Selenium testing java code to the geckodriver, required to run newer firefox which no longer comes with a built-in driver for Selenium. 3. Needed to make changes to the testing code, since XPaths in the XML used to find some elements have changed and also the number of documents in the first page of the Titles classifier, and exact wording of certain search results.

Location:

main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/tests

Files:

• src/gstests/TestClass.java (modified) (9 diffs)
• tests.jar (modified) ( previous)

main/trunk/greenstone3/web/sites/localsite/collect/lucene-jdbm-demo/tests/src/gstests/TestClass.java

@@ -15 +15 @@
 public class TestClass
 {
+    /*static {
+    System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver");
+    }*/
+    
     //TODO: Do these dynamically
     private static final int NUMBER_OF_CLASSIFIERS = 4;
@@ -21 +25 @@
 
     //TODO: Turn these into a list
-    private static final int TITLE_CLASSIFIER_SIZE = 11;
+    private static final int FIRST_TITLE_CLASSIFIER_SIZE = 1; // total docs under title classifier 11, but now in alphabetically placed into buckets
     private static final int SUBJECT_CLASSIFIER_SIZE = 7;
-    private static final int ORGANISATIONS_CLASSIFIER_SIZE = 5;
+    private static final int ORGANISATIONS_CLASSIFIER_SIZE = 4; // used to be 5
 
     private static final int HITS_PER_PAGE = 20;
@@ -36 +40 @@
     public void init()
     {
+        //https://stackoverflow.com/questions/38676719/selenium-using-java-the-path-to-the-driver-executable-must-be-set-by-the-webdr
+        //if you didn't update the Path system variable to add the full directory path to the executable as above mentioned then doing this directly through code
+        //System.setProperty("webdriver.gecko.driver", "/Scratch/ak19/gs3-svn-13Sep2018/ext/testing/geckodriver");
+        
         _driver.get(System.getProperty("SERVERURL"));
+        
     }
 
@@ -46 +55 @@
     public void testHomePage()
     {
-        Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementByXPath(_driver, "//div[@id='collectionLinks']/a[descendant::text()='Demo Collection']"));
+        //Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementByXPath(_driver, "//div[@id='collectionLinks']/a[descendant::text()='Demo Collection']"));
+        // https://stackoverflow.com/questions/1604471/how-can-i-find-an-element-by-css-class-with-xpath
+        //Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementByXPath(_driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')]/a[descendant::text()='Demo Collection']"));
+
+        // Works. Why?
+        //Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementsByXPath(_driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')]/a[descendant::text()='Demo Collection']"));
+
+        Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementByXPath(_driver, "//div[contains(concat(' ', normalize-space(@class), ' '), 'collectionLinkText')][descendant::text()='Demo Collection']"));
+
+        //Assert.assertNotNull("The Demo Collection is not available", GSTestingUtil.findElementByXPath(_driver, "/"));
+        
     }
 
@@ -81 +100 @@
 
         //Check that we have 11 documents
+        // Check we have 1 document on the first page of the titles classifier
+        // In the past, all the 11 docs were on the first page. But now they are placed
+        // alphabetically into buckets
         List<WebElement> documents = GSTestingUtil.findElementsByXPath(_driver, "//table[@id='classifiernodelist']/tbody/tr");
-        Assert.assertEquals("There should be " + TITLE_CLASSIFIER_SIZE + " documents in the titles classifier but there were " + documents.size(), documents.size(), TITLE_CLASSIFIER_SIZE);
+        Assert.assertEquals("There should be " + FIRST_TITLE_CLASSIFIER_SIZE + " document(s) in the titles classifier but there were " + documents.size(), FIRST_TITLE_CLASSIFIER_SIZE, documents.size());
     }
 
@@ -120 +142 @@
         //Check that we have 5 organisations
         List<WebElement> orgElems = GSTestingUtil.findElementsByXPath(_driver, "//table[@id='classifiernodelist']/tbody/tr");
-        Assert.assertEquals("There should be " + ORGANISATIONS_CLASSIFIER_SIZE + " documents in the organisations classifier but there were " + orgElems.size(), orgElems.size(), ORGANISATIONS_CLASSIFIER_SIZE);
+        Assert.assertEquals("There should be " + ORGANISATIONS_CLASSIFIER_SIZE + " documents in the organisations classifier but there were " + orgElems.size(), ORGANISATIONS_CLASSIFIER_SIZE, orgElems.size());
 
         //Get all of the subject expand images
@@ -149 +171 @@
         //Check the number of results on the page
         List<WebElement> results = GSTestingUtil.findElementsByXPath(_driver, "//table[@id='resultsTable']/tbody/tr");
-        Assert.assertEquals("The number of results on the page should have been " + HITS_PER_PAGE + " but it was " + results.size(), results.size(), HITS_PER_PAGE);
+        Assert.assertEquals("The number of results on the page should have been " + HITS_PER_PAGE + " but it was " + results.size(), HITS_PER_PAGE, results.size());
 
         //Check the term info has the correct values
         WebElement termInfo = GSTestingUtil.findElementByXPath(_driver, "//p[@class='termList']/span[@class='termInfo']");
-        Assert.assertTrue("The term information was incorrect, it should have been \"" + "snails occurs " + SNAILS_OCCURENCE_COUNT + " times in " + SNAILS_RESULT_COUNT + " sections" + "\" but was \"" + termInfo.getText() + "\"", termInfo.getText().equals("snails occurs " + SNAILS_OCCURENCE_COUNT + " times in " + SNAILS_RESULT_COUNT + " sections"));
+        Assert.assertTrue("The term information was incorrect, it should have been \"" + "snails occurs " + SNAILS_OCCURENCE_COUNT + " times in " + SNAILS_RESULT_COUNT + " sections" + "\" but was \"" + termInfo.getText() + "\"", termInfo.getText().equals("'snails' occurs " + SNAILS_OCCURENCE_COUNT + " times in " + SNAILS_RESULT_COUNT + " sections"));
 
         //Check the search results status bar
@@ -181 +203 @@
 
         //Make sure that no documents match
-        WebElement contentElem = GSTestingUtil.findElementByXPath(_driver, "//div[@id='gs_content']");
-        Assert.assertTrue("No results should have been found for \"" + randomSearchTerm, contentElem.getText().equals("No documents matched the query."));
+        WebElement contentElem = GSTestingUtil.findElementByXPath(_driver, "//div[@id='gs_content']/div[@id='matchdocs']");
+        Assert.assertTrue("No results should have been found for \"" + randomSearchTerm + "\"", contentElem.getText().equals("No sections match the query."));
     }
 
@@ -311 +333 @@
     public static void destroy()
     {
-        _driver.quit();
+        _driver.quit();
     }
 }