Skip to content

Commit b74973f

Browse files
JooHyukKimJooHyukKim
committed
Revert /interop test changes
This reverts commit 017201d.
1 parent 5985608 commit b74973f

File tree

7 files changed

+122
-512
lines changed

7 files changed

+122
-512
lines changed

‎avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroAliasTest.java‎

Lines changed: 18 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package com.fasterxml.jackson.dataformat.avro.interop.annotations;
22

33
import java.io.IOException;
4-
import java.lang.reflect.Type;
54

65
import org.apache.avro.Schema;
76
import org.apache.avro.SchemaCompatibility;
87
import org.apache.avro.reflect.AvroAlias;
98
import org.apache.avro.reflect.Nullable;
10-
import org.junit.jupiter.params.ParameterizedTest;
11-
import org.junit.jupiter.params.provider.MethodSource;
9+
import org.junit.Test;
10+
1211
import com.fasterxml.jackson.dataformat.avro.AvroTestBase;
1312
import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
14-
import com.fasterxml.jackson.dataformat.avro.testsupport.BiFunction;
15-
import com.fasterxml.jackson.dataformat.avro.testsupport.Function;
1613

1714
import static org.assertj.core.api.Assertions.assertThat;
1815

@@ -61,45 +58,30 @@ public enum NewestSize {
6158
LARGE;
6259
}
6360

