Remove derby test dependency from wiki
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1044@1627339 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
deleted file mode 100644
index b19fa94..0000000
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $Id$ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.manifoldcf.crawler.connectors.wiki.tests;
-
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ManifoldCF;
-
-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.ConnectorBaseDerby
-{
-
- protected String[] getConnectorNames()
- {
- return new String[]{"Wiki Connector"};
- }
-
- protected String[] getConnectorClasses()
- {
- return new String[]{"org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"};
- }
-
-
-}
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITHSQLDB.java
similarity index 95%
rename from connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java
rename to connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITHSQLDB.java
index 0f96776..071901f 100644
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java
+++ b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITHSQLDB.java
@@ -28,7 +28,7 @@
import org.junit.*;
/** Tests that run the "agents daemon" should be derived from this */
-public class BaseITDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby
+public class BaseITHSQLDB extends org.apache.manifoldcf.crawler.tests.BaseITHSQLDB
{
protected MockWikiService wikiService = null;
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIDerby.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIDerby.java
deleted file mode 100644
index e6cc7dc..0000000
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIDerby.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $Id$ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.manifoldcf.crawler.connectors.wiki.tests;
-
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ManifoldCF;
-
-import java.io.*;
-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
-{
- protected MockWikiService wikiService = null;
-
- protected String[] getConnectorNames()
- {
- return new String[]{"Wiki Connector"};
- }
-
- protected String[] getConnectorClasses()
- {
- return new String[]{"org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"};
- }
-
- protected String[] getOutputNames()
- {
- return new String[]{"Null Output"};
- }
-
- protected String[] getOutputClasses()
- {
- return new String[]{"org.apache.manifoldcf.agents.tests.TestingOutputConnector"};
- }
-
- // Setup and teardown the mock wiki service
-
- @Before
- public void createWikiService()
- throws Exception
- {
- wikiService = new MockWikiService(BaseUIDerby.class);
- wikiService.start();
- }
-
- @After
- public void shutdownWikiService()
- throws Exception
- {
- if (wikiService != null)
- wikiService.stop();
- }
-
-}
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIHSQLDB.java
similarity index 92%
copy from connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java
copy to connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIHSQLDB.java
index 0f96776..d01451b 100644
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseITDerby.java
+++ b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseUIHSQLDB.java
@@ -28,7 +28,7 @@
import org.junit.*;
/** Tests that run the "agents daemon" should be derived from this */
-public class BaseITDerby extends org.apache.manifoldcf.crawler.tests.BaseITDerby
+public class BaseUIHSQLDB extends org.apache.manifoldcf.crawler.tests.ConnectorBaseUIHSQLDB
{
protected MockWikiService wikiService = null;
@@ -58,7 +58,7 @@
public void createWikiService()
throws Exception
{
- wikiService = new MockWikiService(getClass());
+ wikiService = new MockWikiService(BaseUIHSQLDB.class);
wikiService.start();
}
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationHSQLDBUI.java
similarity index 99%
rename from connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
rename to connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationHSQLDBUI.java
index b2a1bbf..7fb8acc 100644
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationDerbyUI.java
+++ b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/NavigationHSQLDBUI.java
@@ -30,7 +30,7 @@
import org.apache.manifoldcf.core.tests.HTMLTester;
/** Basic UI navigation tests */
-public class NavigationDerbyUI extends BaseUIDerby
+public class NavigationHSQLDBUI extends BaseUIHSQLDB
{
protected static Map<String,String> initialCheckResources;
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java
deleted file mode 100644
index 73a5ba7..0000000
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $Id$ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.manifoldcf.crawler.connectors.wiki.tests;
-
-import org.apache.manifoldcf.core.interfaces.*;
-import org.apache.manifoldcf.agents.interfaces.*;
-import org.apache.manifoldcf.crawler.interfaces.*;
-import org.apache.manifoldcf.crawler.system.ManifoldCF;
-
-import java.io.*;
-import java.util.*;
-import org.junit.*;
-
-/** This is a very basic sanity check */
-public class SanityDerbyTest extends BaseDerby
-{
-
- @Test
- public void sanityCheck()
- throws Exception
- {
- // If we get this far, it must mean that the setup was successful, which is all that I'm shooting for in this test.
- }
-
-
-}
diff --git a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBIT.java
similarity index 99%
rename from connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
rename to connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBIT.java
index fdd932f..c22cee3 100644
--- a/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyIT.java
+++ b/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBIT.java
@@ -30,7 +30,7 @@
import org.junit.*;
/** This is a very basic sanity check */
-public class SanityDerbyIT extends BaseITDerby
+public class SanityHSQLDBIT extends BaseITHSQLDB
{
protected static Map<String,String> initialCheckResources;
protected static Map<String,String> initialListResources;
diff --git a/connectors/wiki/pom.xml b/connectors/wiki/pom.xml
index 61e296b..da5d5cb 100644
--- a/connectors/wiki/pom.xml
+++ b/connectors/wiki/pom.xml
@@ -260,12 +260,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>
