Pull up fix for CONNECTORS-595.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/branches/release-0.3-branch@1427333 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 7523f04..620c08e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,10 @@
======================= Release 0.3 =====================
+CONNECTORS-595: Fix tests to use new initCore() conventions and
+test resource layout.
+(Karl Wright)
+
Port to final release of Solr 4.0.0.
(Karl Wright)
diff --git a/mcf/src/test-files/solr/conf/schema-auth.xml b/mcf/src/test-files/solr-mcf/solr/collection1/conf/schema-auth.xml
similarity index 100%
rename from mcf/src/test-files/solr/conf/schema-auth.xml
rename to mcf/src/test-files/solr-mcf/solr/collection1/conf/schema-auth.xml
diff --git a/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml b/mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth-load.xml
similarity index 100%
rename from mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
rename to mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth-load.xml
diff --git a/mcf/src/test-files/solr/conf/solrconfig-auth-qparser.xml b/mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth-qparser.xml
similarity index 100%
rename from mcf/src/test-files/solr/conf/solrconfig-auth-qparser.xml
rename to mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth-qparser.xml
diff --git a/mcf/src/test-files/solr/conf/solrconfig-auth.xml b/mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth.xml
similarity index 100%
rename from mcf/src/test-files/solr/conf/solrconfig-auth.xml
rename to mcf/src/test-files/solr-mcf/solr/collection1/conf/solrconfig-auth.xml
diff --git a/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java b/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
index f44bd2a..8b9c2ae 100644
--- a/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
+++ b/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
@@ -40,7 +40,7 @@
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-auth-qparser.xml","schema-auth.xml");
+ initCore("solrconfig-auth-qparser.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
service = new MockMCFAuthorityService();
service.start();
diff --git a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
index e8d193f..5ce7623 100644
--- a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
+++ b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
@@ -40,7 +40,7 @@
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-auth-load.xml","schema-auth.xml");
+ initCore("solrconfig-auth-load.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
service = new MockMCFAuthorityService();
service.start();
diff --git a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
index 13f09a0..505c584 100644
--- a/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
+++ b/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
@@ -40,7 +40,7 @@
@BeforeClass
public static void beforeClass() throws Exception {
- initCore("solrconfig-auth.xml","schema-auth.xml");
+ initCore("solrconfig-auth.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
service = new MockMCFAuthorityService();
service.start();
