Skip to content

AVRO-2943: Add new GenericData String/Utf8 ARRAY comparison test #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanSkraba merged 1 commit into from
Mar 13, 2023
Merged

AVRO-2943: Add new GenericData String/Utf8 ARRAY comparison test #2137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,8 @@ void testEquals() {
}

@Test
public void testMapKeyEquals() {
Schema mapSchema = new Schema.Parser().parse("{\"type\": \"map\", \"values\": \"string\"}");
Field myMapField = new Field("my_map", Schema.createMap(mapSchema), null, null);
public void testMapKeyEqualsStringAndUtf8Compatibility() {
Field myMapField = new Field("my_map", Schema.createMap(Schema.create(Schema.Type.STRING)), null, null);
Schema schema = Schema.createRecord("my_record", "doc", "mytest", false);
schema.setFields(Arrays.asList(myMapField));
GenericRecord r0 = new GenericData.Record(schema);
Expand All @@ -178,9 +177,8 @@ public void testMapKeyEquals() {
}

@Test
public void testMapValuesEquals() {
Schema mapSchema = new Schema.Parser().parse("{\"type\": \"map\", \"values\": \"string\"}");
Field myMapField = new Field("my_map", Schema.createMap(mapSchema), null, null);
public void testMapValuesEqualsStringAndUtf8Compatibility() {
Field myMapField = new Field("my_map", Schema.createMap(Schema.create(Schema.Type.STRING)), null, null);
Schema schema = Schema.createRecord("my_record", "doc", "mytest", false);
schema.setFields(Arrays.asList(myMapField));
GenericRecord r0 = new GenericData.Record(schema);
Expand All @@ -198,6 +196,24 @@ public void testMapValuesEquals() {
assertEquals(r1, r0);
}

@Test
public void testArrayValuesEqualsStringAndUtf8Compatibility() {
Field myArrayField = new Field("my_array", Schema.createArray(Schema.create(Schema.Type.STRING)), null, null);
Schema schema = Schema.createRecord("my_record", "doc", "mytest", false);
schema.setFields(Arrays.asList(myArrayField));
GenericRecord r0 = new GenericData.Record(schema);
GenericRecord r1 = new GenericData.Record(schema);

List<CharSequence> array1 = Arrays.asList("valueOne");
r0.put("my_array", array1);

List<CharSequence> array2 = Arrays.asList(new Utf8("valueOne"));
r1.put("my_array", array2);

assertEquals(r0, r1);
assertEquals(r1, r0);
}

private Schema recordSchema() {
List<Field> fields = new ArrayList<>();
fields.add(new Field("anArray", Schema.createArray(Schema.create(Type.STRING)), null, null));
Expand Down