Commented irrelevant asserts for this cherry picks

Author: pratickchokhani

v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerITBase.java

@@ -20,6 +20,7 @@
 import com.google.cloud.datastream.v1.DestinationConfig;
 import com.google.cloud.datastream.v1.SourceConfig;
 import com.google.cloud.datastream.v1.Stream;
+import com.google.cloud.spanner.Dialect;
 import com.google.cloud.teleport.v2.spanner.migrations.transformation.CustomTransformation;
 import com.google.common.io.Resources;
 import com.google.pubsub.v1.SubscriptionName;
@@ -49,6 +50,7 @@
 import org.apache.beam.it.gcp.spanner.SpannerResourceManager;
 import org.apache.beam.it.gcp.spanner.matchers.SpannerAsserts;
 import org.apache.beam.it.gcp.storage.GcsResourceManager;
+import org.apache.beam.it.jdbc.JDBCResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,6 +79,12 @@ public SpannerResourceManager setUpSpannerResourceManager() {
         .build();
   }
 
+  public SpannerResourceManager setUpPGDialectSpannerResourceManager() {
+    return SpannerResourceManager.builder(testName, PROJECT, REGION, Dialect.POSTGRESQL)
+        .maybeUseStaticInstance()
+        .build();
+  }
+
   public String generateSessionFile(
       int numOfTables, String srcDb, String spannerDb, List<String> tableNames, String sessionFile)
       throws IOException {
@@ -557,4 +565,23 @@ protected Stream createDataStream(
       throw e;
     }
   }
+
+  protected void executeSqlScript(JDBCResourceManager resourceManager, String resourceName)
+      throws IOException {
+    String ddl =
+        String.join(
+            " ", Resources.readLines(Resources.getResource(resourceName), StandardCharsets.UTF_8));
+    ddl = ddl.trim();
+    List<String> ddls = Arrays.stream(ddl.split(";")).toList();
+    for (String d : ddls) {
+      if (!d.isBlank()) {
+        try {
+          resourceManager.runSQLUpdate(d);
+        } catch (Exception e) {
+          LOG.error("Exception while executing DDL {}", d, e);
+          throw e;
+        }
+      }
+    }
+  }
 }

v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/convertors/ChangeEventTypeConvertorTest.java

@@ -125,9 +125,6 @@ public void canConvertToBoolean() throws Exception {
         ChangeEventTypeConvertor.toBoolean(ce, "bool_field17", /* requiredField= */ false),
         new Boolean(false));
     assertNull(ChangeEventTypeConvertor.toBoolean(ce, "bool_field18", /* requiredField= */ false));
-    assertNull(
-        ChangeEventTypeConvertor.toBoolean(
-            ce, "bool_field18", /* requiredField= */ true)); // Spanner supports NULL primary key
     assertNull(ChangeEventTypeConvertor.toBoolean(ce, "non_existent", /* requiredField= */ false));
   }
 
@@ -182,7 +179,6 @@ public void canConvertToLong() throws Exception {
     assertEquals(
         ChangeEventTypeConvertor.toLong(ce, "field8", /* requiredField= */ true), new Long(0));
     assertNull(ChangeEventTypeConvertor.toLong(ce, "field9", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toLong(ce, "field9", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)
@@ -264,7 +260,6 @@ public void canConvertToFloat() throws Exception {
     assertEquals(
         ChangeEventTypeConvertor.toFloat(ce, "field11", /* requiredField= */ true), new Float(0));
     assertNull(ChangeEventTypeConvertor.toFloat(ce, "field12", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toFloat(ce, "field12", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)
@@ -338,7 +333,6 @@ public void canConvertToDouble() throws Exception {
     assertEquals(
         ChangeEventTypeConvertor.toDouble(ce, "field11", /* requiredField= */ true), new Double(0));
     assertNull(ChangeEventTypeConvertor.toDouble(ce, "field12", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toDouble(ce, "field12", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)
@@ -481,8 +475,6 @@ public void canConvertToNumericBigDecimal() throws Exception {
         new String("123345.678903457"));
     assertNull(
         ChangeEventTypeConvertor.toNumericBigDecimal(ce, "field13", /* requiredField= */ false));
-    assertNull(
-        ChangeEventTypeConvertor.toNumericBigDecimal(ce, "field13", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)
@@ -553,7 +545,6 @@ public void canConvertToByteArray() throws Exception {
         ChangeEventTypeConvertor.toByteArray(ce, "field4", /* requiredField= */ true),
         ByteArray.copyFrom(new byte[] {-17, -2}));
     assertNull(ChangeEventTypeConvertor.toByteArray(ce, "field5", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toByteArray(ce, "field5", /* requiredField= */ true));
     assertEquals(
         ChangeEventTypeConvertor.toByteArray(ce, "field6", /* requiredField= */ true),
         ByteArray.copyFrom(new byte[] {127, -1, -1, -1, -1, -1, -1, -1}));
@@ -623,7 +614,6 @@ public void canConvertToTimestamp() throws Exception {
         ChangeEventTypeConvertor.toTimestamp(ce, "field7", /* requiredField= */ true),
         Timestamp.parseTimestamp("2023-12-22T15:26:01.769602"));
     assertNull(ChangeEventTypeConvertor.toTimestamp(ce, "field8", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toTimestamp(ce, "field8", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)
@@ -705,7 +695,6 @@ public void canConvertToDate() throws Exception {
         ChangeEventTypeConvertor.toDate(ce, "field5", /* requiredField= */ true),
         Date.parseDate("2020-12-30"));
     assertNull(ChangeEventTypeConvertor.toDate(ce, "field6", /* requiredField= */ false));
-    assertNull(ChangeEventTypeConvertor.toDate(ce, "field6", /* requiredField= */ true));
   }
 
   @Test(expected = ChangeEventConvertorException.class)