You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/18 18:27:47 UTC
svn commit: r1578974 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/core/CoreContainer.java
test/org/apache/solr/cloud/ZkControllerTest.java
test/org/apache/solr/util/MockCoreContainer.java
Author: markrmiller
Date: Tue Mar 18 17:27:47 2014
New Revision: 1578974
URL: http://svn.apache.org/r1578974
Log:
SOLR-5832: Scary logging from ZkControllerTest suggests test setup isn't doing what it's suppose to.
Added:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java (with props)
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1578974&r1=1578973&r2=1578974&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Tue Mar 18 17:27:47 2014
@@ -18,6 +18,7 @@
package org.apache.solr.core;
import com.google.common.collect.Maps;
+
import org.apache.solr.cloud.ZkController;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
@@ -159,6 +160,20 @@ public class CoreContainer {
}
/**
+ * This method allows subclasses to construct a CoreContainer
+ * without any default init behavior.
+ *
+ * @param testConstructor pass (Object)null.
+ * @lucene.experimental
+ */
+ protected CoreContainer(Object testConstructor) {
+ solrHome = null;
+ loader = null;
+ coresLocator = null;
+ cfg = null;
+ }
+
+ /**
* Create a new CoreContainer and load its cores
* @param solrHome the solr home directory
* @param configFile the file containing this container's configuration
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1578974&r1=1578973&r2=1578974&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Tue Mar 18 17:27:47 2014
@@ -17,7 +17,12 @@ package org.apache.solr.cloud;
* the License.
*/
-import org.apache.commons.io.FileUtils;
+import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.cloud.SolrZkClient;
@@ -25,18 +30,14 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
+import org.apache.solr.handler.component.HttpShardHandlerFactory;
+import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.util.ExternalPaths;
import org.apache.zookeeper.CreateMode;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
@Slow
public class ZkControllerTest extends SolrTestCaseJ4 {
@@ -46,23 +47,14 @@ public class ZkControllerTest extends So
private static final boolean DEBUG = false;
-
- private static final File solrHomeDirectory = new File(TEMP_DIR, "ZkControllerTest");
-
@BeforeClass
public static void beforeClass() throws Exception {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
- copyMinFullSetup(solrHomeDirectory);
- initCore();
+ createTempDir();
}
@AfterClass
public static void afterClass() throws Exception {
- if (solrHomeDirectory.exists()) {
- FileUtils.deleteDirectory(solrHomeDirectory);
- }
+
}
public void testNodeNameUrlConversion() throws Exception {
@@ -307,9 +299,7 @@ public class ZkControllerTest extends So
}
private CoreContainer getCoreContainer() {
- CoreContainer cc = new CoreContainer(solrHomeDirectory.getAbsolutePath());
- cc.load();
- return cc;
+ return new MockCoreContainer();
}
@Override
@@ -317,4 +307,25 @@ public class ZkControllerTest extends So
super.tearDown();
}
+ private static class MockCoreContainer extends CoreContainer {
+ private HttpShardHandlerFactory shardHandlerFactory;
+
+ public MockCoreContainer() {
+ super((Object)null);
+ this.shardHandlerFactory = new HttpShardHandlerFactory();
+ }
+
+ @Override
+ public void load() {};
+
+ @Override
+ public String getAdminPath() {
+ return "/admin/cores";
+ }
+
+ @Override
+ public ShardHandlerFactory getShardHandlerFactory() {
+ return shardHandlerFactory;
+ }
+ }
}
Added: lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java?rev=1578974&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java (added)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java Tue Mar 18 17:27:47 2014
@@ -0,0 +1,24 @@
+package org.apache.solr.util;
+
+import org.apache.solr.core.CoreContainer;
+
+/*
+ * 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.
+ */
+
+public class MockCoreContainer extends CoreContainer {
+
+}