You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/06/17 15:48:51 UTC
svn commit: r1603166 - in /manifoldcf/branches/CONNECTORS-962/connectors:
alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/
cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/
elasti...
Author: kwright
Date: Tue Jun 17 13:48:50 2014
New Revision: 1603166
URL: http://svn.apache.org/r1603166
Log:
Fix the tests and get rid of svn merge spewage
Removed:
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/14773725.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19219017.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19319577.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/19839654.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/30955295.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_namespaces.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_timestamps.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/get_urls.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_full.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_full_last.xml
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/list_one.xml
Modified:
manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java
manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java
manifoldcf/branches/CONNECTORS-962/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java
manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java
manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java
manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java
manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
Modified: manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityIT.java Tue Jun 17 13:48:50 2014
@@ -431,8 +431,17 @@ public class APISanityIT extends BaseITD
child.setValue("Alfresco Connection");
jobObject.addChild(jobObject.getChildCount(),child);
- child = new ConfigurationNode("output_connection");
- child.setValue("Null Connection");
+ // Revamped way of adding output connection
+ child = new ConfigurationNode("pipelinestage");
+ ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+ pipelineChild.setValue("0");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_isoutput");
+ pipelineChild.setValue("true");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_connectionname");
+ pipelineChild.setValue("Null Connection");
+ child.addChild(child.getChildCount(),pipelineChild);
jobObject.addChild(jobObject.getChildCount(),child);
child = new ConfigurationNode("run_mode");
Modified: manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -160,8 +160,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/APISanityIT.java Tue Jun 17 13:48:50 2014
@@ -325,8 +325,17 @@ public class APISanityIT extends BaseITD
child.setValue("CMIS Connection");
jobObject.addChild(jobObject.getChildCount(),child);
- child = new ConfigurationNode("output_connection");
- child.setValue("Null Connection");
+ // Revamped way of adding output connection
+ child = new ConfigurationNode("pipelinestage");
+ ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+ pipelineChild.setValue("0");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_isoutput");
+ pipelineChild.setValue("true");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_connectionname");
+ pipelineChild.setValue("Null Connection");
+ child.addChild(child.getChildCount(),pipelineChild);
jobObject.addChild(jobObject.getChildCount(),child);
child = new ConfigurationNode("run_mode");
Modified: manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/cmis/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/cmis/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -194,8 +194,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java Tue Jun 17 13:48:50 2014
@@ -168,8 +168,17 @@ public class APISanityDerbyIT extends Ba
child.setValue("Test Connection");
jobObject.addChild(jobObject.getChildCount(),child);
- child = new ConfigurationNode("output_connection");
- child.setValue("ElasticSearch");
+ // Revamped way of adding output connection
+ child = new ConfigurationNode("pipelinestage");
+ ConfigurationNode pipelineChild = new ConfigurationNode("stage_id");
+ pipelineChild.setValue("0");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_isoutput");
+ pipelineChild.setValue("true");
+ child.addChild(child.getChildCount(),pipelineChild);
+ pipelineChild = new ConfigurationNode("stage_connectionname");
+ pipelineChild.setValue("ElasticSearch");
+ child.addChild(child.getChildCount(),pipelineChild);
jobObject.addChild(jobObject.getChildCount(),child);
child = new ConfigurationNode("run_mode");
Modified: manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -151,8 +151,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/hdfs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/hdfs/tests/NavigationUITester.java Tue Jun 17 13:48:50 2014
@@ -160,8 +160,14 @@ public class NavigationUITester
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/jcifs/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/sharedrive/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -151,8 +151,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/jdbc/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/jdbc/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -159,8 +159,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/opensearchserver/connector/src/test/java/org/apache/manifoldcf/agents/output/opensearchserver/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -148,8 +148,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/BigCrawlTester.java Tue Jun 17 13:48:50 2014
@@ -76,7 +76,7 @@ public class BigCrawlTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("RSS Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -91,10 +91,6 @@ public class BigCrawlTester
ds.addChild(ds.getChildCount(),sn);
}
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -169,8 +169,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/rss/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/rss/tests/RSSSimpleCrawlTester.java Tue Jun 17 13:48:50 2014
@@ -83,7 +83,7 @@ public class RSSSimpleCrawlTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("RSS Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -98,10 +98,6 @@ public class RSSSimpleCrawlTester
ds.addChild(ds.getChildCount(),sn);
}
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -172,8 +172,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/solr/connector/src/test/java/org/apache/manifoldcf/agents/output/solr/tests/SolrTester.java Tue Jun 17 13:48:50 2014
@@ -80,7 +80,7 @@ public class SolrTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("Test Connection");
- job.setOutputConnectionName("Solr Connection");
+ job.addPipelineStage(-1,true,"Solr Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/BigCrawlTester.java Tue Jun 17 13:48:50 2014
@@ -76,7 +76,7 @@ public class BigCrawlTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("Web Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -105,10 +105,6 @@ public class BigCrawlTester
sn.setValue(".*\n");
ds.addChild(ds.getChildCount(),sn);
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -180,8 +180,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/SessionTester.java Tue Jun 17 13:48:50 2014
@@ -129,7 +129,7 @@ public class SessionTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("Web Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -150,10 +150,6 @@ public class SessionTester
sn.setValue(".*\n");
ds.addChild(ds.getChildCount(),sn);
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/webcrawler/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/webcrawler/tests/ThrottlingTester.java Tue Jun 17 13:48:50 2014
@@ -94,7 +94,7 @@ public class ThrottlingTester
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("Web Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_NEVERDELETE);
@@ -120,10 +120,6 @@ public class ThrottlingTester
sn.setValue(".*\n");
ds.addChild(ds.getChildCount(),sn);
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);
Modified: manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java Tue Jun 17 13:48:50 2014
@@ -195,8 +195,14 @@ public class NavigationDerbyUI extends B
// Select the connections
window = testerInstance.findWindow(null);
form = window.findForm(testerInstance.createStringDescription("editjob"));
- selectbox = form.findSelectbox(testerInstance.createStringDescription("outputname"));
+ 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"));
Modified: manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java?rev=1603166&r1=1603165&r2=1603166&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java (original)
+++ manifoldcf/branches/CONNECTORS-962/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java Tue Jun 17 13:48:50 2014
@@ -163,7 +163,7 @@ public class SanityDerbyIT extends BaseI
IJobDescription job = jobManager.createJob();
job.setDescription("Test Job");
job.setConnectionName("Wiki Connection");
- job.setOutputConnectionName("Null Connection");
+ job.addPipelineStage(-1,true,"Null Connection","");
job.setType(job.TYPE_SPECIFIED);
job.setStartMethod(job.START_DISABLE);
job.setHopcountMode(job.HOPCOUNT_ACCURATE);
@@ -172,10 +172,6 @@ public class SanityDerbyIT extends BaseI
// Right now we don't need any...
DocumentSpecification ds = job.getSpecification();
- // Set up the output specification.
- OutputSpecification os = job.getOutputSpecification();
- // Null output connections have no output specification, so this is a no-op.
-
// Save the job.
jobManager.save(job);