Fixes cassandra test drift

openzipkin · Dec 31, 2018 · cf61fdc · cf61fdc
1 parent 55aecc9
commit cf61fdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITEnsureSchema.java b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITEnsureSchema.java
@@ -34,17 +34,15 @@ abstract class ITEnsureSchema {
   }
 
   @Test public void installsTablesWhenMissing() {
-    session()
-      .execute(
-        "CREATE KEYSPACE "
-          + keyspace()
-          + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'};");
+    session().execute("CREATE KEYSPACE " + keyspace()
+      + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'};");
 
     Schema.ensureExists(keyspace(), session());
 
     KeyspaceMetadata metadata = session().getCluster().getMetadata().getKeyspace(keyspace());
     assertThat(metadata).isNotNull();
     assertThat(Schema.hasUpgrade1_defaultTtl(metadata)).isTrue();
+    assertThat(metadata.getTable("autocomplete_tags")).isNotNull();
   }
 
   @Test public void upgradesOldSchema() {

diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITEnsureSchema.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITEnsureSchema.java
@@ -43,7 +43,8 @@ abstract class ITEnsureSchema {
   }
 
   @Test public void installsIndexesWhenMissing() {
-    Schema.applyCqlFile(keyspace(), session(), "/zipkin2-schema.cql");
+    session().execute("CREATE KEYSPACE " + keyspace()
+      + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'};");
 
     Schema.ensureExists(keyspace(), true, session());