Author: kwright
Date: Tue Sep 23 23:03:06 2014
New Revision: 1627172
URL: http://svn.apache.org/r1627172
Log:
Get rid of derby in alfresco connector tests
Added:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java
- copied, changed from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
Removed:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/SanityDerbyTest.java
Modified:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/build.xml
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/pom.xml
Modified: manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/build.xml?rev=1627172&r1=1627171&r2=1627172&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/build.xml Tue Sep
23 23:03:06 2014
@@ -100,9 +100,9 @@
</antcall>
</target>
- <target name="run-IT-derby" depends="compile-tests,pretest-check"
if="canTest">
- <mkdir dir="test-derby-output"/>
- <junit fork="true" maxmemory="1024m" dir="test-derby-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
+ <target name="run-IT-HSQLDB" depends="compile-tests,pretest-check"
if="canTest">
+ <mkdir dir="test-HSQLDB-output"/>
+ <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output"
outputtoformatters="true" showoutput="true" haltonfailure="true">
<jvmarg
value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg
value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg
value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
@@ -121,9 +121,9 @@
<pathelement location="build/connector-tests/classes"/>
</classpath>
<formatter type="brief" usefile="false"/>
- <batchtest todir="test-derby-output">
+ <batchtest todir="test-HSQLDB-output">
<fileset dir="build/connector-tests/classes">
- <include name="**/*DerbyIT.class"/>
+ <include name="**/*HSQLDBIT.class"/>
</fileset>
</batchtest>
</junit>
Copied:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java&r1=1627161&r2=1627172&rev=1627172&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityDerbyIT.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/APISanityHSQLDBIT.java
Tue Sep 23 23:03:06 2014
@@ -56,7 +56,7 @@ import org.junit.Test;
/**
* @author Piergiorgio Lucidi
*/
-public class APISanityDerbyIT extends BaseITDerby
+public class APISanityHSQLDBIT extends BaseITHSQLDB
{
private static final String REPLACER = "?";
Copied:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java&r1=1627161&r2=1627172&rev=1627172&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITDerby.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseITHSQLDB.java
Tue Sep 23 23:03:06 2014
@@ -32,7 +32,7 @@ import org.junit.Before;
* @author Piergiorgio Lucidi
*
* */
-public class BaseITDerby extends
org.apache.manifoldcf.crawler.tests.BaseITDerby
+public class BaseITHSQLDB extends
org.apache.manifoldcf.crawler.tests.BaseITHSQLDB
{
protected Server alfrescoServer = null;
Copied:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java&r1=1627161&r2=1627172&rev=1627172&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIDerby.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/BaseUIHSQLDB.java
Tue Sep 23 23:03:06 2014
@@ -20,7 +20,7 @@ package org.apache.manifoldcf.crawler.co
/** 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
{
protected String[] getConnectorNames()
{
Copied:
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java
(from r1627161,
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java?p2=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java&p1=manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java&r1=1627161&r2=1627172&rev=1627172&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationDerbyUI.java
(original)
+++
manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/alfresco/tests/NavigationHSQLDBUI.java
Tue Sep 23 23:03:06 2014
@@ -24,7 +24,7 @@ import org.apache.manifoldcf.core.tests.
import org.junit.Test;
/** Basic UI navigation tests */
-public class NavigationDerbyUI extends BaseUIDerby
+public class NavigationHSQLDBUI extends BaseUIHSQLDB
{
@Test
Modified: manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/pom.xml?rev=1627172&r1=1627171&r2=1627172&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1044/connectors/alfresco/pom.xml Tue Sep 23
23:03:06 2014
@@ -373,12 +373,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version>
