Fix text.

Author: claudevdm

sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py

@@ -36,8 +36,11 @@
 from apache_beam.testing.test_pipeline import TestPipeline
 from apache_beam.testing.util import assert_that
 from apache_beam.testing.util import equal_to
+from apache_beam.typehints.schemas import FixedBytes
+from apache_beam.typehints.schemas import FixedString
 from apache_beam.typehints.schemas import LogicalType
 from apache_beam.typehints.schemas import MillisInstant
+from apache_beam.typehints.schemas import VariableBytes
 from apache_beam.utils.timestamp import Timestamp
 
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
@@ -258,7 +261,7 @@ def test_xlang_jdbc_read_with_explicit_schema(self, database):
         JdbcTestRow(
             i,
             i + 0.1,
-            f'Test{i}',
+            f'Test{i}' + ' ' * (10 - len(f'Test{i}')),
             f'Test{i}',
             f'Test{i}'.encode(),
             f'Test{i}'.encode(),
@@ -289,10 +292,10 @@ def test_xlang_jdbc_read_with_explicit_schema(self, database):
         [
             ("renamed_id", int),
             ("renamed_float", float),
-            ("renamed_char", str),
+            ("renamed_char", FixedString(10)),
             ("renamed_varchar", str),
-            ("renamed_bytes", bytes),
-            ("renamed_varbytes", bytes),
+            ("renamed_bytes", FixedBytes(10)),
+            ("renamed_varbytes", VariableBytes(10)),
             ("renamed_timestamp", Timestamp),
             ("renamed_decimal", Decimal),
             ("renamed_date", datetime.date),
@@ -306,6 +309,7 @@ def test_xlang_jdbc_read_with_explicit_schema(self, database):
 
     expected_row = []
     for row in inserted_rows:
+      f_char = row.f_char + ' ' * (10 - len(row.f_char))
       if database != 'postgres':
         # padding expected results for binary fields
         f_bytes = row.f_bytes + b'\0' * (10 - len(row.f_bytes))
@@ -316,7 +320,7 @@ def test_xlang_jdbc_read_with_explicit_schema(self, database):
           CustomSchemaRow(
               row.f_id,
               row.f_float,
-              row.f_char + ' ' * (10 - len(row.f_char)),
+              f_char,
               row.f_varchar,
               f_bytes,
               row.f_bytes,
@@ -333,15 +337,8 @@ def custom_equals(expected, actual):
           expected.renamed_id == actual.renamed_id and
           expected.renamed_float == actual.renamed_float and
           expected.renamed_char == actual.renamed_char and
-          expected.renamed_varchar == actual.renamed_varchar and (
-              expected.renamed_bytes == actual.renamed_bytes or
-              # Handle potential padding differences in binary fields
-              expected.renamed_bytes.rstrip(b'\0') ==
-              actual.renamed_bytes.rstrip(b'\0')) and (
-                  expected.renamed_varbytes == actual.renamed_varbytes or
-                  # Handle potential padding differences in binary fields
-                  expected.renamed_varbytes.rstrip(b'\0') ==
-                  actual.renamed_varbytes.rstrip(b'\0')) and
+          expected.renamed_varchar == actual.renamed_varchar and
+          expected.renamed_bytes == actual.renamed_bytes and
           expected.renamed_timestamp == actual.renamed_timestamp and
           expected.renamed_decimal == actual.renamed_decimal and
           expected.renamed_date == actual.renamed_date and