Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5832: Improve scary logging from ZkControllerTest suggests test setup isn't doing what it's suppose to. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1578975 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-03-18 17:31:51 +00:00
parent 9b985f6461
commit 0c18bb45d7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -86,7 +86,7 @@ public class CoreContainer {
protected boolean shareSchema;
protected ZkContainer zkSys = new ZkContainer();
private ShardHandlerFactory shardHandlerFactory;
protected ShardHandlerFactory shardHandlerFactory;
private UpdateShardHandler updateShardHandler;

9
solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
View File

@ -30,6 +30,7 @@ import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.handler.component.HttpShardHandlerFactory;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.util.ExternalPaths;
@ -308,11 +309,11 @@ public class ZkControllerTest extends SolrTestCaseJ4 {
}
private static class MockCoreContainer extends CoreContainer {
private HttpShardHandlerFactory shardHandlerFactory;
public MockCoreContainer() {
super((Object)null);
this.shardHandlerFactory = new HttpShardHandlerFactory();
this.coreAdminHandler = new CoreAdminHandler();
}
@Override
@ -322,10 +323,6 @@ public class ZkControllerTest extends SolrTestCaseJ4 {
public String getAdminPath() {
return "/admin/cores";
}
@Override
public ShardHandlerFactory getShardHandlerFactory() {
return shardHandlerFactory;
}
}
}