Fix test issues in CopyDbtest.

PiperOrigin-RevId: 338107901
tkyoo0627 · Oct 20, 2020 · 38eb32f · 38eb32f
1 parent 2794dc5
commit 38eb32f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java b/src/test/java/com/google/cloud/teleport/spanner/CopyDbTest.java
@@ -259,6 +259,7 @@ public void checkConstraints() throws Exception {
     runTest();
   }
 
+  @Test
   public void randomSchema() throws Exception {
     Ddl ddl = RandomDdlGenerator.builder().build().generate();
     createAndPopulate(ddl, 100);

diff --git a/src/test/java/com/google/cloud/teleport/spanner/SpannerServerResource.java b/src/test/java/com/google/cloud/teleport/spanner/SpannerServerResource.java
@@ -37,7 +37,7 @@
 /** Facilitates setup and deletion of a Spanner database for integration tests. */
 public class SpannerServerResource extends ExternalResource {
   // Modify the following parameters to match your Cloud Spanner instance.
-  private final String projectId = "test-project";
+  private final String projectId = "span-cloud-testing";
   private final String instanceId = "test-instance";
   private final String host = "https://spanner.googleapis.com";
 

diff --git a/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java b/src/test/java/com/google/cloud/teleport/spanner/ddl/RandomDdlGenerator.java
@@ -83,7 +83,7 @@ public static Builder builder() {
         .setRandom(new Random())
         .setArrayChance(20)
         .setMaxPkComponents(3)
-        .setMaxBranchPerLevel(new int[] {3, 2, 1, 1, 1, 1, 1})
+        .setMaxBranchPerLevel(new int[] {2, 2, 1, 1, 1, 1, 1})
         .setMaxIndex(2)
         .setMaxForeignKeys(2)
         // TODO: enable once CHECK constraints are enabled
@@ -186,7 +186,10 @@ private void generateTable(Ddl.Builder builder, Table parent, int level) {
       IndexColumn.IndexColumnsBuilder<Index.Builder> columns = index.columns();
       boolean interleaved = rnd.nextBoolean();
       Set<String> pks = Sets.newHashSet();
-      if (interleaved) {
+      // Do not interleave indexes at the last table level.
+      // This causes tests to fail as generated schema exceeds interleaving limit.
+      int finalLevel = getMaxBranchPerLevel().length - 1;
+      if (interleaved && level < finalLevel) {
         index.interleaveIn(table.name());
       }
       for (IndexColumn pk : table.primaryKeys()) {