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

SOLR-5865: Don't use random for now, un@Ignore test, clear static in afterClass. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1579135 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-03-19 05:10:49 +00:00
parent ee0eeb2d77
commit 0cd51f329b
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
View File

@ -17,54 +17,48 @@ package org.apache.solr.cloud;
* limitations under the License. * limitations under the License.
*/ */
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.SolrTestCaseJ4;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Random;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* Test of the MiniSolrCloudCluster functionality. This doesn't derive from * Test of the MiniSolrCloudCluster functionality. This doesn't derive from
* LuceneTestCase, as the MiniSolrCloudCluster is designed to be used outside of the * LuceneTestCase, as the MiniSolrCloudCluster is designed to be used outside of the
* lucene test hierarchy. * lucene test hierarchy.
*/ */
@Ignore
public class TestMiniSolrCloudCluster { public class TestMiniSolrCloudCluster {
private static Logger log = LoggerFactory.getLogger(MiniSolrCloudCluster.class); private static Logger log = LoggerFactory.getLogger(MiniSolrCloudCluster.class);
private static final int NUM_SERVERS = 5; private static final int NUM_SERVERS = 5;
private static final int NUM_SHARDS = 2; private static final int NUM_SHARDS = 2;
private static final int REPLICATION_FACTOR = 2; private static final int REPLICATION_FACTOR = 2;
private static final Random RANDOM = new Random();
private static MiniSolrCloudCluster miniCluster; private static MiniSolrCloudCluster miniCluster;
@BeforeClass @BeforeClass
@ -79,6 +73,7 @@ public class TestMiniSolrCloudCluster {
if (miniCluster != null) { if (miniCluster != null) {
miniCluster.shutdown(); miniCluster.shutdown();
} }
miniCluster = null;
} }
@Test @Test
@ -103,7 +98,7 @@ public class TestMiniSolrCloudCluster {
CloudSolrServer cloudSolrServer = null; CloudSolrServer cloudSolrServer = null;
SolrZkClient zkClient = null; SolrZkClient zkClient = null;
try { try {
cloudSolrServer = new CloudSolrServer(miniCluster.getZkServer().getZkAddress(), RANDOM.nextBoolean()); cloudSolrServer = new CloudSolrServer(miniCluster.getZkServer().getZkAddress(), true);
cloudSolrServer.connect(); cloudSolrServer.connect();
zkClient = new SolrZkClient(miniCluster.getZkServer().getZkAddress(), zkClient = new SolrZkClient(miniCluster.getZkServer().getZkAddress(),
AbstractZkTestCase.TIMEOUT, 45000, null); AbstractZkTestCase.TIMEOUT, 45000, null);