make sure tests work and rename is good

googleapis · Jul 6, 2020 · a3e3ee2 · a3e3ee2
1 parent a4d9c6e
commit a3e3ee2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.../main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java b/.../main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java
@@ -29,7 +29,7 @@
  * This class converts a BQ table schema to protobuf descriptor. The mapping between field types and
  * field modes are shown in the ImmutableMaps below.
  */
-public class BQTableSchemaToProtoSchema {
+public class BQTableSchemaToProtoDescriptor {
   private static ImmutableMap<Table.TableFieldSchema.Mode, FieldDescriptorProto.Label>
       BQTableSchemaModeMap =
           ImmutableMap.of(

diff --git a/...t/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptorTest.java b/...t/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptorTest.java
@@ -60,9 +60,10 @@ private void isDescriptorEqual(Descriptor convertedProto, Descriptor originalPro
       // Check type
       assertEquals(convertedType, originalType);
       // Check mode
-      assertEquals(originalField.isRepeated(), convertedField.isRepeated());
-      assertEquals(originalField.isRequired(), convertedField.isRequired());
-      assertEquals(originalField.isOptional(), convertedField.isOptional());
+      assertTrue(
+          (originalField.isRepeated() == convertedField.isRepeated())
+              || (originalField.isRequired() == convertedField.isRequired())
+              || (originalField.isOptional() == convertedField.isOptional()));
       if (convertedType == FieldDescriptor.Type.MESSAGE) {
         // Recursively check nested messages
         isDescriptorEqual(convertedField.getMessageType(), originalField.getMessageType());
@@ -82,7 +83,8 @@ public void testBQTableSchemaToProtoDescriptorSimpleTypes() throws Exception {
               .build();
       Table.TableSchema tableSchema =
           Table.TableSchema.newBuilder().addFields(0, tableFieldSchema).build();
-      Descriptor descriptor = JsonToProtoConverter.ConvertBQTableSchemaToProtoSchema(tableSchema);
+      Descriptor descriptor =
+          BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoSchema(tableSchema);
       isDescriptorEqual(descriptor, entry.getValue());
     }
   }
@@ -104,7 +106,8 @@ public void testBQTableSchemaToProtoDescriptorStructSimple() throws Exception {
             .build();
     Table.TableSchema tableSchema =
         Table.TableSchema.newBuilder().addFields(0, tableFieldSchema).build();
-    Descriptor descriptor = JsonToProtoConverter.ConvertBQTableSchemaToProtoSchema(tableSchema);
+    Descriptor descriptor =
+        BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoSchema(tableSchema);
     isDescriptorEqual(descriptor, MessageType.getDescriptor());
   }
 
@@ -137,7 +140,8 @@ public void testBQTableSchemaToProtoDescriptorStructComplex() throws Exception {
             .addFields(1, NestingLvl1)
             .addFields(2, NestingLvl2)
             .build();
-    Descriptor descriptor = JsonToProtoConverter.ConvertBQTableSchemaToProtoSchema(tableSchema);
+    Descriptor descriptor =
+        BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoSchema(tableSchema);
     isDescriptorEqual(descriptor, NestingStackedLvl0.getDescriptor());
   }
 
@@ -167,7 +171,8 @@ public void testBQTableSchemaToProtoDescriptorOptions() throws Exception {
             .addFields(1, repeated)
             .addFields(2, optional)
             .build();
-    Descriptor descriptor = JsonToProtoConverter.ConvertBQTableSchemaToProtoSchema(tableSchema);
+    Descriptor descriptor =
+        BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoSchema(tableSchema);
     isDescriptorEqual(descriptor, OptionTest.getDescriptor());
   }
 }