64-
@MethodSource("getParameters")
65-
@ParameterizedTest(name = "{3}")
66-
public void testAliasedRecordForwardsCompatible(
67-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
68-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
69-
throws IOException
70-
{
61+
@Test
62+
public void testAliasedRecordForwardsCompatible() throws IOException {
7163
Schema oldSchema = schemaFunctor.apply(AvroTestBase.Employee.class);
7264
Schema newSchema = schemaFunctor.apply(NewEmployee.class);
7365
//
7466
SchemaCompatibility.SchemaPairCompatibility compatibility =
75-
SchemaCompatibility.checkReaderWriterCompatibility(newSchema, oldSchema);
67+
SchemaCompatibility.checkReaderWriterCompatibility(newSchema, oldSchema);
7668
//
7769
checkSchemaIsCompatible(compatibility);
7870
}
7971

80-
@MethodSource("getParameters")
81-
@ParameterizedTest(name = "{3}")
82-
public void testAliasedRecordBackwardsCompatible(
83-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
84-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
85-
throws IOException
86-
{
72+
@Test
73+
public void testAliasedRecordBackwardsCompatible() throws IOException {
8774
Schema oldSchema = schemaFunctor.apply(AvroTestBase.Employee.class);
8875
Schema newSchema = schemaFunctor.apply(NewEmployee.class);
8976
//
9077
SchemaCompatibility.SchemaPairCompatibility compatibility =
91-
SchemaCompatibility.checkReaderWriterCompatibility(oldSchema, newSchema);
78+
SchemaCompatibility.checkReaderWriterCompatibility(oldSchema, newSchema);
9279
//
9380
assertThat(compatibility.getType()).isEqualTo(SchemaCompatibility.SchemaCompatibilityType.INCOMPATIBLE);
9481
}
9582

96-
@MethodSource("getParameters")
97-
@ParameterizedTest(name = "{3}")
98-
public void testAliasedRecordForwardsCompatibleSameNamespace(
99-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
100-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
101-
throws IOException
102-
{
83+
@Test
84+
public void testAliasedRecordForwardsCompatibleSameNamespace() throws IOException {
10385
Schema oldSchema = schemaFunctor.apply(NewEmployee.class);
10486
Schema newSchema = schemaFunctor.apply(AliasedNameEmployee.class);
10587
//
@@ -109,13 +91,8 @@ public void testAliasedRecordForwardsCompatibleSameNamespace(
10991
checkSchemaIsCompatible(compatibility);
11092
}
11193

112-
@MethodSource("getParameters")
113-
@ParameterizedTest(name = "{3}")
114-
public void testAliasedRecordBackwardsCompatibleSameNamespace(
115-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
116-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
117-
throws IOException
118-
{
94+
@Test
95+
public void testAliasedRecordBackwardsCompatibleSameNamespace() throws IOException {
11996
Schema oldSchema = schemaFunctor.apply(NewEmployee.class);
12097
Schema newSchema = schemaFunctor.apply(AliasedNameEmployee.class);
12198
//
@@ -125,13 +102,8 @@ public void testAliasedRecordBackwardsCompatibleSameNamespace(
125102
assertThat(compatibility.getType()).isEqualTo(SchemaCompatibility.SchemaCompatibilityType.INCOMPATIBLE);
126103
}
127104

128-
@MethodSource("getParameters")
129-
@ParameterizedTest(name = "{3}")
130-
public void testAliasedEnumForwardsCompatible(
131-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
132-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
133-
throws IOException
134-
{
105+
@Test
106+
public void testAliasedEnumForwardsCompatible() throws IOException {
135107
Schema oldSchema = schemaFunctor.apply(AvroTestBase.Size.class);
136108
Schema newSchema = schemaFunctor.apply(NewSize.class);
137109
//
@@ -141,13 +113,8 @@ public void testAliasedEnumForwardsCompatible(
141113
checkSchemaIsCompatible(compatibility);
142114
}
143115

144-
@MethodSource("getParameters")
145-
@ParameterizedTest(name = "{3}")
146-
public void testAliasedEnumBackwardsCompatible(
147-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
148-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
149-
throws IOException
150-
{
116+
@Test
117+
public void testAliasedEnumBackwardsCompatible() throws IOException {
151118
Schema oldSchema = schemaFunctor.apply(AvroTestBase.Size.class);
152119
Schema newSchema = schemaFunctor.apply(NewSize.class);
153120
//
@@ -157,13 +124,8 @@ public void testAliasedEnumBackwardsCompatible(
157124
assertThat(compatibility.getType()).isEqualTo(SchemaCompatibility.SchemaCompatibilityType.INCOMPATIBLE);
158125
}
159126

160-
@MethodSource("getParameters")
161-
@ParameterizedTest(name = "{3}")
162-
public void testAliasedEnumForwardsAndBackwardsCompatible(
163-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
164-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
165-
throws IOException
166-
{
127+
@Test
128+
public void testAliasedEnumForwardsAndBackwardsCompatible() throws IOException {
167129
Schema oldSchema = schemaFunctor.apply(NewerSize.class);
168130
Schema newSchema = schemaFunctor.apply(NewestSize.class);
169131
//

‎avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroEncodeTest.java‎

Lines changed: 25 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package com.fasterxml.jackson.dataformat.avro.interop.annotations;
22

33
import java.io.IOException;
4-
import java.lang.reflect.Type;
54
import java.nio.ByteBuffer;
65
import java.util.*;
76

8-
import org.apache.avro.Schema;
97
import org.apache.avro.SchemaBuilder;
108
import org.apache.avro.io.Decoder;
119
import org.apache.avro.io.Encoder;
12-
import org.apache.avro.reflect.*;
13-
import org.junit.jupiter.api.BeforeEach;
14-
import org.junit.jupiter.api.Test;
15-
import org.junit.jupiter.params.ParameterizedTest;
16-
import org.junit.jupiter.params.provider.MethodSource;
10+
import org.apache.avro.reflect.AvroEncode;
11+
import org.apache.avro.reflect.CustomEncoding;
12+
import org.apache.avro.reflect.Nullable;
13+
import org.apache.avro.reflect.ReflectData;
14+
import org.junit.Before;
15+
import org.junit.Test;
1716

1817
import com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil;
1918
import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
20-
import com.fasterxml.jackson.dataformat.avro.testsupport.BiFunction;
21-
import com.fasterxml.jackson.dataformat.avro.testsupport.Function;
2219

2320
import static org.assertj.core.api.Assertions.assertThat;
2421

@@ -143,7 +140,7 @@ public UUID read(Object datum, Decoder decoder) throws IOException {
143140
protected Wrapper wrapper;
144141
protected Wrapper result;
145142

146-
@BeforeEach
143+
@Before
147144
public void setup() throws IOException {
148145
wrapper = new Wrapper();
149146
//
@@ -168,109 +165,47 @@ public void setup() throws IOException {
168165
cc.stringValue = "Nested Hello World!";
169166
cc.uuidValue = UUID.randomUUID();
170167
wrapper.component.nestedRecordValue = cc;
168+
//
169+
result = roundTrip(wrapper);
171170
}
172171

173-
@MethodSource("getParameters")
174-
@ParameterizedTest(name = "{3}")
175-
public void testByteValue(
176-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
177-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
178-
throws IOException
179-
{
180-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
181-
182-
result = roundTrip(wrapper);
172+
@Test
173+
public void testByteValue() {
183174
assertThat(result.component.byteValue).isEqualTo(wrapper.component.byteValue);
184175
}
185176

186-
@MethodSource("getParameters")
187-
@ParameterizedTest(name = "{3}")
188-
public void testShortValue(
189-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
190-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
191-
throws IOException
192-
{
193-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
194-
result = roundTrip(wrapper);
195-
177+
@Test
178+
public void testShortValue() {
196179
assertThat(result.component.shortValue).isEqualTo(wrapper.component.shortValue);
197180
}
198181

199-
@MethodSource("getParameters")
200-
@ParameterizedTest(name = "{3}")
201-
public void testStringValue(
202-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
203-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
204-
throws IOException
205-
{
206-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
207-
result = roundTrip(wrapper);
208-
182+
@Test
183+
public void testStringValue() {
209184
assertThat(result.component.stringValue).isEqualTo(wrapper.component.stringValue);
210185
}
211186

212-
@MethodSource("getParameters")
213-
@ParameterizedTest(name = "{3}")
214-
public void testDoubleValue(
215-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
216-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
217-
throws IOException
218-
{
219-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
220-
result = roundTrip(wrapper);
221-
187+
@Test
188+
public void testDoubleValue() {
222189
assertThat(result.component.doubleValue).isEqualTo(wrapper.component.doubleValue);
223190
}
224191

225-
@MethodSource("getParameters")
226-
@ParameterizedTest(name = "{3}")
227-
public void testLongValue(
228-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
229-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
230-
throws IOException
231-
{
232-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
233-
result = roundTrip(wrapper);
234-
192+
@Test
193+
public void testLongValue() {
235194
assertThat(result.component.longValue).isEqualTo(wrapper.component.longValue);
236195
}
237196

238-
@MethodSource("getParameters")
239-
@ParameterizedTest(name = "{3}")
240-
public void testIntegerValue(
241-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
242-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
243-
throws IOException
244-
{
245-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
246-
result = roundTrip(wrapper);
247-
197+
@Test
198+
public void testIntegerValue() {
248199
assertThat(result.component.intValue).isEqualTo(wrapper.component.intValue);
249200
}
250201

251-
@MethodSource("getParameters")
252-
@ParameterizedTest(name = "{3}")
253-
public void testNestedUuidValue(
254-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
255-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
256-
throws IOException
257-
{
258-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
259-
result = roundTrip(wrapper);
260-
202+
@Test
203+
public void testNestedUuidValue() {
261204
assertThat(result.component.nestedRecordValue.uuidValue).isEqualTo(wrapper.component.nestedRecordValue.uuidValue);
262205
}
263206

264-
@MethodSource("getParameters")
265-
@ParameterizedTest(name = "{3}")
266-
public void testUuidValue(
267-
Function<Type, Schema> schemaFunctor, BiFunction<Schema, Object, byte[]> serializeFunctor,
268-
BiFunction<Schema, byte[], Object> deserializeFunctor, String combinationName)
269-
throws IOException
270-
{
271-
useParameters(schemaFunctor, serializeFunctor, deserializeFunctor);
272-
result = roundTrip(wrapper);
273-
207+
@Test
208+
public void testUuidValue() {
274209
assertThat(result.component.uuidValue).isEqualTo(wrapper.component.uuidValue);
275210
}
276211
}

0 commit comments

Comments
 (0)