Ensure CassandraIndexTest sets up properly when using SAI in the wake of CASSANDRA-20732

patch by Caleb Rackliffe; reviewed by Stefan Miklosovic for CASSANDRA-20740

Author: maedhroz

test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java

@@ -24,7 +24,12 @@
 import java.util.stream.StreamSupport;
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.*;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.awaitility.Awaitility;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.apache.cassandra.Util;
@@ -42,9 +47,9 @@
 import org.apache.cassandra.schema.ColumnMetadata;
 import org.apache.cassandra.schema.SchemaConstants;
 import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
-import org.awaitility.Awaitility;
 
 import static org.apache.cassandra.Util.throwAssert;
 import static org.junit.Assert.assertArrayEquals;
@@ -58,6 +63,12 @@
  */
 public class CassandraIndexTest extends CQLTester
 {
+    @BeforeClass
+    public static void setup()
+    {
+        StorageService.instance.initServer(); // Ensure the node has advanced out of STARTING mode
+    }
+
     @Test
     public void indexOnRegularColumn() throws Throwable
     {

test/unit/org/apache/cassandra/index/sai/cql/EmptyStringLifecycleTest.java

@@ -23,14 +23,14 @@
 
 import org.apache.cassandra.cql3.UntypedResultSet;
 import org.apache.cassandra.index.sai.SAITester;
+import org.apache.cassandra.service.StorageService;
 
 public class EmptyStringLifecycleTest extends SAITester
 {
     @BeforeClass
     public static void setup()
     {
-        setUpClass();
-        requireNetwork(); // Ensure the node has advanced out of STARTING mode
+        StorageService.instance.initServer(); // Ensure the node has advanced out of STARTING mode
     }
 
     @Test

test/unit/org/apache/cassandra/index/sai/functional/FailureTest.java

@@ -20,6 +20,7 @@
  */
 package org.apache.cassandra.index.sai.functional;
 
+import org.assertj.core.api.Assertions;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -31,7 +32,7 @@
 import org.apache.cassandra.index.sai.utils.IndexTermType;
 import org.apache.cassandra.inject.Injection;
 import org.apache.cassandra.inject.Injections;
-import org.assertj.core.api.Assertions;
+import org.apache.cassandra.service.StorageService;
 
 import static org.junit.Assert.assertEquals;
 
@@ -40,8 +41,7 @@ public class FailureTest extends SAITester
     @BeforeClass
     public static void setup()
     {
-        setUpClass();
-        requireNetwork(); // Ensure the node has advanced out of STARTING mode
+        StorageService.instance.initServer(); // Ensure the node has advanced out of STARTING mode
     }
 
     @Test

test/unit/org/apache/cassandra/index/sai/virtual/IndexesSystemViewTest.java

@@ -29,6 +29,7 @@
 import org.apache.cassandra.inject.Injections;
 import org.apache.cassandra.inject.InvokePointBuilder;
 import org.apache.cassandra.schema.SchemaConstants;
+import org.apache.cassandra.service.StorageService;
 
 /**
  * Tests the virtual table exposing storage-attached column index metadata.
@@ -59,8 +60,7 @@ public static void setup()
     {
         VirtualKeyspaceRegistry.instance.register(new VirtualKeyspace(SchemaConstants.VIRTUAL_VIEWS, ImmutableList.of(new ColumnIndexesSystemView(SchemaConstants.VIRTUAL_VIEWS))));
 
-        setUpClass();
-        requireNetwork(); // Ensure the node has advanced out of STARTING mode
+        StorageService.instance.initServer(); // Ensure the node has advanced out of STARTING mode
     }
 
     @Test