Skip to content

Commit 56ff720

Browse files
googledrewgoogledrew
committed
Fix unit tests: change test name, revert SQL changes, launchtemplate settings
1 parent aa063e9 commit 56ff720

1 file changed

Lines changed: 37 additions & 43 deletions

File tree

‎v2/googlecloud-to-googlecloud/src/test/java/com/google/cloud/teleport/v2/templates/spannerchangestreamstobigquery/SpannerChangeStreamsToBigQueryIT.java‎

Lines changed: 37 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public void testSpannerChangeStreamsToBigQueryBasic() throws IOException {
102102
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
103103
String createTableStatement =
104104
String.format(
105-
"CREATE TABLE %s ("
106-
+ " Id INT64 NOT NULL,"
107-
+ " FirstName String(1024),"
108-
+ " LastName String(1024),"
105+
"CREATE TABLE %s (\n"
106+
+ " Id INT64 NOT NULL,\n"
107+
+ " FirstName String(1024),\n"
108+
+ " LastName String(1024),\n"
109109
+ ") PRIMARY KEY(Id)",
110110
spannerTable);
111111

@@ -136,7 +136,7 @@ public void testSpannerChangeStreamsToBigQueryBasic() throws IOException {
136136
launchInfo =
137137
launchTemplate(
138138
paramsAdder.apply(
139-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
139+
LaunchConfig.builder(testName, specPath)
140140
.addParameter("spannerProjectId", PROJECT)
141141
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
142142
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -146,8 +146,7 @@ public void testSpannerChangeStreamsToBigQueryBasic() throws IOException {
146146
.addParameter("spannerChangeStreamName", testName + "_stream")
147147
.addParameter("bigQueryDataset", bigQueryResourceManager.getDatasetId())
148148
.addParameter("rpcPriority", "HIGH")
149-
.addParameter("dlqRetryMinutes", "3")
150-
.addParameter("usePublicIps", "false")));
149+
.addParameter("dlqRetryMinutes", "3")));
151150

152151
assertThatPipeline(launchInfo).isRunning();
153152

@@ -176,10 +175,10 @@ public void testSpannerChangeStreamsToBigQueryBasicWriteApiExactlyOnce() throws
176175
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
177176
String createTableStatement =
178177
String.format(
179-
"CREATE TABLE %s ("
180-
+ " Id INT64 NOT NULL,"
181-
+ " FirstName String(1024),"
182-
+ " LastName String(1024),"
178+
"CREATE TABLE %s (\n"
179+
+ " Id INT64 NOT NULL,\n"
180+
+ " FirstName String(1024),\n"
181+
+ " LastName String(1024),\n"
183182
+ ") PRIMARY KEY(Id)",
184183
spannerTable);
185184

@@ -210,7 +209,7 @@ public void testSpannerChangeStreamsToBigQueryBasicWriteApiExactlyOnce() throws
210209
launchInfo =
211210
launchTemplate(
212211
paramsAdder.apply(
213-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
212+
LaunchConfig.builder(testName, specPath)
214213
.addParameter("spannerProjectId", PROJECT)
215214
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
216215
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -224,8 +223,7 @@ public void testSpannerChangeStreamsToBigQueryBasicWriteApiExactlyOnce() throws
224223
.addParameter("useStorageWriteApiAtLeastOnce", "false")
225224
.addParameter("numStorageWriteApiStreams", "1")
226225
.addParameter("storageWriteApiTriggeringFrequencySec", "10")
227-
.addParameter("dlqRetryMinutes", "3")
228-
.addParameter("usePublicIps", "false")));
226+
.addParameter("dlqRetryMinutes", "3")));
229227

230228
assertThatPipeline(launchInfo).isRunning();
231229

@@ -254,10 +252,10 @@ public void testSpannerChangeStreamsToBigQueryFloatColumns() throws IOException
254252
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
255253
String createTableStatement =
256254
String.format(
257-
"CREATE TABLE %s ("
258-
+ " Id INT64 NOT NULL,"
259-
+ " Float32Col FLOAT32,"
260-
+ " Float64Col FLOAT64,"
255+
"CREATE TABLE %s (\n"
256+
+ " Id INT64 NOT NULL,\n"
257+
+ " Float32Col FLOAT32,\n"
258+
+ " Float64Col FLOAT64,\n"
261259
+ ") PRIMARY KEY(Id)",
262260
spannerTable);
263261

@@ -275,7 +273,7 @@ public void testSpannerChangeStreamsToBigQueryFloatColumns() throws IOException
275273
launchInfo =
276274
launchTemplate(
277275
paramsAdder.apply(
278-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
276+
LaunchConfig.builder(testName, specPath)
279277
.addParameter("spannerProjectId", PROJECT)
280278
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
281279
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -285,8 +283,7 @@ public void testSpannerChangeStreamsToBigQueryFloatColumns() throws IOException
285283
.addParameter("spannerChangeStreamName", testName + "_stream")
286284
.addParameter("bigQueryDataset", bigQueryResourceManager.getDatasetId())
287285
.addParameter("rpcPriority", "HIGH")
288-
.addParameter("dlqRetryMinutes", "3")
289-
.addParameter("usePublicIps", "false")));
286+
.addParameter("dlqRetryMinutes", "3")));
290287

291288
assertThatPipeline(launchInfo).isRunning();
292289

