This is an automated email from the ASF dual-hosted git repository.
aljoscha pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7143f225bd8f8c9b8a1ae826150840fc117baaa4
Author: klion26 <qcx978132...@gmail.com>
AuthorDate: Fri Jan 31 14:08:16 2020 +0800
[FLINK-13632] Port ScalaOptionSerializer test to
TypeSerializerUpgradeTestBase
---
...ScalaOptionSerializerSnapshotMigrationTest.java | 58 ------------
.../ScalaOptionSerializerUpgradeTest.java | 104 +++++++++++++++++++++
.../flink-1.6-scala-option-serializer-data | Bin 31 -> 0 bytes
.../flink-1.6-scala-option-serializer-snapshot | Bin 876 -> 0 bytes
.../flink-1.7-scala-option-serializer-data | Bin 31 -> 0 bytes
.../flink-1.7-scala-option-serializer-snapshot | Bin 877 -> 0 bytes
6 files changed, 104 insertions(+), 58 deletions(-)
diff --git
a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerSnapshotMigrationTest.java
b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerSnapshotMigrationTest.java
deleted file mode 100644
index efc94ec..0000000
---
a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerSnapshotMigrationTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.api.scala.typeutils;
-
-import
org.apache.flink.api.common.typeutils.TypeSerializerSnapshotMigrationTestBase;
-import org.apache.flink.api.common.typeutils.base.StringSerializer;
-import org.apache.flink.testutils.migration.MigrationVersion;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Collection;
-
-import scala.Option;
-
-/**
- * Migration test for the {@link ScalaEitherSerializerSnapshot}.
- */
-@RunWith(Parameterized.class)
-public class ScalaOptionSerializerSnapshotMigrationTest extends
TypeSerializerSnapshotMigrationTestBase<Option<String>> {
-
- private static final String SPEC_NAME = "scala-option-serializer";
-
- public
ScalaOptionSerializerSnapshotMigrationTest(TestSpecification<Option<String>>
testSpecification) {
- super(testSpecification);
- }
-
- @SuppressWarnings("unchecked")
- @Parameterized.Parameters(name = "Test Specification = {0}")
- public static Collection<TestSpecification<?>> testSpecifications() {
-
- final TestSpecifications testSpecifications = new
TestSpecifications(MigrationVersion.v1_6, MigrationVersion.v1_7);
-
- testSpecifications.add(
- SPEC_NAME,
- OptionSerializer.class,
- ScalaOptionSerializerSnapshot.class,
- () -> new
OptionSerializer<>(StringSerializer.INSTANCE));
-
- return testSpecifications.get();
- }
-}
diff --git
a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerUpgradeTest.java
b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerUpgradeTest.java
new file mode 100644
index 0000000..7752918
--- /dev/null
+++
b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaOptionSerializerUpgradeTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.api.scala.typeutils;
+
+import org.apache.flink.api.common.typeutils.TypeSerializer;
+import org.apache.flink.api.common.typeutils.TypeSerializerMatchers;
+import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility;
+import org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase;
+import org.apache.flink.api.common.typeutils.base.StringSerializer;
+import org.apache.flink.testutils.migration.MigrationVersion;
+
+import org.hamcrest.Matcher;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import scala.Option;
+
+import static org.hamcrest.CoreMatchers.is;
+
+/**
+ * A {@link
org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase} for {@link
ScalaEitherSerializerSnapshot}.
+ */
+@RunWith(Parameterized.class)
+public class ScalaOptionSerializerUpgradeTest extends
TypeSerializerUpgradeTestBase<Option<String>, Option<String>> {
+
+ private static final String SPEC_NAME = "scala-option-serializer";
+
+ public
ScalaOptionSerializerUpgradeTest(TestSpecification<Option<String>,
Option<String>> testSpecification) {
+ super(testSpecification);
+ }
+
+ @Parameterized.Parameters(name = "Test Specification = {0}")
+ public static Collection<TestSpecification<?, ?>> testSpecifications()
throws Exception {
+
+ ArrayList<TestSpecification<?, ?>> testSpecifications = new
ArrayList<>();
+ for (MigrationVersion migrationVersion : MIGRATION_VERSIONS) {
+ testSpecifications.add(
+ new TestSpecification<>(
+ SPEC_NAME,
+ migrationVersion,
+ ScalaOptionSerializerSetup.class,
+ ScalaOptionSerializerVerifier.class));
+ }
+ return testSpecifications;
+ }
+
+ //
----------------------------------------------------------------------------------------------
+ // Specification for "scala-option-serializer"
+ //
----------------------------------------------------------------------------------------------
+ /**
+ * This class is only public to work with {@link
org.apache.flink.api.common.typeutils.ClassRelocator}.
+ */
+ public static final class ScalaOptionSerializerSetup implements
TypeSerializerUpgradeTestBase.PreUpgradeSetup<Option<String>> {
+
+ @Override
+ public TypeSerializer<Option<String>> createPriorSerializer() {
+ return new
OptionSerializer<>(StringSerializer.INSTANCE);
+ }
+
+ @Override
+ public Option<String> createTestData() {
+ return Option.empty();
+ }
+ }
+
+ /**
+ * This class is only public to work with {@link
org.apache.flink.api.common.typeutils.ClassRelocator}.
+ */
+ public static final class ScalaOptionSerializerVerifier implements
TypeSerializerUpgradeTestBase.UpgradeVerifier<Option<String>> {
+ @Override
+ public TypeSerializer<Option<String>>
createUpgradedSerializer() {
+ return new
OptionSerializer<>(StringSerializer.INSTANCE);
+ }
+
+ @Override
+ public Matcher<Option<String>> testDataMatcher() {
+ return is(Option.empty());
+ }
+
+ @Override
+ public
Matcher<TypeSerializerSchemaCompatibility<Option<String>>>
schemaCompatibilityMatcher(MigrationVersion version) {
+ return TypeSerializerMatchers.isCompatibleAsIs();
+ }
+ }
+}
diff --git
a/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-data
b/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-data
deleted file mode 100644
index 3cdb252..0000000
Binary files
a/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-data and
/dev/null differ
diff --git
a/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-snapshot
b/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-snapshot
deleted file mode 100644
index d7be0c2..0000000
Binary files
a/flink-scala/src/test/resources/flink-1.6-scala-option-serializer-snapshot and
/dev/null differ
diff --git
a/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-data
b/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-data
deleted file mode 100644
index 3cdb252..0000000
Binary files
a/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-data and
/dev/null differ
diff --git
a/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-snapshot
b/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-snapshot
deleted file mode 100644
index bdedf0e..0000000
Binary files
a/flink-scala/src/test/resources/flink-1.7-scala-option-serializer-snapshot and
/dev/null differ
