manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1422192 - in /manifoldcf/trunk: ./ framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/
Date Sat, 15 Dec 2012 06:23:52 GMT
Author: kwright
Date: Sat Dec 15 06:23:50 2012
New Revision: 1422192

URL: http://svn.apache.org/viewvc?rev=1422192&view=rev
Log:
Add a UI test for the combined war.

Added:
    manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIHSQLDB.java
      - copied, changed from r1422042, manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java
    manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java
      - copied, changed from r1422042, manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java
Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1422192&r1=1422191&r2=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Dec 15 06:23:50 2012
@@ -2431,6 +2431,10 @@
         <ant dir="tests/filesystem" target="run-HSQLDB"/>
     </target>
 
+    <target name="run-filesystem-UI-tests-HSQLDB" depends="build-tests-framework,build-tests-filesystem-connector,build-tests-nulloutput-connector,calculate-filesystem-tests-condition"
if="filesystem-tests.include">
+        <ant dir="tests/filesystem" target="run-UI-HSQLDB"/>
+    </target>
+
     <target name="run-filesystem-loadtests-HSQLDB" depends="build-tests-framework,build-tests-filesystem-connector,build-tests-nulloutput-connector,calculate-filesystem-tests-condition"
if="filesystem-tests.include">
         <ant dir="tests/filesystem" target="run-load-HSQLDB"/>
     </target>
@@ -2672,7 +2676,7 @@
 
     <target name="ldtest" depends="load-dr,load-hs"/>
 
-    <target name="uitest" depends="run-filesystem-UI-tests-derby,run-jcifs-UI-tests-derby,run-jdbc-UI-tests-derby,run-activedirectory-UI-tests-derby,run-ldap-UI-tests-derby,run-rss-UI-tests-derby,run-webcrawler-UI-tests-derby,run-wiki-UI-tests-derby,run-solr-UI-tests-derby,run-cmis-UI-tests-derby,run-gts-UI-tests-derby,run-opensearchserver-UI-tests-derby"/>
+    <target name="uitest" depends="run-filesystem-UI-tests-derby,run-filesystem-UI-tests-HSQLDB,run-jcifs-UI-tests-derby,run-jdbc-UI-tests-derby,run-activedirectory-UI-tests-derby,run-ldap-UI-tests-derby,run-rss-UI-tests-derby,run-webcrawler-UI-tests-derby,run-wiki-UI-tests-derby,run-solr-UI-tests-derby,run-cmis-UI-tests-derby,run-gts-UI-tests-derby,run-opensearchserver-UI-tests-derby"/>
     
     <target name="all" depends="build,javadoc,doc,image,test-dr,test-hs"/>
 

Modified: manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java?rev=1422192&r1=1422191&r2=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIDerby.java
Sat Dec 15 06:23:50 2012
@@ -33,7 +33,17 @@ import org.apache.manifoldcf.core.tests.
 public class ConnectorBaseUIDerby extends BaseITDerby
 {
   protected HTMLTester testerInstance = null;
+
+  public ConnectorBaseUIDerby()
+  {
+    super();
+  }
   
+  public ConnectorBaseUIDerby(boolean singleWar)
+  {
+    super(singleWar);
+  }
+
   @Before
   public void setupHTMLTester()
     throws Exception

Modified: manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java?rev=1422192&r1=1422191&r2=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java
Sat Dec 15 06:23:50 2012
@@ -34,6 +34,16 @@ public class ConnectorBaseUIHSQLDB exten
 {
   protected HTMLTester testerInstance = null;
   
+  public ConnectorBaseUIHSQLDB()
+  {
+    super();
+  }
+  
+  public ConnectorBaseUIHSQLDB(boolean singleWar)
+  {
+    super(singleWar);
+  }
+
   @Before
   public void setupHTMLTester()
     throws Exception

Modified: manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java?rev=1422192&r1=1422191&r2=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java
Sat Dec 15 06:23:50 2012
@@ -30,10 +30,20 @@ import org.junit.*;
 import org.apache.manifoldcf.core.tests.HTMLTester;
 
 /** Tests that run the "agents daemon" should be derived from this */
-public class ConnectorBaseUIMySQL extends ConnectorBaseMySQL
+public class ConnectorBaseUIMySQL extends BaseITMySQL
 {
   protected HTMLTester testerInstance = null;
   
+  public ConnectorBaseUIMySQL()
+  {
+    super();
+  }
+  
+  public ConnectorBaseUIMySQL(boolean singleWar)
+  {
+    super(singleWar);
+  }
+
   @Before
   public void setupHTMLTester()
     throws Exception

Modified: manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java?rev=1422192&r1=1422191&r2=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java
(original)
+++ manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java
Sat Dec 15 06:23:50 2012
@@ -33,7 +33,17 @@ import org.apache.manifoldcf.core.tests.
 public class ConnectorBaseUIPostgresql extends BaseITPostgresql
 {
   protected HTMLTester testerInstance = null;
+
+  public ConnectorBaseUIPostgresql()
+  {
+    super();
+  }
   
+  public ConnectorBaseUIPostgresql(boolean singleWar)
+  {
+    super(singleWar);
+  }
+
   @Before
   public void setupHTMLTester()
     throws Exception

Copied: manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIHSQLDB.java
(from r1422042, manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIHSQLDB.java?p2=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIHSQLDB.java&p1=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java&r1=1422042&r2=1422192&rev=1422192&view=diff
==============================================================================
--- manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIDerby.java
(original)
+++ manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/BaseUIHSQLDB.java
Sat Dec 15 06:23:50 2012
@@ -28,8 +28,18 @@ import java.util.*;
 import org.junit.*;
 
 /** Tests that run the "agents daemon" should be derived from this */
-public class BaseUIDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIDerby
+public class BaseUIHSQLDB extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIHSQLDB
 {
+  public BaseUIHSQLDB()
+  {
+    super();
+  }
+  
+  public BaseUIHSQLDB(boolean singleWar)
+  {
+    super(singleWar);
+  }
+
   protected String[] getConnectorNames()
   {
     return new String[]{"File Connector"};

Copied: manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.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/NavigationCombinedHSQLDBUI.java?p2=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationCombinedHSQLDBUI.java&p1=manifoldcf/trunk/tests/filesystem/src/test/java/org/apache/manifoldcf/filesystem_tests/NavigationDerbyUI.java&r1=1422042&r2=1422192&rev=1422192&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/NavigationCombinedHSQLDBUI.java
Sat Dec 15 06:23:50 2012
@@ -30,9 +30,14 @@ import org.junit.*;
 import org.apache.manifoldcf.core.tests.HTMLTester;
 
 /** Basic UI navigation tests */
-public class NavigationDerbyUI extends BaseUIDerby
+public class NavigationCombinedHSQLDBUI extends BaseUIHSQLDB
 {
 
+  public NavigationCombinedHSQLDBUI()
+  {
+    super(true);
+  }
+  
   @Test
   public void createConnectionsAndJob()
     throws Exception
@@ -48,7 +53,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("http://localhost:8346/mcf/index.jsp");
     
     // Define an output connection via the UI
     link = window.findLink(testerInstance.createStringDescription("List output connections"));



Mime
View raw message