Apache Solr open-source search software
SOLR-15676, SOLR-15687: make UpdateLogCloudTest repeatable (via @Before and @After) (#341)
Christine Poerschked63d316c65af
diff --git a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.javaindex 010fda27ee3..98686573815 100644--- a/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java+++ b/solr/core/src/test/org/apache/solr/handler/component/UpdateLogCloudTest.java@@ -29,6 +29,8 @@ import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.cloud.AbstractDistribZkTestBase;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.NamedList;+import org.junit.After;+import org.junit.Before;import org.junit.BeforeClass;import org.junit.Test;@@ -40,14 +42,17 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {@BeforeClasspublic static void setupCluster() throws Exception {-- // decide collection name ...- COLLECTION = "collection"+(1+random().nextInt(100)) ;-// create and configure clusterconfigureCluster(NUM_SHARDS*NUM_REPLICAS /* nodeCount */).addConfig("conf", configset("cloud-dynamic")).configure();+ }++ @Before+ public void beforeTest() throws Exception {++ // decide collection name ...+ COLLECTION = "collection"+(1+random().nextInt(100)) ;// create an empty collectionCollectionAdminRequest@@ -56,6 +61,13 @@ public class UpdateLogCloudTest extends SolrCloudTestCase {AbstractDistribZkTestBase.waitForRecoveriesToFinish(COLLECTION, cluster.getSolrClient().getZkStateReader(), false, true, DEFAULT_TIMEOUT);}+ @After+ public void afterTest() throws Exception {+ CollectionAdminRequest+ .deleteCollection(COLLECTION)+ .process(cluster.getSolrClient());+ }+@Testpublic void test() throws Exception {