SOLR-16304 De-annotate some slow tests

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/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,7 +29,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 public class ClusterStateUpdateTest extends SolrCloudTestCase {
 
   @Override

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

@@ -42,8 +42,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@LuceneTestCase.Slow
-@SolrTestCaseJ4.SuppressSSL
 public class CollectionPropsTest extends SolrCloudTestCase {
   private static final int TIMEOUT = 5000;
   private String collectionName;

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/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();
 

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

@@ -17,14 +17,12 @@
 package org.apache.solr.cloud;
 
 import org.apache.lucene.tests.util.LuceneTestCase.Nightly;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.junit.Test;
 
 /**
  * Implementation moved to AbstractRestartWhileUpdatingTestBase because it is used by HDFS contrib
  * module tests
  */
-@Slow
 @Nightly
 public class RestartWhileUpdatingTest extends AbstractRestartWhileUpdatingTestBase {
 

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

@@ -21,15 +21,16 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
 import org.apache.lucene.tests.util.LuceneTestCase.Slow;
+import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.embedded.JettyConfig;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.request.QueryRequest;
+import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.cloud.DocCollection;
 import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
@@ -38,6 +39,8 @@
 import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.util.SSLTestConfig;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 /**
@@ -49,7 +52,10 @@
 @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018
 public class SSLMigrationTest extends AbstractFullDistribZkTestBase {
 
+  private static final int NUM_REPLICAS = 2;
+
   @Test
+  @BaseDistributedSearchTestCase.ShardsFixed(num = NUM_REPLICAS)
   public void test() throws Exception {
     // Migrate from HTTP -> HTTPS -> HTTP
     assertReplicaInformation("http");
@@ -94,11 +100,11 @@ public void testMigrateSSL(SSLTestConfig sslConfig) throws Exception {
 
   private void assertReplicaInformation(String urlScheme) {
     List<Replica> replicas = getReplicas();
-    assertEquals("Wrong number of replicas found", 4, replicas.size());
+    assertEquals("Wrong number of replicas found", NUM_REPLICAS, replicas.size());
     for (Replica replica : replicas) {
-      assertTrue(
+      MatcherAssert.assertThat(
           "Replica didn't have the proper urlScheme in the ClusterState",
-          StringUtils.startsWith(replica.getStr(ZkStateReader.BASE_URL_PROP), urlScheme));
+          replica.getStr(ZkStateReader.BASE_URL_PROP), Matchers.startsWith(urlScheme));
     }
   }
 
@@ -115,12 +121,9 @@ private List<Replica> getReplicas() {
   private void setUrlScheme(String value) throws Exception {
     Map<String, String> m =
         Map.of(
-            "action",
-            CollectionAction.CLUSTERPROP.toString().toLowerCase(Locale.ROOT),
-            "name",
-            "urlScheme",
-            "val",
-            value);
+            "action", CollectionAction.CLUSTERPROP.toString().toLowerCase(Locale.ROOT),
+            "name", "urlScheme",
+            "val", value);
     SolrParams params = new MapSolrParams(m);
     QueryRequest request = new QueryRequest(params);
     request.setPath("/admin/collections");
@@ -131,7 +134,8 @@ private void setUrlScheme(String value) throws Exception {
     }
     // Create new SolrServer to configure new HttpClient w/ SSL config
     try (SolrClient client = getLBHttpSolrClient(urls.toArray(new String[] {}))) {
-      client.request(request);
+      QueryResponse response = request.process(client);
+      assertEquals(0, response.getStatus());
     }
   }
 }

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

@@ -38,7 +38,6 @@
 import org.slf4j.LoggerFactory;
 
 /** Test of the MiniSolrCloudCluster functionality with authentication enabled. */
-@LuceneTestCase.Slow
 public class TestAuthenticationFramework extends SolrCloudTestCase {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());

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

@@ -24,7 +24,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.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -40,12 +39,11 @@
 import org.junit.BeforeClass;
 
 /**
- * A very simple sanity check that Phrase Identification works across a cloud cluster using
+ * A very simple check that Phrase Identification works across a cloud cluster using
  * distributed term stat collection.
  *
  * @see org.apache.solr.handler.component.PhrasesIdentificationComponentTest
  */
-@Slow
 public class TestCloudPhrasesIdentificationComponent extends SolrCloudTestCase {
 
   private static final String DEBUG_LABEL = MethodHandles.lookup().lookupClass().getName();

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

@@ -28,7 +28,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrResponse;
@@ -50,7 +49,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 public class TestPullReplicaWithAuth extends SolrCloudTestCase {
 
   private static final String USER = "solr";

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

@@ -17,11 +17,9 @@
 package org.apache.solr.cloud;
 
 import org.apache.lucene.tests.util.LuceneTestCase.Nightly;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.junit.Test;
 
-@Slow
 @Nightly
 @SuppressSSL
 /*

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

@@ -29,7 +29,6 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.cloud.ClusterProperties;
 import org.apache.solr.common.cloud.SolrZkClient;
@@ -54,7 +53,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 @SolrTestCaseJ4.SuppressSSL
 public class ZkControllerTest extends SolrTestCaseJ4 {
 
@@ -206,7 +204,6 @@ public void testGetHostName() throws Exception {
     }
   }
 
-  @Slow
   @LogLevel(value = "org.apache.solr.cloud=DEBUG;org.apache.solr.cloud.overseer=DEBUG")
   public void testPublishAndWaitForDownStates() throws Exception {
 

solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionTooManyReplicasTest.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-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.cloud.SolrCloudTestCase;
@@ -31,7 +30,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-@Slow
 public class CollectionTooManyReplicasTest extends SolrCloudTestCase {
 
   @BeforeClass

solr/core/src/test/org/apache/solr/cloud/overseer/ZkCollectionPropsCachingTest.java

@@ -18,7 +18,6 @@
 package org.apache.solr.cloud.overseer;
 
 import java.io.IOException;
-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;
@@ -29,7 +28,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@LuceneTestCase.Slow
 @SolrTestCaseJ4.SuppressSSL
 public class ZkCollectionPropsCachingTest extends SolrCloudTestCase {
   //

solr/core/src/test/org/apache/solr/handler/TestHealthCheckHandlerLegacyMode.java

@@ -25,7 +25,6 @@
 import static org.apache.solr.handler.ReplicationTestHelper.rQuery;
 
 import java.io.IOException;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -40,7 +39,6 @@
 import org.junit.Test;
 
 /** Test for HealthCheckHandler in legacy mode */
-@Slow
 @SuppressSSL // Currently, unknown why SSL does not work with this test
 public class TestHealthCheckHandlerLegacyMode extends SolrTestCaseJ4 {
   HttpSolrClient leaderClientHealthCheck, followerClientHealthCheck;

solr/core/src/test/org/apache/solr/handler/component/MoreLikeThisComponentTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.solr.handler.component;
 
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -32,7 +31,6 @@
  *
  * @see MoreLikeThisComponent
  */
-@Slow
 public class MoreLikeThisComponentTest extends SolrTestCaseJ4 {
 
   @BeforeClass

solr/core/src/test/org/apache/solr/search/TestSolrCachePerf.java

@@ -35,7 +35,6 @@
 import org.junit.runners.model.MultipleFailureException;
 
 /** */
-@LuceneTestCase.Slow
 public class TestSolrCachePerf extends SolrTestCaseJ4 {
 
   @SuppressWarnings({"unchecked", "rawtypes"})

solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java

@@ -19,7 +19,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.lucene.tests.util.LuceneTestCase.SuppressTempFileChecks;
 import org.apache.lucene.tests.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
@@ -41,7 +40,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 @SuppressTempFileChecks(
     bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?")
 public class SpellCheckCollatorTest extends SolrTestCaseJ4 {

solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsRecoveryZkTest.java

@@ -21,15 +21,13 @@
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.tests.util.LuceneTestCase.Nightly;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.lucene.tests.util.QuickPatchThreadsFilter;
 import org.apache.solr.SolrIgnoredThreadsFilter;
 import org.apache.solr.cloud.AbstractRecoveryZkTestBase;
 import org.apache.solr.hdfs.util.BadHdfsThreadsFilter;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-@Slow
 @Nightly
 @LuceneTestCase.AwaitsFix(bugUrl = "SOLR-15405")
 @ThreadLeakFilters(

solr/modules/hdfs/src/test/org/apache/solr/hdfs/cloud/HdfsWriteToMultipleCollectionsTest.java

@@ -30,7 +30,6 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.NRTCachingDirectory;
 import org.apache.lucene.tests.util.LuceneTestCase.Nightly;
-import org.apache.lucene.tests.util.LuceneTestCase.Slow;
 import org.apache.lucene.tests.util.QuickPatchThreadsFilter;
 import org.apache.lucene.util.IOUtils;
 import org.apache.solr.SolrIgnoredThreadsFilter;
@@ -53,7 +52,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-@Slow
 @Nightly
 @ThreadLeakFilters(
     defaultFilters = true,