[FLINK-11334] Fix matcher in TypeSerializerSnapshotMigrationTestBase

G356 · Feb 21, 2019 · 5095853 · 5095853
1 parent ba5c495
commit 5095853
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...t/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java b/...t/java/org/apache/flink/api/common/typeutils/TypeSerializerSnapshotMigrationTestBase.java
@@ -443,17 +443,17 @@ protected interface TestResourceFilenameSupplier {
 	// 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
 			protected boolean matchesSafely(TypeSerializerSchemaCompatibility<T> testResultCompatibility) {
 				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();
 				}