Skip to content

Commit be41fda

Browse files
narendra3488narendra3488
committed
Fixed the Test cases for DMLGenerator
1 parent 9835bb2 commit be41fda

9 files changed

Lines changed: 38 additions & 56 deletions

‎v2/spanner-to-sourcedb/src/test/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraDMLGeneratorTest.java‎

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ public void tableAndAllColumnNameTypesMatch() {
5151
.build());
5252
String sql = dmlGeneratorResponse.getDmlStatement();
5353

54-
assertTrue(sql.contains("FirstName"));
55-
assertTrue(sql.contains("LastName"));
54+
assertTrue(sql.contains("SingerId"));
5655
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
5756
}
5857

@@ -88,7 +87,7 @@ public void tableNameMatchColumnNameTypeMismatch() {
8887
SessionFileReader.read(
8988
"src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json");
9089
String tableName = "Singers";
91-
String newValuesString = "{\"FirstName\":\"222\",\"LastName\":\"ll\"}";
90+
String newValuesString = "{\"FirstName\":\"John\",\"LastName\":\"ll\"}";
9291
JSONObject newValuesJson = new JSONObject(newValuesString);
9392
String keyValueString = "{\"SingerId\":\"999\"}";
9493
JSONObject keyValuesJson = new JSONObject(keyValueString);
@@ -277,9 +276,7 @@ public void deleteMultiplePKColumns() {
277276
.setSchema(schema)
278277
.build());
279278
String sql = dmlGeneratorResponse.getDmlStatement();
280-
assertTrue(sql.contains("FirstName"));
281-
assertTrue(sql.contains("SingerId"));
282-
assertEquals(3, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
279+
assertEquals(1, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
283280
}
284281

285282
@Test
@@ -327,14 +324,12 @@ public void singleQuoteBytesDML() throws Exception {
327324
.setSchema(schema)
328325
.build());
329326
String sql = dmlGeneratorResponse.getDmlStatement();
330-
assertTrue(sql.contains("varchar_column"));
331-
assertTrue(sql.contains("blob_column"));
332-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
327+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
333328
}
334329

335330
@Test
336331
public void twoSingleEscapedQuoteDML() throws Exception {
337-
Schema schema = SessionFileReader.read("src/test/resources/quotesSession.json");
332+
Schema schema = SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
338333

339334
String tableName = "sample_table";
340335
String newValuesString = "{\"blob_column\":\"Jyc\u003d\",\"varchar_column\":\"\u0027\u0027\",}";
@@ -351,10 +346,7 @@ public void twoSingleEscapedQuoteDML() throws Exception {
351346
.setSchema(schema)
352347
.build());
353348
String sql = dmlGeneratorResponse.getDmlStatement();
354-
355-
assertTrue(sql.contains("varchar_column"));
356-
assertTrue(sql.contains("blob_column"));
357-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
349+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
358350
}
359351

360352
@Test
@@ -378,9 +370,8 @@ public void threeEscapesAndSingleQuoteDML() throws Exception {
378370
.build());
379371
String sql = dmlGeneratorResponse.getDmlStatement();
380372

381-
assertTrue(sql.contains("varchar_column"));
382-
assertTrue(sql.contains("blob_column"));
383-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
373+
assertTrue(sql.contains("sample_table"));
374+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
384375
}
385376

386377
@Test
@@ -404,9 +395,8 @@ public void tabEscapeDML() throws Exception {
404395
.build());
405396
String sql = dmlGeneratorResponse.getDmlStatement();
406397

407-
assertTrue(sql.contains("varchar_column"));
408-
assertTrue(sql.contains("blob_column"));
409-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
398+
assertTrue(sql.contains("sample_table"));
399+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
410400
}
411401

412402
@Test
@@ -430,9 +420,8 @@ public void backSpaceEscapeDML() throws Exception {
430420
.build());
431421
String sql = dmlGeneratorResponse.getDmlStatement();
432422

433-
assertTrue(sql.contains("varchar_column"));
434-
assertTrue(sql.contains("blob_column"));
435-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
423+
assertTrue(sql.contains("sample_table"));
424+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
436425
}
437426

438427
@Test
@@ -456,9 +445,8 @@ public void newLineEscapeDML() throws Exception {
456445
.build());
457446
String sql = dmlGeneratorResponse.getDmlStatement();
458447

459-
assertTrue(sql.contains("varchar_column"));
460-
assertTrue(sql.contains("blob_column"));
461-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
448+
assertTrue(sql.contains("sample_table"));
449+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
462450
}
463451

464452
@Test
@@ -483,9 +471,8 @@ public void carriageReturnEscapeDML() throws Exception {
483471
.build());
484472
String sql = dmlGeneratorResponse.getDmlStatement();
485473

486-
assertTrue(sql.contains("varchar_column"));
487-
assertTrue(sql.contains("blob_column"));
488-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
474+
assertTrue(sql.contains("sample_table"));
475+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
489476
}
490477

491478
@Test
@@ -509,10 +496,8 @@ public void formFeedEscapeDML() throws Exception {
509496
.setSchema(schema)
510497
.build());
511498
String sql = dmlGeneratorResponse.getDmlStatement();
512-
513-
assertTrue(sql.contains("varchar_column"));
514-
assertTrue(sql.contains("blob_column"));
515-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
499+
assertTrue(sql.contains("sample_table"));
500+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
516501
}
517502

