svn commit: r1793534 - in /manifoldcf/branches/CONNECTORS-1403: connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ framework/core/src/test/java/org/apache/manifoldcf/core/tests/

[kishore]

Author: kishore
Date: Tue May  2 15:38:07 2017
New Revision: 1793534

URL: http://svn.apache.org/viewvc?rev=1793534&view=rev
Log:
Fix Web Crawler NavigationHSQLDBUI
Updated SeleniumTester to include <button>

Modified:
    
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
    
manifoldcf/branches/CONNECTORS-1403/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java

Modified: 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java?rev=1793534&r1=1793533&r2=1793534&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java
 Tue May  2 15:38:07 2017
@@ -93,11 +93,11 @@ public class NavigationHSQLDBUI extends
     // Certificates
     testerInstance.clickTab("Certificates");
     testerInstance.clickCheckbox("all_trust");
-    testerInstance.clickButton("Add", true);
-    
+    testerInstance.clickButton("Add");
+
     // Go back to the Name tab
     testerInstance.clickTab("Name");
-    
+
     // Save
     testerInstance.clickButton("Save");
     testerInstance.verifyThereIsNoError();
@@ -117,7 +117,7 @@ public class NavigationHSQLDBUI extends
     testerInstance.clickButton("Add output",true);
     testerInstance.waitForElementWithName("connectionname");
     testerInstance.selectValue("connectionname","MyRepositoryConnection");
-    
+
     testerInstance.clickButton("Continue");
 
     // HopFilters tab
@@ -127,15 +127,15 @@ public class NavigationHSQLDBUI extends
     testerInstance.setValue("s0_seeds", "http://www.cnn.com";);
     // Canonicalization tab
     testerInstance.clickTab("Canonicalization");
-    testerInstance.clickButton("Add", true);
+    testerInstance.clickButton("Add");
     // Security tab
     testerInstance.clickTab("Security");
     // URL Mapping tab
     testerInstance.clickTab("URL Mappings");
     testerInstance.setValue("s0_rssmatch", "foo");
     testerInstance.setValue("s0_rssmap", "bar");
-    testerInstance.clickButton("Add", true);
-    testerInstance.clickButton("Remove", true);
+    testerInstance.clickButton("Add");
+    testerInstance.clickButton("Remove");
     // Metadata tab
     testerInstance.clickTab("Metadata");
     // Inclusions tab

Modified: 
manifoldcf/branches/CONNECTORS-1403/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1403/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java?rev=1793534&r1=1793533&r2=1793534&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-1403/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-1403/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java
 Tue May  2 15:38:07 2017
@@ -310,7 +310,7 @@ public class SeleniumTester
     element.click();*/
 
     boolean found = false;
-    List<WebElement> elements = 
driver.findElements(By.xpath("//a[contains(concat(' ',@class,' '), ' btn ')]"));
+    List<WebElement> elements = 
driver.findElements(By.xpath("//a[contains(concat(' ',@class,' '), ' btn ')] | 
//button[contains(concat(' ',@class,' '), ' btn ')]"));
 
     for (int i = 0; i < elements.size(); i++)
     {