Modified: manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -19,7 +19,7 @@ package org.apache.manifoldcf.agents.out import java.util.Locale; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; import org.junit.Test; import org.junit.Ignore; @@ -28,127 +28,199 @@ public class NavigationHSQLDBUI extends @Test public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - testerInstance.navigateTo("List output connections"); - testerInstance.clickButton("Add a new output connection"); + 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.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 - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyOutputConnection"); - - //Goto to Type tab - testerInstance.clickTab("Type"); - + 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 - testerInstance.waitForElementWithName("classname"); - testerInstance.selectValue("classname","org.apache.manifoldcf.agents.output.kafka.KafkaOutputConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.agents.output.kafka.KafkaOutputConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - - // Parameters tab - testerInstance.clickTab("Parameters"); - testerInstance.setValue("ip", "localhost"); - testerInstance.setValue("port", "9092"); - testerInstance.setValue("topic", "topic"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); // Go back to the Name tab - testerInstance.clickTab("Name"); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Name tab")); + link.click(); + // Parameters tab + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Parameters tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + textarea = form.findTextarea(testerInstance.createStringDescription("ip")); + textarea.setValue(testerInstance.createStringDescription("localhost")); + textarea = form.findTextarea(testerInstance.createStringDescription("port")); + textarea.setValue(testerInstance.createStringDescription("9092")); + textarea = form.findTextarea(testerInstance.createStringDescription("topic")); + textarea.setValue(testerInstance.createStringDescription("topic")); + // Go back to the Name tab + link = window.findLink(testerInstance.createStringDescription("Name tab")); + link.click(); // Now save the connection. - testerInstance.clickButton("Save",60); - testerInstance.verifyThereIsNoError(); + window = testerInstance.findWindow(null); + button = window.findButton(testerInstance.createStringDescription("Save this output connection")); + button.click(); // Define a repository connection via the UI - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButton("Add new connection"); - - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyRepositoryConnection"); - + 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 - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - - // Go back to the Name tab - testerInstance.clickTab("Name"); - - // Save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); + window = testerInstance.findWindow(null); + // Now save the connection. + button = window.findButton(testerInstance.createStringDescription("Save this connection")); + button.click(); // Create a job - testerInstance.navigateTo("List jobs"); - //Add a job - testerInstance.clickButton("Add a new job"); - testerInstance.waitForElementWithName("description"); - //Fill in a name - testerInstance.setValue("description","MyJob"); - testerInstance.clickTab("Connection"); - + 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 - testerInstance.selectValue("output_connectionname","MyOutputConnection"); - testerInstance.selectValue("output_precedent","-1"); - testerInstance.clickButton("Add output",true); - testerInstance.waitForElementWithName("connectionname"); - testerInstance.selectValue("connectionname","MyRepositoryConnection"); - - testerInstance.clickButton("Continue"); - + 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 - testerInstance.clickTab("Scheduling"); - testerInstance.selectValue("dayofweek","0"); - testerInstance.selectValue("hourofday","1"); - testerInstance.selectValue("minutesofhour","30"); - testerInstance.selectValue("monthofyear","11"); - testerInstance.selectValue("dayofmonth","none"); - testerInstance.setValue("duration","120"); - testerInstance.clickButton("Add Scheduled Time",true); - testerInstance.waitForElementWithName("editjob"); - + 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); // MHL - // Save the job - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - testerInstance.waitForPresenceById("job"); - String jobID = testerInstance.getAttributeValueById("job","jobid"); - - //Navigate to List Jobs - testerInstance.navigateTo("List jobs"); - testerInstance.waitForElementWithName("listjobs"); - - //Delete the job - testerInstance.clickButtonByTitle("Delete job " + jobID); - testerInstance.acceptAlert(); - testerInstance.verifyThereIsNoError(); + button = window.findButton(testerInstance.createStringDescription("Save this job")); + button.click(); - //Wait for the job to go away - testerInstance.waitForJobDeleteEN(jobID, 120); + // 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 - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButtonByTitle("Delete MyRepositoryConnection"); - testerInstance.acceptAlert(); + 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 - testerInstance.navigateTo("List output connections"); - testerInstance.clickButtonByTitle("Delete MyOutputConnection"); - testerInstance.acceptAlert(); - - testerInstance.verifyThereIsNoError(); + 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/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/ldap/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/ldap/tests/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,64 +37,92 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - - // Add an authority group - testerInstance.navigateTo("List authority groups"); - testerInstance.clickButton("Add a new authority group"); - - // Fill in a name - testerInstance.waitForElementWithName("groupname"); - testerInstance.setValue("groupname","MyAuthorityGroup"); - - // Save the authority group - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - // Add an authority - testerInstance.navigateTo("List authorities"); - testerInstance.clickButton("Add a new connection"); + 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.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 authority connection via the UI + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authority groups")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Add new authority group")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editgroup")); + textarea = form.findTextarea(testerInstance.createStringDescription("groupname")); + textarea.setValue(testerInstance.createStringDescription("MyAuthorityConnection")); + button = window.findButton(testerInstance.createStringDescription("Save this authority group")); + button.click(); + + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authorities")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Add a new connection")); + link.click(); // Fill in a name - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyAuthorityConnection"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + textarea = form.findTextarea(testerInstance.createStringDescription("connname")); + textarea.setValue(testerInstance.createStringDescription("MyAuthorityConnection")); + link = window.findLink(testerInstance.createStringDescription("Type tab")); + link.click(); // Select a type - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.authorities.authorities.ldap.LDAPAuthority"); - testerInstance.selectValue("authoritygroup", "MyAuthorityGroup"); - testerInstance.clickButton("Continue"); - - // Visit LDAP tab - testerInstance.clickTab("LDAP"); - testerInstance.setValue("ldapServerName", "localhost"); - testerInstance.setValue("ldapServerBase", "dc=localhost"); - - // Back to the name tab - testerInstance.clickTab("Name"); - - // Now, save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.authorities.authorities.ldap.LDAPAuthority")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("authoritygroup")); + selectbox.selectValue(testerInstance.createStringDescription("MyAuthorityConnection")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); + // Server tab + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("LDAP tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + textarea = form.findTextarea(testerInstance.createStringDescription("ldapServerName")); + textarea.setValue(testerInstance.createStringDescription("localhost")); + textarea = form.findTextarea(testerInstance.createStringDescription("ldapServerBase")); + textarea.setValue(testerInstance.createStringDescription("dc=localhost")); + // 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 authority connection")); + button.click(); // Delete the authority connection - testerInstance.navigateTo("List authorities"); - testerInstance.clickButtonByTitle("Delete MyAuthorityConnection"); - testerInstance.acceptAlert(); - - // Delete the authority group - testerInstance.navigateTo("List authority groups"); - testerInstance.clickButtonByTitle("Delete MyAuthorityGroup"); - testerInstance.acceptAlert(); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authorities")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Delete MyAuthorityConnection")); + link.click(); + testerInstance.executeTest(); } } Modified: manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/nullauthority/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/nullauthority/tests/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,58 +37,82 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - - // Add an authority group - testerInstance.navigateTo("List authority groups"); - testerInstance.clickButton("Add a new authority group"); - - // Fill in a name - testerInstance.waitForElementWithName("groupname"); - testerInstance.setValue("groupname","MyAuthorityGroup"); - - // Save the authority group - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - // Add an authority - testerInstance.navigateTo("List authorities"); - testerInstance.clickButton("Add a new connection"); - - // Fill in a name - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyAuthorityConnection"); - - // Select a type - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"); - testerInstance.selectValue("authoritygroup", "MyAuthorityGroup"); - testerInstance.clickButton("Continue"); + 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.Loop loop; - // Back to the name tab - testerInstance.clickTab("Name"); + window = testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";); - // Now, save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); + // 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(); + + // Define an authority connection via the UI + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authority groups")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Add new authority group")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editgroup")); + textarea = form.findTextarea(testerInstance.createStringDescription("groupname")); + textarea.setValue(testerInstance.createStringDescription("MyAuthorityConnection")); + button = window.findButton(testerInstance.createStringDescription("Save this authority group")); + button.click(); + + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authorities")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Add a new 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("MyAuthorityConnection")); + 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.authorities.authorities.nullauthority.NullAuthority")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("authoritygroup")); + selectbox.selectValue(testerInstance.createStringDescription("MyAuthorityConnection")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.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 authority connection")); + button.click(); // Delete the authority connection - testerInstance.navigateTo("List authorities"); - testerInstance.clickButtonByTitle("Delete MyAuthorityConnection"); - testerInstance.acceptAlert(); - - // Delete the authority group - testerInstance.navigateTo("List authority groups"); - testerInstance.clickButtonByTitle("Delete MyAuthorityGroup"); - testerInstance.acceptAlert(); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("List authorities")); + link.click(); + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Delete MyAuthorityConnection")); + link.click(); + + testerInstance.executeTest(); } } Modified: manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,114 +37,171 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - testerInstance.navigateTo("List output connections"); - testerInstance.clickButton("Add a new output connection"); - + 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.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 - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyOutputConnection"); - - //Goto to Type tab - testerInstance.clickTab("Type"); - + 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 - testerInstance.waitForElementWithName("classname"); - testerInstance.selectValue("classname","org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - - // Parameters tab - testerInstance.clickTab("Parameters"); - - // Go back to the Name tab - testerInstance.clickTab("Name"); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + // Visit the Appliance tab + link = window.findLink(testerInstance.createStringDescription("Parameters tab")); + link.click(); // Now save the connection. - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - + window = testerInstance.findWindow(null); + button = window.findButton(testerInstance.createStringDescription("Save this output connection")); + button.click(); + // Define a repository connection via the UI - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButton("Add new connection"); - - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyRepositoryConnection"); - + 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 - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); // Go back to the Name tab - testerInstance.clickTab("Name"); + 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 connection")); + button.click(); - // Save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - // Create a job - testerInstance.navigateTo("List jobs"); - //Add a job - testerInstance.clickButton("Add a new job"); - testerInstance.waitForElementWithName("description"); - //Fill in a name - testerInstance.setValue("description","MyJob"); - testerInstance.clickTab("Connection"); - + 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 - testerInstance.selectValue("output_connectionname","MyOutputConnection"); - testerInstance.selectValue("output_precedent","-1"); - testerInstance.clickButton("Add output",true); - testerInstance.waitForElementWithName("connectionname"); - testerInstance.selectValue("connectionname","MyRepositoryConnection"); - - testerInstance.clickButton("Continue"); + 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(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editjob")); - // Visit all the tabs. - // MHL - // Save the job - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - testerInstance.waitForPresenceById("job"); - String jobID = testerInstance.getAttributeValueById("job","jobid"); - - //Navigate to List Jobs - testerInstance.navigateTo("List jobs"); - testerInstance.waitForElementWithName("listjobs"); - - //Delete the job - testerInstance.clickButtonByTitle("Delete job " + jobID); - testerInstance.acceptAlert(); - testerInstance.verifyThereIsNoError(); - - //Wait for the job to go away - testerInstance.waitForJobDeleteEN(jobID, 120); + 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 - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButtonByTitle("Delete MyRepositoryConnection"); - testerInstance.acceptAlert(); - + 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 - testerInstance.navigateTo("List output connections"); - testerInstance.clickButtonByTitle("Delete MyOutputConnection"); - testerInstance.acceptAlert(); - + 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(); } } Propchange: manifoldcf/trunk/connectors/rss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 23 18:49:54 2017 @@ -34,7 +34,6 @@ /manifoldcf/branches/CONNECTORS-1044/connectors/rss:1627162-1627342 /manifoldcf/branches/CONNECTORS-1050/connectors/rss:1628142-1628796 /manifoldcf/branches/CONNECTORS-1085/connectors/rss:1634276-1634533 -/manifoldcf/branches/CONNECTORS-1196-2/connectors/rss:1786970-1788220 /manifoldcf/branches/CONNECTORS-120/connectors/rss:1406712-1407974,1407982-1411043,1411049-1411943,1411969,1412019 /manifoldcf/branches/CONNECTORS-1231/connectors/rss:1703151-1703180 /manifoldcf/branches/CONNECTORS-470/connectors/rss:1349741-1360750,1360808 Modified: manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,156 +37,241 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - testerInstance.navigateTo("List output connections"); - testerInstance.clickButton("Add a new output connection"); - + 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.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 - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","Null Output Connection"); - - //Goto to Type tab - testerInstance.clickTab("Type"); - + 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 - testerInstance.waitForElementWithName("classname"); - testerInstance.selectValue("classname","org.apache.manifoldcf.agents.tests.TestingOutputConnector"); - testerInstance.clickButton("Continue"); - + 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 - testerInstance.clickTab("Throttling"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); // Go back to the Name tab - testerInstance.clickTab("Name"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Name tab")); + link.click(); // Now save the connection. - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - + window = testerInstance.findWindow(null); + button = window.findButton(testerInstance.createStringDescription("Save this output connection")); + button.click(); + // Define a repository connection via the UI - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButton("Add new connection"); - - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","RSS 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("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 - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"); - testerInstance.clickButton("Continue"); - + 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.rss.RSSConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); // Visit the rest of the tabs - Email first - testerInstance.clickTab("Email"); - testerInstance.setValue("email","[email protected]"); - + 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 - testerInstance.clickTab("Robots"); - testerInstance.selectValue("robotsusage","none"); - + 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")); // Bandwidth - testerInstance.clickTab("Bandwidth"); - + link = window.findLink(testerInstance.createStringDescription("Bandwidth tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Proxy - testerInstance.clickTab("Proxy"); - + link = window.findLink(testerInstance.createStringDescription("Proxy tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Go back to the Name tab - testerInstance.clickTab("Name"); - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - + 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 - testerInstance.navigateTo("List jobs"); - //Add a job - testerInstance.clickButton("Add a new job"); - testerInstance.waitForElementWithName("description"); - //Fill in a name - testerInstance.setValue("description","RSS Job"); - testerInstance.clickTab("Connection"); - + 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 - testerInstance.selectValue("output_connectionname","Null Output Connection"); - testerInstance.selectValue("output_precedent","-1"); - testerInstance.clickButton("Add output",true); - testerInstance.waitForElementWithName("connectionname"); - testerInstance.selectValue("connectionname","RSS Repository Connection"); - - testerInstance.clickButton("Continue"); - + 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 - testerInstance.clickTab("Scheduling"); - testerInstance.selectValue("dayofweek","0"); - testerInstance.selectValue("hourofday","1"); - testerInstance.selectValue("minutesofhour","30"); - testerInstance.selectValue("monthofyear","11"); - testerInstance.selectValue("dayofmonth","none"); - testerInstance.setValue("duration","120"); - testerInstance.clickButton("Add Scheduled Time",true); - testerInstance.waitForElementWithName("editjob"); - - //URLs tab - testerInstance.clickTab("URLs"); - testerInstance.setValue("s0_rssurls","https://www.cnn.com";); - + 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); + // URLs tab + link = window.findLink(testerInstance.createStringDescription("URLs tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editjob")); + textarea = form.findTextarea(testerInstance.createStringDescription("s0_rssurls")); + textarea.setValue(testerInstance.createStringDescription("http://www.cnn.com";)); // Canonicalization tab - testerInstance.clickTab("Canonicalization"); - testerInstance.clickButton("Add",true); - + 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); // URL Mappings tab - testerInstance.clickTab("URL Mappings"); - //Time values tab - testerInstance.clickTab("Time Values"); - //Security tab - testerInstance.clickTab("Security"); + link = window.findLink(testerInstance.createStringDescription("URL Mappings tab")); + link.click(); + window = testerInstance.findWindow(null); + // Time Values tab + link = window.findLink(testerInstance.createStringDescription("Time Values tab")); + link.click(); + window = testerInstance.findWindow(null); + // Security tab + link = window.findLink(testerInstance.createStringDescription("Security tab")); + link.click(); + window = testerInstance.findWindow(null); // Dechromed Content tab - testerInstance.clickTab("Dechromed Content"); + link = window.findLink(testerInstance.createStringDescription("Dechromed Content tab")); + link.click(); + window = testerInstance.findWindow(null); // Save the job - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - testerInstance.waitForPresenceById("job"); - String jobID = testerInstance.getAttributeValueById("job","jobid"); - System.out.println("JobId: " + jobID); - - /* Can't do this because we wind up crawling CNN and that's not allowed for a test like this. - - //Start the job - testerInstance.performJobActionEN(jobID,"Start minimal"); - testerInstance.waitForJobStatusEN(jobID,"Done",120); - */ - - //Navigate to List Jobs - testerInstance.navigateTo("List jobs"); - testerInstance.waitForElementWithName("listjobs"); - - //Delete the job - testerInstance.clickButtonByTitle("Delete job " + jobID); - testerInstance.acceptAlert(); - testerInstance.verifyThereIsNoError(); - - //Wait for the job to go away - testerInstance.waitForJobDeleteEN(jobID, 120); + 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 - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButtonByTitle("Delete RSS Repository Connection"); - testerInstance.acceptAlert(); - + 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 - testerInstance.navigateTo("List output connections"); - testerInstance.clickButtonByTitle("Delete Null Output Connection"); - testerInstance.acceptAlert(); - + 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/searchblox/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/searchblox/build.xml?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/searchblox/build.xml (original) +++ manifoldcf/trunk/connectors/searchblox/build.xml Thu Mar 23 18:49:54 2017 @@ -34,6 +34,7 @@ <fileset dir="../../lib"> <include name="jsoup*.jar" /> <include name="resteasy-*.jar" /> + <include name="guava-*.jar" /> </fileset> </path> @@ -43,6 +44,7 @@ <fileset dir="../../lib"> <include name="jsoup*.jar" /> <include name="resteasy-*.jar" /> + <include name="guava-*.jar" /> </fileset> </copy> </target> Modified: manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java?rev=1788301&r1=1788300&r2=1788301&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java (original) +++ manifoldcf/trunk/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationHSQLDBUI.java Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,129 +37,196 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - testerInstance.navigateTo("List output connections"); - testerInstance.clickButton("Add a new output connection"); - + 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.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 - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyOutputConnection"); - - //Goto to Type tab - testerInstance.clickTab("Type"); - + 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 - testerInstance.waitForElementWithName("classname"); - testerInstance.selectValue("classname","org.apache.manifoldcf.agents.output.solr.SolrConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.agents.output.solr.SolrConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Visit the Solr tabs - Server first - testerInstance.clickTab("Server"); - - // Solr type - testerInstance.clickTab("Solr type"); - - // Zookeeper - testerInstance.clickTab("ZooKeeper"); - + link = window.findLink(testerInstance.createStringDescription("Server tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Schema - testerInstance.clickTab("Schema"); - + link = window.findLink(testerInstance.createStringDescription("Schema tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Arguments - testerInstance.clickTab("Arguments"); - + link = window.findLink(testerInstance.createStringDescription("Arguments tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Documents - testerInstance.clickTab("Documents"); - + link = window.findLink(testerInstance.createStringDescription("Documents tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Commits - testerInstance.clickTab("Commits"); - + link = window.findLink(testerInstance.createStringDescription("Commits tab")); + link.click(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); // Go back to the Name tab - testerInstance.clickTab("Name"); - + link = window.findLink(testerInstance.createStringDescription("Name tab")); + link.click(); // Now save the connection. - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - + window = testerInstance.findWindow(null); + button = window.findButton(testerInstance.createStringDescription("Save this output connection")); + button.click(); + // Define a repository connection via the UI - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButton("Add new connection"); - - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyRepositoryConnection"); - + 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 - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector"); - testerInstance.clickButton("Continue"); - + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editconnection")); + selectbox = form.findSelectbox(testerInstance.createStringDescription("classname")); + selectbox.selectValue(testerInstance.createStringDescription("org.apache.manifoldcf.crawler.tests.TestingRepositoryConnector")); + button = window.findButton(testerInstance.createStringDescription("Continue to next page")); + button.click(); // Visit the Throttling tab - testerInstance.clickTab("Throttling"); - + window = testerInstance.findWindow(null); + link = window.findLink(testerInstance.createStringDescription("Throttling tab")); + link.click(); // Go back to the Name tab - testerInstance.clickTab("Name"); + 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 connection")); + button.click(); - // Save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - // Create a job - testerInstance.navigateTo("List jobs"); - //Add a job - testerInstance.clickButton("Add a new job"); - testerInstance.waitForElementWithName("description"); - //Fill in a name - testerInstance.setValue("description","MyJob"); - testerInstance.clickTab("Connection"); - + 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 - testerInstance.selectValue("output_connectionname","MyOutputConnection"); - testerInstance.selectValue("output_precedent","-1"); - testerInstance.clickButton("Add output",true); - testerInstance.waitForElementWithName("connectionname"); - testerInstance.selectValue("connectionname","MyRepositoryConnection"); - - testerInstance.clickButton("Continue"); + 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(); + window = testerInstance.findWindow(null); + form = window.findForm(testerInstance.createStringDescription("editjob")); + // Visit all the Solr tabs // Save the job - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - testerInstance.waitForPresenceById("job"); - String jobID = testerInstance.getAttributeValueById("job","jobid"); - - //Navigate to List Jobs - testerInstance.navigateTo("List jobs"); - testerInstance.waitForElementWithName("listjobs"); - - //Delete the job - testerInstance.clickButtonByTitle("Delete job " + jobID); - testerInstance.acceptAlert(); - testerInstance.verifyThereIsNoError(); - - //Wait for the job to go away - testerInstance.waitForJobDeleteEN(jobID, 120); + 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 - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButtonByTitle("Delete MyRepositoryConnection"); - testerInstance.acceptAlert(); - + 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 - testerInstance.navigateTo("List output connections"); - testerInstance.clickButtonByTitle("Delete MyOutputConnection"); - testerInstance.acceptAlert(); - + 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/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=1788301&r1=1788300&r2=1788301&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 Thu Mar 23 18:49:54 2017 @@ -27,7 +27,7 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.SeleniumTester; +import org.apache.manifoldcf.core.tests.HTMLTester; /** Basic UI navigation tests */ public class NavigationHSQLDBUI extends BaseUIHSQLDB @@ -37,143 +37,6 @@ public class NavigationHSQLDBUI extends public void createConnectionsAndJob() throws Exception { - testerInstance.start(SeleniumTester.BrowserType.CHROME, "en-US", "http://localhost:8346/mcf-crawler-ui/index.jsp";); - - //Login - testerInstance.waitForElementWithName("loginform"); - testerInstance.setValue("userID","admin"); - testerInstance.setValue("password","admin"); - testerInstance.clickButton("Login"); - testerInstance.verifyHeader("Welcome to Apache ManifoldCFâ¢"); - testerInstance.navigateTo("List output connections"); - testerInstance.clickButton("Add a new output connection"); - - // Fill in a name - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyOutputConnection"); - - //Goto to Type tab - testerInstance.clickTab("Type"); - - // Select a type - testerInstance.waitForElementWithName("classname"); - testerInstance.selectValue("classname","org.apache.manifoldcf.agents.tests.TestingOutputConnector"); - testerInstance.clickButton("Continue"); - - // Go back to the Name tab - testerInstance.clickTab("Name"); - - // Now save the connection. - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - // Define a repository connection via the UI - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButton("Add new connection"); - - testerInstance.waitForElementWithName("connname"); - testerInstance.setValue("connname","MyRepositoryConnection"); - - // Select a type - testerInstance.clickTab("Type"); - testerInstance.selectValue("classname","org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"); - testerInstance.clickButton("Continue"); - - // Visit the rest of the tabs - Email first - testerInstance.clickTab("Email"); - testerInstance.setValue("email", "[email protected]"); - // Robots - testerInstance.clickTab("Robots"); - testerInstance.selectValue("robotsusage", "none"); - testerInstance.selectValue("metarobotstagsusage", "none"); - // Bandwidth - testerInstance.clickTab("Bandwidth"); - // Access Credentials - testerInstance.clickTab("Access Credentials"); - // Certificates - testerInstance.clickTab("Certificates"); - testerInstance.clickCheckbox("all_trust"); - testerInstance.clickButton("Add", true); - - // Go back to the Name tab - testerInstance.clickTab("Name"); - - // Save - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - // Create a job - testerInstance.navigateTo("List jobs"); - //Add a job - testerInstance.clickButton("Add a new job"); - testerInstance.waitForElementWithName("description"); - //Fill in a name - testerInstance.setValue("description","MyJob"); - testerInstance.clickTab("Connection"); - - // Select the connections - testerInstance.selectValue("output_connectionname","MyOutputConnection"); - testerInstance.selectValue("output_precedent","-1"); - testerInstance.clickButton("Add output",true); - testerInstance.waitForElementWithName("connectionname"); - testerInstance.selectValue("connectionname","MyRepositoryConnection"); - - testerInstance.clickButton("Continue"); - - // HopFilters tab - testerInstance.clickTab("Hop Filters"); - // Seeds tab - testerInstance.clickTab("Seeds"); - testerInstance.setValue("s0_seeds", "http://www.cnn.com";); - // Canonicalization tab - testerInstance.clickTab("Canonicalization"); - testerInstance.clickButton("Add", true); - // 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); - // Metadata tab - testerInstance.clickTab("Metadata"); - // Inclusions tab - testerInstance.clickTab("Inclusions"); - testerInstance.clickCheckbox("s0_matchinghosts"); - // Exclusions tab - testerInstance.clickTab("Exclusions"); - - // Save the job - testerInstance.clickButton("Save"); - testerInstance.verifyThereIsNoError(); - - testerInstance.waitForPresenceById("job"); - String jobID = testerInstance.getAttributeValueById("job","jobid"); - - //Navigate to List Jobs - testerInstance.navigateTo("List jobs"); - testerInstance.waitForElementWithName("listjobs"); - - //Delete the job - testerInstance.clickButtonByTitle("Delete job " + jobID); - testerInstance.acceptAlert(); - testerInstance.verifyThereIsNoError(); - - //Wait for the job to go away - testerInstance.waitForJobDeleteEN(jobID, 120); - - // Delete the repository connection - testerInstance.navigateTo("List repository connections"); - testerInstance.clickButtonByTitle("Delete MyRepositoryConnection"); - testerInstance.acceptAlert(); - - // Delete the output connection - testerInstance.navigateTo("List output connections"); - testerInstance.clickButtonByTitle("Delete MyOutputConnection"); - testerInstance.acceptAlert(); - -/* testerInstance.newTest(Locale.US); HTMLTester.Window window; @@ -449,7 +312,6 @@ public class NavigationHSQLDBUI extends link.click(); testerInstance.executeTest(); -*/ } } Propchange: manifoldcf/trunk/connectors/wiki/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 23 18:49:54 2017 @@ -35,7 +35,6 @@ /manifoldcf/branches/CONNECTORS-1050/connectors/wiki:1628142-1628796 /manifoldcf/branches/CONNECTORS-1067/connectors/wiki:1630049-1630186 /manifoldcf/branches/CONNECTORS-1085/connectors/wiki:1634276-1634533 -/manifoldcf/branches/CONNECTORS-1196-2/connectors/wiki:1786970-1788220 /manifoldcf/branches/CONNECTORS-120/connectors/wiki:1406712-1407974,1407982-1411043,1411049-1411943 /manifoldcf/branches/CONNECTORS-1231/connectors/wiki:1703151-1703180 /manifoldcf/branches/CONNECTORS-470/connectors/wiki:1349741-1360750,1360808
