SOLR-16304 De-annotate some slow tests

gradle/testing/randomization.gradle

@@ -85,7 +85,6 @@ allprojects {
           [propName: 'tests.timezone', value: "random", description: "Sets the default time zone tests should run with."],
           // filtering
           [propName: 'tests.filter', value: null, description: "Applies a test filter (see :helpTests)."],
-          [propName: 'tests.slow', value: true, description: "Enables or disables @Slow tests."],
           [propName: 'tests.nightly', value: false, description: "Enables or disables @Nightly tests."],
           [propName: 'tests.weekly', value: false, description: "Enables or disables @Weekly tests."],
           [propName: 'tests.monster', value: false, description: "Enables or disables @Monster tests."],

help/tests.txt

@@ -78,7 +78,7 @@ gradlew -p solr/core test -Ptests.filter=@Slow
 
 Test group filters can be combined into Boolean expressions:
 
-gradlew -p solr/core test "default and not(@awaitsfix or @slow)"
+gradlew -p solr/core test -Ptests.filter="default and not(@awaitsfix)"
 
 
 Reiteration ("beasting")

solr/core/src/test/org/apache/solr/TestDistributedGrouping.java

@@ -20,7 +20,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4.SuppressPointFields;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -39,7 +38,6 @@
  *
  * @since solr 4.0
  */
-@Slow
 @SuppressPointFields(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10844")
 public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
 

solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java

@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.request.SolrQueryRequest;
@@ -39,7 +38,6 @@
  * and compares the docvalues facet results to the indexed facet results as if it were just another
  * faceting method.
  */
-@Slow
 @SolrTestCaseJ4.SuppressPointFields(
     bugUrl = "Test explicitly compares Trie to Points, randomization defeats the point")
 @SolrTestCaseJ4.SuppressSSL

solr/core/src/test/org/apache/solr/TestRandomFaceting.java

@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -41,7 +40,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Slow
 public class TestRandomFaceting extends SolrTestCaseJ4 {
 
   private static final Pattern trieFields = Pattern.compile(".*_t.");

solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java

@@ -23,7 +23,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.cloud.api.collections.ShardSplitTest;
 import org.apache.solr.common.SolrInputDocument;
@@ -47,7 +46,6 @@
 import org.slf4j.LoggerFactory;
 
 /** Test split phase that occurs when a Collection API split call is made. */
-@Slow
 @Ignore("SOLR-4944")
 public class ChaosMonkeyShardSplitTest extends ShardSplitTest {
 

solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java

@@ -22,7 +22,6 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.FileUtils;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.cloud.DocCollection;
@@ -33,7 +32,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@LuceneTestCase.Slow
 public class CleanupOldIndexTest extends SolrCloudTestCase {
 
   @BeforeClass
@@ -64,8 +62,7 @@ public void test() throws Exception {
     // TODO make this configurable on StoppableIndexingThread
     cluster.getSolrClient().setDefaultCollection(COLLECTION);
 
-    int[] maxDocList = new int[] {300, 500, 700};
-    int maxDoc = maxDocList[random().nextInt(maxDocList.length - 1)];
+    int maxDoc = atLeast(300);
 
     StoppableIndexingThread indexThread =
         new StoppableIndexingThread(null, cluster.getSolrClient(), "1", true, maxDoc, 1, true);
@@ -123,7 +120,7 @@ public void test() throws Exception {
             TimeUnit.SECONDS,
             (n, c) -> DocCollection.isFullyActive(n, c, 1, 2));
 
-    assertTrue(!oldIndexDir1.isDirectory());
-    assertTrue(!oldIndexDir2.isDirectory());
+    assertFalse(oldIndexDir1.isDirectory());
+    assertFalse(oldIndexDir2.isDirectory());
   }
 }

solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java

@@ -18,7 +18,6 @@
 
 import java.util.Map;
 import java.util.Set;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.common.cloud.ClusterState;
@@ -30,22 +29,17 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 public class ClusterStateUpdateTest extends SolrCloudTestCase {
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-    configureCluster(3).addConfig("conf", configset("cloud-minimal")).configure();
-  }
-
   @BeforeClass
-  public static void beforeClass() {
+  public static void beforeClass() throws Exception {
     System.setProperty("solrcloud.skip.autorecovery", "true");
+    configureCluster(3).addConfig("conf", configset("cloud-minimal")).configure();
   }
 
   @AfterClass
-  public static void afterClass() {
+  public static void afterClass() throws Exception {
+    shutdownCluster();
     System.clearProperty("solrcloud.skip.autorecovery");
     System.clearProperty("genericCoreNodeNames");
   }

solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java

@@ -28,7 +28,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.client.solrj.response.CollectionAdminResponse;
@@ -42,7 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@LuceneTestCase.Slow
 @SolrTestCaseJ4.SuppressSSL
 public class CollectionPropsTest extends SolrCloudTestCase {
   private static final int TIMEOUT = 5000;

solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java

@@ -37,7 +37,6 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrRequest;
@@ -69,28 +68,27 @@
 import org.apache.solr.common.util.TimeSource;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.util.TimeOut;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@LuceneTestCase.Slow
 public class CollectionsAPISolrJTest extends SolrCloudTestCase {
   private static final int TIMEOUT = 3000;
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  @Before
-  public void beforeTest() throws Exception {
+  @BeforeClass
+  public static void beforeTest() throws Exception {
     // System.setProperty("metricsEnabled", "true");
     configureCluster(4)
         .addConfig("conf", configset("cloud-minimal"))
         .addConfig("conf2", configset("cloud-dynamic"))
         .configure();
   }
 
-  @After
-  public void afterTest() throws Exception {
+  @AfterClass
+  public static void afterTest() throws Exception {
     shutdownCluster();
   }
 
@@ -99,7 +97,7 @@ public void afterTest() throws Exception {
    */
   @Test
   public void testCreateWithDefaultConfigSet() throws Exception {
-    String collectionName = "solrj_default_configset";
+    String collectionName = getSaferTestName();
     CollectionAdminResponse response =
         CollectionAdminRequest.createCollection(collectionName, 2, 2)
             .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
@@ -347,7 +345,7 @@ public void testCreateCollWithDefaultClusterPropertiesNewFormat() throws Excepti
 
   @Test
   public void testCreateAndDeleteCollection() throws Exception {
-    String collectionName = "solrj_test";
+    String collectionName = getSaferTestName();
     CollectionAdminResponse response =
         CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
             .process(cluster.getSolrClient());
@@ -392,7 +390,7 @@ public void testCreateAndDeleteCollection() throws Exception {
 
   @Test
   public void testCloudInfoInCoreStatus() throws IOException, SolrServerException {
-    String collectionName = "corestatus_test";
+    String collectionName = getSaferTestName();
     CollectionAdminResponse response =
         CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
             .process(cluster.getSolrClient());
@@ -492,8 +490,7 @@ public void testCreateAndDeleteAlias() throws IOException, SolrServerException {
 
   @Test
   public void testSplitShard() throws Exception {
-
-    final String collectionName = "solrj_test_splitshard";
+    String collectionName = getSaferTestName();
     CollectionAdminRequest.createCollection(collectionName, "conf", 2, 1)
         .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
         .process(cluster.getSolrClient());
@@ -546,8 +543,7 @@ public void testSplitShard() throws Exception {
 
   @Test
   public void testCreateCollectionWithPropertyParam() throws Exception {
-
-    String collectionName = "solrj_test_core_props";
+    String collectionName = getSaferTestName();
 
     Path tmpDir = createTempDir("testPropertyParamsForCreate");
     Path dataDir = tmpDir.resolve("dataDir-" + TestUtil.randomSimpleString(random(), 1, 5));
@@ -579,8 +575,7 @@ public void testCreateCollectionWithPropertyParam() throws Exception {
 
   @Test
   public void testAddAndDeleteReplica() throws Exception {
-
-    final String collectionName = "solrj_replicatests";
+    String collectionName = getSaferTestName();
     CollectionAdminRequest.createCollection(collectionName, "conf", 1, 2)
         .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
         .process(cluster.getSolrClient());
@@ -663,7 +658,7 @@ public void testClusterProp() throws IOException, SolrServerException {
 
   @Test
   public void testCollectionProp() throws InterruptedException, IOException, SolrServerException {
-    final String collectionName = "collectionPropTest";
+    String collectionName = getSaferTestName();
     final String propName = "testProperty";
 
     CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
@@ -700,7 +695,7 @@ private void checkCollectionProperty(String collection, String propertyName, Str
 
   @Test
   public void testColStatus() throws Exception {
-    final String collectionName = "collectionStatusTest";
+    String collectionName = getSaferTestName();
     CollectionAdminRequest.createCollection(collectionName, "conf2", 2, 2)
         .setPerReplicaState(SolrCloudTestCase.USE_PER_REPLICA_STATE)
         .process(cluster.getSolrClient());
@@ -831,7 +826,7 @@ public void testColStatusCollectionName() throws Exception {
 
   @Test
   public void testReadOnlyCollection() throws Exception {
-    final String collectionName = "readOnlyTest";
+    String collectionName = getSaferTestName();
     CloudSolrClient solrClient = cluster.getSolrClient();
 
     CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2).process(solrClient);

solr/core/src/test/org/apache/solr/cloud/ConcurrentCreateRoutedAliasTest.java

@@ -30,7 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@LuceneTestCase.Slow
 @LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12386")
 public class ConcurrentCreateRoutedAliasTest extends SolrTestCaseJ4 {
 

solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java

@@ -21,7 +21,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeoutException;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.cloud.ConnectionManager;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -35,7 +34,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-@Slow
 public class ConnectionManagerTest extends SolrTestCaseJ4 {
 
   static final int TIMEOUT = 3000;

solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java

@@ -111,7 +111,8 @@ public void multipleShardMigrateTest() throws Exception {
 
     final String splitKey = "a";
     final int BIT_SEP = 1;
-    final int[] splitKeyCount = new int[1];
+    int splitKeyCount = 0;
+    ;
     for (int id = 0; id < 26 * 3; id++) {
       String shardKey =
           "" + (char) ('a' + (id % 26)); // See comment in ShardRoutingTest for hash distribution
@@ -123,9 +124,9 @@ public void multipleShardMigrateTest() throws Exception {
       doc.addField("id", key + "!" + id);
       doc.addField("n_ti", id);
       cluster.getSolrClient().add("sourceCollection", doc);
-      if (splitKey.equals(shardKey)) splitKeyCount[0]++;
+      if (splitKey.equals(shardKey)) splitKeyCount++;
     }
-    assertTrue(splitKeyCount[0] > 0);
+    assertTrue(splitKeyCount > 0);
 
     String targetCollection = "migrate_multipleshardtest_targetCollection";
     CollectionAdminRequest.createCollection(targetCollection, "conf", 1, 1)
@@ -152,11 +153,11 @@ public void multipleShardMigrateTest() throws Exception {
       long finishTime = System.nanoTime();
 
       indexer.join();
-      splitKeyCount[0] += indexer.getSplitKeyCount();
+      splitKeyCount += indexer.getSplitKeyCount();
 
       try {
         cluster.getSolrClient().deleteById("a/" + BIT_SEP + "!104");
-        splitKeyCount[0]--;
+        splitKeyCount--;
       } catch (Exception e) {
         log.warn("Error deleting document a/{}!104", BIT_SEP, e);
       }
@@ -168,7 +169,7 @@ public void multipleShardMigrateTest() throws Exception {
       log.info("Response from target collection: {}", response);
       assertEquals(
           "DocCount on target collection does not match",
-          splitKeyCount[0],
+          splitKeyCount,
           response.getResults().getNumFound());
 
       waitForState(

solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java

@@ -22,7 +22,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -38,7 +37,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 public class MissingSegmentRecoveryTest extends SolrCloudTestCase {
   final String collection = getClass().getSimpleName();