Modified: manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java?rev=1793547&r1=1793546&r2=1793547&view=diff ============================================================================== --- manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationHSQLDBUI.java Tue May 2 16:00:56 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 @@ -173,283 +173,6 @@ public class NavigationHSQLDBUI extends testerInstance.clickButtonByTitle("Delete MyOutputConnection"); testerInstance.acceptAlert(); -/* - testerInstance.newTest(Locale.US); - - HTMLTester.Window window; - HTMLTester.Link link; - HTMLTester.Form form; - HTMLTester.Textarea textarea; - HTMLTester.Selectbox selectbox; - HTMLTester.Button button; - HTMLTester.Radiobutton radiobutton; - HTMLTester.Checkbox checkbox; - HTMLTester.Loop loop; - - window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - - // Login - form = window.findForm(testerInstance.createStringDescription("loginform")); - textarea = form.findTextarea(testerInstance.createStringDescription("userID")); - textarea.setValue(testerInstance.createStringDescription("admin")); - textarea = form.findTextarea(testerInstance.createStringDescription("password")); - textarea.setValue(testerInstance.createStringDescription("admin")); - button = window.findButton(testerInstance.createStringDescription("Login")); - button.click(); - window = testerInstance.findWindow(null); - - // Define an output connection via the UI - link = window.findLink(testerInstance.createStringDescription("List output connections")); - link.click(); - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Add an output connection")); - link.click(); - // Fill in a name - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - textarea = form.findTextarea(testerInstance.createStringDescription("connname")); - textarea.setValue(testerInstance.createStringDescription("MyOutputConnection")); - link = window.findLink(testerInstance.createStringDescription("Type tab")); - link.click(); - // Select a type - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); - selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.agents.tests.TestingOutputConnector")); - button = window.findButton(testerInstance.createStringDescription("Continue to next page")); - button.click(); - // Visit the Throttling tab - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Throttling tab")); - link.click(); - // Go back to the Name tab - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Name tab")); - link.click(); - // Now save the connection. - window = testerInstance.findWindow(null); - button = window.findButton(testerInstance.createStringDescription("Save this output connection")); - button.click(); - - // Define a repository connection via the UI - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("List repository connections")); - link.click(); - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Add a connection")); - link.click(); - // Fill in a name - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - textarea = form.findTextarea(testerInstance.createStringDescription("connname")); - textarea.setValue(testerInstance.createStringDescription("MyRepositoryConnection")); - link = window.findLink(testerInstance.createStringDescription("Type tab")); - link.click(); - // Select a type - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); - selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector")); - button = window.findButton(testerInstance.createStringDescription("Continue to next page")); - button.click(); - // Visit the Throttling tab - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Throttling tab")); - link.click(); - // Visit the rest of the tabs - Email first - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Email tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - textarea = form.findTextarea(testerInstance.createStringDescription("email")); - textarea.setValue(testerInstance.createStringDescription("[email protected]")); - // Robots - link = window.findLink(testerInstance.createStringDescription("Robots tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("robotsusage")); - selectbox.selectValue(testerInstance.createStringDescription("none")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("metarobotstagsusage")); - selectbox.selectValue(testerInstance.createStringDescription("none")); - // Bandwidth - link = window.findLink(testerInstance.createStringDescription("Bandwidth tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - // Access Credentials - link = window.findLink(testerInstance.createStringDescription("Access Credentials tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - // Certificates - link = window.findLink(testerInstance.createStringDescription("Certificates tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editconnection")); - checkbox = form.findCheckbox(testerInstance.createStringDescription("all_trust"),testerInstance.createStringDescription("true")); - checkbox.select(); - button = window.findButton(testerInstance.createStringDescription("Add url regular expression for truststore")); - button.click(); - window = testerInstance.findWindow(null); - // Go back to the Name tab - link = window.findLink(testerInstance.createStringDescription("Name tab")); - link.click(); - // Now save the connection. - window = testerInstance.findWindow(null); - button = window.findButton(testerInstance.createStringDescription("Save this connection")); - button.click(); - - // Create a job - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("List jobs")); - link.click(); - // Add a job - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Add a job")); - link.click(); - // Fill in a name - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - textarea = form.findTextarea(testerInstance.createStringDescription("description")); - textarea.setValue(testerInstance.createStringDescription("MyJob")); - link = window.findLink(testerInstance.createStringDescription("Connection tab")); - link.click(); - // Select the connections - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("output_connectionname")); - selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("output_precedent")); - selectbox.selectValue(testerInstance.createStringDescription("-1")); - button = window.findButton(testerInstance.createStringDescription("Add an output")); - button.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("connectionname")); - selectbox.selectValue(testerInstance.createStringDescription("MyRepositoryConnection")); - button = window.findButton(testerInstance.createStringDescription("Continue to next screen")); - button.click(); - // Visit all the tabs. Scheduling tab first - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Scheduling tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("dayofweek")); - selectbox.selectValue(testerInstance.createStringDescription("0")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("hourofday")); - selectbox.selectValue(testerInstance.createStringDescription("1")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("minutesofhour")); - selectbox.selectValue(testerInstance.createStringDescription("30")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("monthofyear")); - selectbox.selectValue(testerInstance.createStringDescription("11")); - selectbox = form.findSelectbox(testerInstance.createStringDescription("dayofmonth")); - selectbox.selectValue(testerInstance.createStringDescription("none")); - textarea = form.findTextarea(testerInstance.createStringDescription("duration")); - textarea.setValue(testerInstance.createStringDescription("120")); - button = window.findButton(testerInstance.createStringDescription("Add new schedule record")); - button.click(); - window = testerInstance.findWindow(null); - // HopFilters tab - link = window.findLink(testerInstance.createStringDescription("Hop Filters tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - // Seeds tab - link = window.findLink(testerInstance.createStringDescription("Seeds tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - textarea = form.findTextarea(testerInstance.createStringDescription("s0_seeds")); - textarea.setValue(testerInstance.createStringDescription("http://www.cnn.com";)); - // Canonicalization tab - link = window.findLink(testerInstance.createStringDescription("Canonicalization tab")); - link.click(); - window = testerInstance.findWindow(null); - button = window.findButton(testerInstance.createStringDescription("Add url regexp")); - button.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - // Security tab - link = window.findLink(testerInstance.createStringDescription("Security tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - // URL Mapping tab - link = window.findLink(testerInstance.createStringDescription("URL Mappings tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - form.findTextarea(testerInstance.createStringDescription("s0_rssmatch")).setValue(testerInstance.createStringDescription("foo")); - form.findTextarea(testerInstance.createStringDescription("s0_rssmap")).setValue(testerInstance.createStringDescription("bar")); - button = window.findButton(testerInstance.createStringDescription("Add regular expression")); - button.click(); - window = testerInstance.findWindow(null); - button = window.findButton(testerInstance.createStringDescription("Remove regular expression #0")); - button.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - // Metadata tab - link = window.findLink(testerInstance.createStringDescription("Metadata tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - // Inclusions tab - link = window.findLink(testerInstance.createStringDescription("Inclusions tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - checkbox = form.findCheckbox(testerInstance.createStringDescription("s0_matchinghosts"), - testerInstance.createStringDescription("true")); - checkbox.select(); - // Exclusions tab - link = window.findLink(testerInstance.createStringDescription("Exclusions tab")); - link.click(); - window = testerInstance.findWindow(null); - form = window.findForm(testerInstance.createStringDescription("editjob")); - - // Save the job - button = window.findButton(testerInstance.createStringDescription("Save this job")); - button.click(); - - // Delete the job - window = testerInstance.findWindow(null); - HTMLTester.StringDescription jobID = window.findMatch(testerInstance.createStringDescription("<!--jobid=(.*?)-->"),0); - testerInstance.printValue(jobID); - link = window.findLink(testerInstance.createStringDescription("Delete this job")); - link.click(); - - // Wait for the job to go away - loop = testerInstance.beginLoop(120); - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Manage jobs")); - link.click(); - window = testerInstance.findWindow(null); - HTMLTester.StringDescription isJobNotPresent = window.isNotPresent(jobID); - testerInstance.printValue(isJobNotPresent); - loop.breakWhenTrue(isJobNotPresent); - loop.endLoop(); - - // Delete the repository connection - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("List repository connections")); - link.click(); - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Delete MyRepositoryConnection")); - link.click(); - - // Delete the output connection - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("List output connections")); - link.click(); - window = testerInstance.findWindow(null); - link = window.findLink(testerInstance.createStringDescription("Delete MyOutputConnection")); - link.click(); - - testerInstance.executeTest(); -*/ } - + }
Modified: manifoldcf/trunk/connectors/webcrawler/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/pom.xml?rev=1793547&r1=1793546&r2=1793547&view=diff ============================================================================== --- manifoldcf/trunk/connectors/webcrawler/pom.xml (original) +++ manifoldcf/trunk/connectors/webcrawler/pom.xml Tue May 2 16:00:56 2017 @@ -46,8 +46,8 @@ <resource> <directory>${basedir}/connector/src/main/resources</directory> <includes> - <include>**/*.html</include> - <include>**/*.js</include> + <include>**/*.html.vm</include> + <include>**/*.js.vm</include> </includes> </resource> </resources> Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java?rev=1793547&r1=1793546&r2=1793547&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java (original) +++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/SeleniumTester.java Tue May 2 16:00:56 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++) {