@@ -322,10 +319,10 @@ public void testSpannerChangeStreamsToBigQueryAddTable() throws Exception {
322319
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
323320
String createTableStatement =
324321
String.format(
325-
"CREATE TABLE %s ("
326-
+ " Id INT64 NOT NULL,"
327-
+ " FirstName String(1024),"
328-
+ " LastName String(1024),"
322+
"CREATE TABLE %s (\n"
323+
+ " Id INT64 NOT NULL,\n"
324+
+ " FirstName String(1024),\n"
325+
+ " LastName String(1024),\n"
329326
+ ") PRIMARY KEY(Id)",
330327
spannerTable);
331328
String cdcTable = spannerTable + "_changelog";
@@ -343,7 +340,7 @@ public void testSpannerChangeStreamsToBigQueryAddTable() throws Exception {
343340
launchInfo =
344341
launchTemplate(
345342
paramsAdder.apply(
346-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
343+
LaunchConfig.builder(testName, specPath)
347344
.addParameter("spannerProjectId", PROJECT)
348345
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
349346
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -353,8 +350,7 @@ public void testSpannerChangeStreamsToBigQueryAddTable() throws Exception {
353350
.addParameter("spannerChangeStreamName", testName + "_stream")
354351
.addParameter("bigQueryDataset", bigQueryResourceManager.getDatasetId())
355352
.addParameter("rpcPriority", "HIGH")
356-
.addParameter("dlqRetryMinutes", "3")
357-
.addParameter("usePublicIps", "false")));
353+
.addParameter("dlqRetryMinutes", "3")));
358354

359355
assertThatPipeline(launchInfo).isRunning();
360356

@@ -381,10 +377,10 @@ public void testSpannerChangeStreamsToBigQueryAddTable() throws Exception {
381377
String cdcTable2 = spannerTable2 + "_changelog";
382378
String createTableStatement2 =
383379
String.format(
384-
"CREATE TABLE %s ("
385-
+ " Id INT64 NOT NULL,"
386-
+ " FirstName String(1024),"
387-
+ " LastName String(1024),"
380+
"CREATE TABLE %s (\n"
381+
+ " Id INT64 NOT NULL,\n"
382+
+ " FirstName String(1024),\n"
383+
+ " LastName String(1024),\n"
388384
+ ") PRIMARY KEY(Id)",
389385
spannerTable2);
390386
spannerResourceManager.executeDdlStatement(createTableStatement2);
@@ -416,10 +412,10 @@ public void testSpannerChangeStreamsToBigQueryAddColumn() throws Exception {
416412
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
417413
String createTableStatement =
418414
String.format(
419-
"CREATE TABLE %s ("
420-
+ " Id INT64 NOT NULL,"
421-
+ " FirstName String(1024),"
422-
+ " LastName String(1024),"
415+
"CREATE TABLE %s (\n"
416+
+ " Id INT64 NOT NULL,\n"
417+
+ " FirstName String(1024),\n"
418+
+ " LastName String(1024),\n"
423419
+ ") PRIMARY KEY(Id)",
424420
spannerTable);
425421
String cdcTable = spannerTable + "_changelog";
@@ -449,7 +445,7 @@ public void testSpannerChangeStreamsToBigQueryAddColumn() throws Exception {
449445
launchInfo =
450446
launchTemplate(
451447
paramsAdder.apply(
452-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
448+
LaunchConfig.builder(testName, specPath)
453449
.addParameter("spannerProjectId", PROJECT)
454450
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
455451
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -459,8 +455,7 @@ public void testSpannerChangeStreamsToBigQueryAddColumn() throws Exception {
459455
.addParameter("spannerChangeStreamName", testName + "_stream")
460456
.addParameter("bigQueryDataset", bigQueryResourceManager.getDatasetId())
461457
.addParameter("rpcPriority", "HIGH")
462-
.addParameter("dlqRetryMinutes", "3")
463-
.addParameter("usePublicIps", "false")));
458+
.addParameter("dlqRetryMinutes", "3")));
464459

465460
assertThatPipeline(launchInfo).isRunning();
466461

@@ -581,7 +576,7 @@ public void addEmptyColumn(String newColumnName, String tableId) {
581576
}
582577

583578
@Test
584-
public void testSpannerChangeStreamsToBigQuery_GoogleSQL_UUIDs() throws IOException {
579+
public void testSpannerChangeStreamsToBigQueryGoogleSqlUuid() throws IOException {
585580
String spannerTable = testName + RandomStringUtils.randomAlphanumeric(1, 5);
586581
String createTableStatement =
587582
String.format(
@@ -604,7 +599,7 @@ public void testSpannerChangeStreamsToBigQuery_GoogleSQL_UUIDs() throws IOExcept
604599
launchInfo =
605600
launchTemplate(
606601
paramsAdder.apply(
607-
LaunchConfig.builder(testName.replace('_', '-'), specPath)
602+
LaunchConfig.builder(testName, specPath)
608603
.addParameter("spannerProjectId", PROJECT)
609604
.addParameter("spannerInstanceId", spannerResourceManager.getInstanceId())
610605
.addParameter("spannerDatabase", spannerResourceManager.getDatabaseId())
@@ -614,8 +609,7 @@ public void testSpannerChangeStreamsToBigQuery_GoogleSQL_UUIDs() throws IOExcept
614609
.addParameter("spannerChangeStreamName", testName + "_stream")
615610
.addParameter("bigQueryDataset", bigQueryResourceManager.getDatasetId())
616611
.addParameter("rpcPriority", "HIGH")
617-
.addParameter("dlqRetryMinutes", "3")
618-
.addParameter("usePublicIps", "false")));
612+
.addParameter("dlqRetryMinutes", "3")));
619613

620614
assertThatPipeline(launchInfo).isRunning();
621615

0 commit comments

Comments
 (0)