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 2011/12/30 11:09:38 UTC
svn commit: r1225781 - in /incubator/lcf/trunk: connectors/filesystem/
connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/
connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connec...
Author: kwright
Date: Fri Dec 30 10:09:38 2011
New Revision: 1225781
URL: http://svn.apache.org/viewvc?rev=1225781&view=rev
Log:
Un-Derby-fy all the base class names, so true non-specific base class names can be introduced. Part of CONNECTORS-346.
Added:
incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java
- copied, changed from r1225358, incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Base.java
incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java
- copied, changed from r1225358, incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTest.java
incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/Base.java
incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityTest.java
incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/Base.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBase.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java
- copied, changed from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityTest.java
Removed:
incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Base.java
incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTest.java
incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/Base.java
incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityTest.java
incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/Base.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBase.java
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityTest.java
Modified:
incubator/lcf/trunk/connectors/filesystem/build.xml
incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
incubator/lcf/trunk/framework/build.xml
incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
Modified: incubator/lcf/trunk/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/build.xml?rev=1225781&r1=1225780&r2=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/connectors/filesystem/build.xml Fri Dec 30 10:09:38 2011
@@ -94,7 +94,7 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityTest" todir="test-output"/>
+ <test name="org.apache.manifoldcf.crawler.connectors.filesystem.tests.SanityDerbyTest" todir="test-output"/>
<!-- MHL -->
</junit>
</target>
Copied: incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java (from r1225358, incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Base.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java?p2=incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java&p1=incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Base.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/Base.java (original)
+++ incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/BaseDerby.java Fri Dec 30 10:09:38 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
-public class Base extends org.apache.manifoldcf.crawler.tests.ConnectorBase
+public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseDerby
{
protected String[] getConnectorNames()
Copied: incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java (from r1225358, incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java?p2=incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java&p1=incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTest.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityTest.java (original)
+++ incubator/lcf/trunk/connectors/filesystem/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/filesystem/tests/SanityDerbyTest.java Fri Dec 30 10:09:38 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityTest extends Base
+public class SanityDerbyTest extends BaseDerby
{
@Test
Modified: incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java?rev=1225781&r1=1225780&r2=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java (original)
+++ incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java Fri Dec 30 10:09:38 2011
@@ -26,7 +26,7 @@ import org.apache.manifoldcf.crawler.sys
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the connectors, for derby. */
-public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBase
+public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseDerby
{
protected String[] getConnectorNames()
Copied: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java (from r1225358, incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/Base.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java?p2=incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java&p1=incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/Base.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/Base.java (original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/BaseDerby.java Fri Dec 30 10:09:38 2011
@@ -27,7 +27,7 @@ import java.util.*;
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
-public class Base extends org.apache.manifoldcf.core.tests.Base
+public class BaseDerby extends org.apache.manifoldcf.core.tests.BaseDerby
{
@Before
Copied: incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java (from r1225358, incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java?p2=incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java&p1=incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityTest.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityTest.java (original)
+++ incubator/lcf/trunk/framework/agents/src/test/java/org/apache/manifoldcf/agents/tests/SanityDerbyTest.java Fri Dec 30 10:09:38 2011
@@ -27,7 +27,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityTest extends Base
+public class SanityDerbyTest extends BaseDerby
{
@Test
Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1225781&r1=1225780&r2=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Fri Dec 30 10:09:38 2011
@@ -677,8 +677,8 @@
</classpath>
<formatter type="brief" usefile="false"/>
- <test name="org.apache.manifoldcf.agents.tests.SanityTest" todir="test-output"/>
- <test name="org.apache.manifoldcf.crawler.tests.SanityTest" todir="test-output"/>
+ <test name="org.apache.manifoldcf.agents.tests.SanityDerbyTest" todir="test-output"/>
+ <test name="org.apache.manifoldcf.crawler.tests.SanityDerbyTest" todir="test-output"/>
<!-- MHL -->
</junit>
</target>
Copied: incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java (from r1225358, incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java?p2=incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java&p1=incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java (original)
+++ incubator/lcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/BaseDerby.java Fri Dec 30 10:09:38 2011
@@ -26,7 +26,7 @@ import java.util.*;
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the core Derby database. */
-public class Base
+public class BaseDerby
{
protected File currentPath = null;
protected File configFile = null;
Copied: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java (from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/Base.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java?p2=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java&p1=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/Base.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/Base.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseDerby.java Fri Dec 30 10:09:38 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
-public class Base extends org.apache.manifoldcf.agents.tests.Base
+public class BaseDerby extends org.apache.manifoldcf.agents.tests.BaseDerby
{
@Before
Modified: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java?rev=1225781&r1=1225780&r2=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/BaseITDerby.java Fri Dec 30 10:09:38 2011
@@ -28,7 +28,7 @@ import java.util.*;
import org.junit.*;
/** Tests that run the "agents daemon" should be derived from this */
-public class BaseITDerby extends ConnectorBase
+public class BaseITDerby extends ConnectorBaseDerby
{
protected ManifoldCFInstance mcfInstance = new ManifoldCFInstance();
Copied: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java (from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBase.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java?p2=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java&p1=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBase.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBase.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseDerby.java Fri Dec 30 10:09:38 2011
@@ -29,7 +29,7 @@ import java.util.*;
import org.junit.*;
/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
-public class ConnectorBase extends org.apache.manifoldcf.crawler.tests.Base
+public class ConnectorBaseDerby extends org.apache.manifoldcf.crawler.tests.BaseDerby
{
protected String[] getConnectorClasses()
Copied: incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java (from r1225358, incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java?p2=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java&p1=incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityTest.java&r1=1225358&r2=1225781&rev=1225781&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityTest.java (original)
+++ incubator/lcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/SanityDerbyTest.java Fri Dec 30 10:09:38 2011
@@ -27,7 +27,7 @@ import java.util.*;
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityTest extends Base
+public class SanityDerbyTest extends BaseDerby
{
@Test