You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2019/02/21 08:53:42 UTC
[flink] 07/11: [FLINK-11334] Fix matcher in
TypeSerializerSnapshotMigrationTestBase
This is an automated email from the ASF dual-hosted git repository.
aljoscha pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 5095853a50424be5cfe5f2253e07c6e32dcf0ff0
Author: Aljoscha Krettek <al...@gmail.com>
AuthorDate: Wed Feb 20 15:20:35 2019 +0100
[FLINK-11334] Fix matcher in TypeSerializerSnapshotMigrationTestBase
---
.../common/typeutils/TypeSerializerSnapshotMigrationTestBase.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java
index 0548d2f..55cf402 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java
@@ -443,7 +443,7 @@ public abstract class TypeSerializerSnapshotMigrationTestBase<ElementT> extends
// Utilities
// --------------------------------------------------------------------------------------------------------------
- private <T> Matcher<TypeSerializerSchemaCompatibility<T>> hasSameCompatibilityType(TypeSerializerSchemaCompatibility<T> expectedCompatibilty) {
+ private static <T> Matcher<TypeSerializerSchemaCompatibility<T>> hasSameCompatibilityType(TypeSerializerSchemaCompatibility<T> expectedCompatibilty) {
return new TypeSafeMatcher<TypeSerializerSchemaCompatibility<T>>() {
@Override
@@ -451,9 +451,9 @@ public abstract class TypeSerializerSnapshotMigrationTestBase<ElementT> extends
if (expectedCompatibilty.isCompatibleAsIs()) {
return testResultCompatibility.isCompatibleAsIs();
} else if (expectedCompatibilty.isIncompatible()) {
- return testResultCompatibility.isCompatibleAfterMigration();
- } else if (expectedCompatibilty.isIncompatible()) {
return testResultCompatibility.isIncompatible();
+ } else if (expectedCompatibilty.isCompatibleAfterMigration()) {
+ return testResultCompatibility.isCompatibleAfterMigration();
} else if (expectedCompatibilty.isCompatibleWithReconfiguredSerializer()) {
return testResultCompatibility.isCompatibleWithReconfiguredSerializer();
}