Skip to content

Commit 1c34ca0

Browse files
committed
[FLINK-35306][test] Migrate flink-tests-java17 module to JUnit5 and assertj to solve jdk17 compile fails
1 parent be03be9 commit 1c34ca0

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

flink-tests-java17/src/test/java/org/apache/flink/api/java/typeutils/runtime/PojoRecordSerializerUpgradeTestSpecifications.java

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase;
2828
import org.apache.flink.api.java.typeutils.TypeExtractor;
2929

30-
import org.hamcrest.Matcher;
30+
import org.assertj.core.api.Condition;
3131

32-
import static org.hamcrest.Matchers.is;
33-
import static org.junit.Assert.assertSame;
32+
import static org.assertj.core.api.Assertions.assertThat;
3433

3534
/** A {@link TypeSerializerUpgradeTestBase} for the {@link PojoSerializer}. */
3635
class PojoRecordSerializerUpgradeTestSpecifications {
@@ -58,7 +57,7 @@ public TypeSerializer<PojoBeforeUpgrade> createPriorSerializer() {
5857
TypeSerializer<PojoBeforeUpgrade> serializer =
5958
TypeExtractor.createTypeInfo(PojoBeforeUpgrade.class)
6059
.createSerializer(new SerializerConfigImpl());
61-
assertSame(PojoSerializer.class, serializer.getClass());
60+
assertThat(serializer.getClass()).isSameAs(PojoSerializer.class);
6261
return serializer;
6362
}
6463

@@ -81,18 +80,19 @@ public TypeSerializer<PojoAfterUpgrade> createUpgradedSerializer() {
8180
TypeSerializer<PojoAfterUpgrade> serializer =
8281
TypeExtractor.createTypeInfo(PojoAfterUpgrade.class)
8382
.createSerializer(new SerializerConfigImpl());
84-
assertSame(PojoSerializer.class, serializer.getClass());
83+
assertThat(serializer.getClass()).isSameAs(PojoSerializer.class);
8584
return serializer;
8685
}
8786

8887
@Override
89-
public Matcher<PojoAfterUpgrade> testDataMatcher() {
90-
return is(new PojoAfterUpgrade(911108, "Gordon"));
88+
public Condition<PojoAfterUpgrade> testDataCondition() {
89+
return new Condition<>(
90+
new PojoAfterUpgrade(911108, "Gordon")::equals, "value is (911108, Gordon)");
9191
}
9292

9393
@Override
94-
public Matcher<TypeSerializerSchemaCompatibility<PojoAfterUpgrade>>
95-
schemaCompatibilityMatcher(FlinkVersion version) {
94+
public Condition<TypeSerializerSchemaCompatibility<PojoAfterUpgrade>>
95+
schemaCompatibilityCondition(FlinkVersion version) {
9696
return TypeSerializerConditions.isCompatibleAsIs();
9797
}
9898
}
@@ -110,7 +110,7 @@ public TypeSerializer<RecordBeforeMigration> createPriorSerializer() {
110110
TypeSerializer<RecordBeforeMigration> serializer =
111111
TypeExtractor.createTypeInfo(RecordBeforeMigration.class)
112112
.createSerializer(new SerializerConfigImpl());
113-
assertSame(PojoSerializer.class, serializer.getClass());
113+
assertThat(serializer.getClass()).isSameAs(PojoSerializer.class);
114114
return serializer;
115115
}
116116

@@ -133,18 +133,20 @@ public TypeSerializer<RecordAfterSchemaUpgrade> createUpgradedSerializer() {
133133
TypeSerializer<RecordAfterSchemaUpgrade> serializer =
134134
TypeExtractor.createTypeInfo(RecordAfterSchemaUpgrade.class)
135135
.createSerializer(new SerializerConfigImpl());
136-
assertSame(PojoSerializer.class, serializer.getClass());
136+
assertThat(serializer.getClass()).isSameAs(PojoSerializer.class);
137137
return serializer;
138138
}
139139

140140
@Override
141-
public Matcher<RecordAfterSchemaUpgrade> testDataMatcher() {
142-
return is(new RecordAfterSchemaUpgrade("Gordon", 0, null));
141+
public Condition<RecordAfterSchemaUpgrade> testDataCondition() {
142+
return new Condition<>(
143+
new RecordAfterSchemaUpgrade("Gordon", 0, null)::equals,
144+
"value is (Gordon, 0 ,null)");
143145
}
144146

145147
@Override
146-
public Matcher<TypeSerializerSchemaCompatibility<RecordAfterSchemaUpgrade>>
147-
schemaCompatibilityMatcher(FlinkVersion version) {
148+
public Condition<TypeSerializerSchemaCompatibility<RecordAfterSchemaUpgrade>>
149+
schemaCompatibilityCondition(FlinkVersion version) {
148150
return TypeSerializerConditions.isCompatibleAfterMigration();
149151
}
150152
}

0 commit comments

Comments
 (0)