Skip to content

Commit f87a79e

Browse files
committed
Fix integration tests
1 parent d1542ba commit f87a79e

File tree

6 files changed

+12
-0
lines changed

6 files changed

+12
-0
lines changed

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminCaseSensitivityIntegrationTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
5050
.addColumn(getColumnName2(), DataType.INT)
5151
.addColumn(getColumnName3(), DataType.TEXT)
5252
.addPartitionKey(getColumnName1())
53+
.addClusteringKey(getColumnName2())
5354
.addSecondaryIndex(getColumnName1())
5455
.build();
5556
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -64,6 +65,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
6465
.addColumn(getColumnName2(), DataType.INT)
6566
.addColumn(getColumnName3(), DataType.TEXT)
6667
.addPartitionKey(getColumnName4())
68+
.addClusteringKey(getColumnName2())
6769
.addSecondaryIndex(getColumnName4())
6870
.build();
6971
assertThat(admin.getTableMetadata(getNamespace1(), getTable4()))

core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminIntegrationTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
4949
.addColumn(getColumnName2(), DataType.INT)
5050
.addColumn(getColumnName3(), DataType.TEXT)
5151
.addPartitionKey(getColumnName1())
52+
.addClusteringKey(getColumnName2())
5253
.addSecondaryIndex(getColumnName1())
5354
.build();
5455
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -63,6 +64,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
6364
.addColumn(getColumnName2(), DataType.INT)
6465
.addColumn(getColumnName3(), DataType.TEXT)
6566
.addPartitionKey(getColumnName4())
67+
.addClusteringKey(getColumnName2())
6668
.addSecondaryIndex(getColumnName4())
6769
.build();
6870
assertThat(admin.getTableMetadata(getNamespace1(), getTable4()))

core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
5050
.addColumn("c2", DataType.INT)
5151
.addColumn("c3", DataType.TEXT)
5252
.addPartitionKey("c1")
53+
.addClusteringKey("c2")
5354
.addSecondaryIndex("c1")
5455
.build();
5556
admin.createTable(namespace1, TABLE4, currentTableMetadata, options);
@@ -64,6 +65,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
6465
.addColumn("c2", DataType.INT)
6566
.addColumn("c3", DataType.TEXT)
6667
.addPartitionKey("c4")
68+
.addClusteringKey("c2")
6769
.addSecondaryIndex("c4")
6870
.build();
6971
assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata);

core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
4545
.addColumn("c2", DataType.INT)
4646
.addColumn("c3", DataType.TEXT)
4747
.addPartitionKey("c1")
48+
.addClusteringKey("c2")
4849
.addSecondaryIndex("c1")
4950
.build();
5051
admin.createTable(namespace1, TABLE4, currentTableMetadata, options);
@@ -59,6 +60,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
5960
.addColumn("c2", DataType.INT)
6061
.addColumn("c3", DataType.TEXT)
6162
.addPartitionKey("c4")
63+
.addClusteringKey("c2")
6264
.addSecondaryIndex("c4")
6365
.build();
6466
assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata);

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,6 +1266,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
12661266
.addColumn(getColumnName2(), DataType.INT)
12671267
.addColumn(getColumnName3(), DataType.TEXT)
12681268
.addPartitionKey(getColumnName1())
1269+
.addClusteringKey(getColumnName2())
12691270
.addSecondaryIndex(getColumnName1())
12701271
.addSecondaryIndex(getColumnName3())
12711272
.build();
@@ -1282,6 +1283,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
12821283
.addColumn(getColumnName2(), DataType.INT)
12831284
.addColumn(getColumnName4(), DataType.TEXT)
12841285
.addPartitionKey(getColumnName5())
1286+
.addClusteringKey(getColumnName2())
12851287
.addSecondaryIndex(getColumnName4())
12861288
.addSecondaryIndex(getColumnName5())
12871289
.build();

integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminIntegrationTestBase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
11341134
.addColumn("c2", DataType.INT)
11351135
.addColumn("c3", DataType.TEXT)
11361136
.addPartitionKey("c1")
1137+
.addClusteringKey("c2")
11371138
.addSecondaryIndex("c3")
11381139
.build();
11391140
admin.createTable(namespace1, TABLE4, currentTableMetadata, options);
@@ -1148,6 +1149,7 @@ public void renameColumn_ForIndexKeyColumn_ShouldRenameColumnAndIndexCorrectly()
11481149
.addColumn("c2", DataType.INT)
11491150
.addColumn("c4", DataType.TEXT)
11501151
.addPartitionKey("c1")
1152+
.addClusteringKey("c2")
11511153
.addSecondaryIndex("c4")
11521154
.build();
11531155
assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata);

0 commit comments

Comments
 (0)