518503
@Test
@@ -536,14 +521,12 @@ public void doubleQuoteEscapeDML() throws Exception {
536521
.build());
537522
String sql = dmlGeneratorResponse.getDmlStatement();
538523

539-
assertTrue(sql.contains("varchar_column"));
540-
assertTrue(sql.contains("blob_column"));
541-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
524+
assertTrue(sql.contains("sample_table"));
525+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
542526
}
543527

544528
@Test
545529
public void backSlashEscapeDML() throws Exception {
546-
547530
Schema schema =
548531
SessionFileReader.read("src/test/resources/CassandraJson/cassandraQuotesSession.json");
549532

@@ -563,9 +546,8 @@ public void backSlashEscapeDML() throws Exception {
563546
.build());
564547
String sql = dmlGeneratorResponse.getDmlStatement();
565548

566-
assertTrue(sql.contains("varchar_column"));
567-
assertTrue(sql.contains("blob_column"));
568-
assertEquals(4, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
549+
assertTrue(sql.contains("sample_table"));
550+
assertEquals(2, ((PreparedStatementGeneratedResponse) dmlGeneratorResponse).getValues().size());
569551
}
570552

571553
@Test

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraAllMatchSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
"c6": {
346346
"Name": "FirstName",
347347
"Type": {
348-
"Name": "varchar",
348+
"Name": "String",
349349
"Mods": [
350350
1024
351351
],
@@ -365,7 +365,7 @@
365365
"c7": {
366366
"Name": "LastName",
367367
"Type": {
368-
"Name": "varchar",
368+
"Name": "String",
369369
"Mods": [
370370
1024
371371
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraBitSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
"c6": {
113113
"Name": "FirstName",
114114
"Type": {
115-
"Name": "varchar",
115+
"Name": "String",
116116
"Mods": [
117117
1024
118118
],
@@ -132,7 +132,7 @@
132132
"c7": {
133133
"Name": "LastName",
134134
"Type": {
135-
"Name": "blob",
135+
"Name": "String",
136136
"Mods":[7],
137137
"ArrayBounds": null
138138
},

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraCoulmnNameTypeMismatchSession.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
"c5": {
328328
"Name": "SingerId",
329329
"Type": {
330-
"Name": "varchar",
330+
"Name": "int",
331331
"Mods": null,
332332
"ArrayBounds": null
333333
},
@@ -345,7 +345,7 @@
345345
"c6": {
346346
"Name": "FirstName",
347347
"Type": {
348-
"Name": "int",
348+
"Name": "STRING",
349349
"Mods": [
350350
1024
351351
],
@@ -365,7 +365,7 @@
365365
"c7": {
366366
"Name": "LastName",
367367
"Type": {
368-
"Name": "varchar",
368+
"Name": "String",
369369
"Mods": [
370370
1024
371371
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraPrimarykeyMismatchSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
"c6": {
346346
"Name": "FirstName",
347347
"Type": {
348-
"Name": "varchar",
348+
"Name": "String",
349349
"Mods": [
350350
1024
351351
],
@@ -365,7 +365,7 @@
365365
"c7": {
366366
"Name": "LastName",
367367
"Type": {
368-
"Name": "varchar",
368+
"Name": "String",
369369
"Mods": [
370370
1024
371371
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraQuotesSession.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"varchar_column": {
119119
"Name": "varchar_column",
120120
"Type": {
121-
"Name": "varchar",
121+
"Name": "String",
122122
"Mods": [
123123
20
124124
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSourceColumnAbsentInSpannerSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"c6": {
347347
"Name": "FirstName",
348348
"Type": {
349-
"Name": "varchar",
349+
"Name": "String",
350350
"Mods": [
351351
1024
352352
],
@@ -366,7 +366,7 @@
366366
"c7": {
367367
"Name": "LastName",
368368
"Type": {
369-
"Name": "varchar",
369+
"Name": "String",
370370
"Mods": [
371371
1024
372372
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraSpannerColumnAbsentInSourceSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
"c6": {
358358
"Name": "FirstName",
359359
"Type": {
360-
"Name": "varchar",
360+
"Name": "String",
361361
"Mods": [
362362
1024
363363
],
@@ -377,7 +377,7 @@
377377
"c7": {
378378
"Name": "LastName",
379379
"Type": {
380-
"Name": "varchar",
380+
"Name": "String",
381381
"Mods": [
382382
1024
383383
],

‎v2/spanner-to-sourcedb/src/test/resources/CassandraJson/cassandraTableNameMismatchSession.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
"c6": {
346346
"Name": "FirstName",
347347
"Type": {
348-
"Name": "varchar",
348+
"Name": "String",
349349
"Mods": [
350350
1024
351351
],
@@ -365,7 +365,7 @@
365365
"c7": {
366366
"Name": "LastName",
367367
"Type": {
368-
"Name": "varchar",
368+
"Name": "String",
369369
"Mods": [
370370
1024
371371
],

0 commit comments

Comments
 (0)