Author: kwright
Date: Sat Dec 15 11:29:02 2012
New Revision: 1422222
URL: http://svn.apache.org/viewvc?rev=1422222&view=rev
Log:
Use a common file to run the same test on different platforms.
Added:
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java
- copied, changed from r1422042,
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
Modified:
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
Modified:
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java?rev=1422222&r1=1422221&r2=1422222&view=diff
==============================================================================
---
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java
(original)
+++
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java
Sat Dec 15 11:29:02 2012
@@ -42,184 +42,7 @@ public class NavigationCombinedHSQLDBUI
public void createConnectionsAndJob()
throws Exception
{
- 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/index.jsp";);
-
- // 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.output.nullconnector.NullConnector"));
- 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.filesystem.FileConnector"));
- 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 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("outputname"));
-
selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
- 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();
- // Now, HopFilters
- window = testerInstance.findWindow(null);
- link = window.findLink(testerInstance.createStringDescription("Hop Filters
tab"));
- link.click();
- window = testerInstance.findWindow(null);
- form = window.findForm(testerInstance.createStringDescription("editjob"));
- radiobutton =
form.findRadiobutton(testerInstance.createStringDescription("hopcountmode"),testerInstance.createStringDescription("2"));
- radiobutton.select();
- link = window.findLink(testerInstance.createStringDescription("Paths
tab"));
- link.click();
- // Add a record to the Paths list
-
- // MHL
-
- // Save the job
- window = testerInstance.findWindow(null);
- 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();
+ new
NavigationUITester(testerInstance,"http://localhost:8346/mcf/index.jsp";).createConnectionsAndJob();
}
}
Modified:
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java?rev=1422222&r1=1422221&r2=1422222&view=diff
==============================================================================
---
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
(original)
+++
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
Sat Dec 15 11:29:02 2012
@@ -37,184 +37,7 @@ public class NavigationDerbyUI extends B
public void createConnectionsAndJob()
throws Exception
{
- 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";);
-
- // 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.output.nullconnector.NullConnector"));
- 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.filesystem.FileConnector"));
- 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 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("outputname"));
-
selectbox.selectValue(testerInstance.createStringDescription("MyOutputConnection"));
- 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();
- // Now, HopFilters
- window = testerInstance.findWindow(null);
- link = window.findLink(testerInstance.createStringDescription("Hop Filters
tab"));
- link.click();
- window = testerInstance.findWindow(null);
- form = window.findForm(testerInstance.createStringDescription("editjob"));
- radiobutton =
form.findRadiobutton(testerInstance.createStringDescription("hopcountmode"),testerInstance.createStringDescription("2"));
- radiobutton.select();
- link = window.findLink(testerInstance.createStringDescription("Paths
tab"));
- link.click();
- // Add a record to the Paths list
-
- // MHL
-
- // Save the job
- window = testerInstance.findWindow(null);
- 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();
+ new
NavigationUITester(testerInstance,"http://localhost:8346/mcf-crawler-ui/index.jsp";).createConnectionsAndJob();
}
}
Copied:
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java
(from r1422042,
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java?p2=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java&p1=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java&r1=1422042&r2=1422222&rev=1422222&view=diff
==============================================================================
---
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
(original)
+++
manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationUITester.java
Sat Dec 15 11:29:02 2012
@@ -30,10 +30,17 @@ import org.junit.*;
import org.apache.manifoldcf.core.tests.HTMLTester;
/** Basic UI navigation tests */
-public class NavigationDerbyUI extends BaseUIDerby
+public class NavigationUITester
{
-
- @Test
+ protected final HTMLTester testerInstance;
+ protected final String startURL;
+
+ public NavigationUITester(HTMLTester tester, String startURL)
+ {
+ this.testerInstance = tester;
+ this.startURL = startURL;
+ }
+
public void createConnectionsAndJob()
throws Exception
{
@@ -48,7 +55,7 @@ public class NavigationDerbyUI extends B
HTMLTester.Radiobutton radiobutton;
HTMLTester.Loop loop;
- window =
testerInstance.openMainWindow("http://localhost:8346/mcf-crawler-ui/index.jsp";);
+ window = testerInstance.openMainWindow(startURL);
// Define an output connection via the UI
link = window.findLink(testerInstance.createStringDescription("List output
connections"));
