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 9d7d2bd68fd0e1febfd8ce204a9a0e0b790f1578 Author: klion26 <[email protected]> AuthorDate: Thu Feb 13 00:46:21 2020 +0800 [FLINK-13632] Port ScalaTrySerializer upgrade test to TypeSerializerUpgradeTestBase --- .../ScalaTrySerializerSnapshotMigrationTest.java | 59 ---------- .../typeutils/ScalaTrySerializerUpgradeTest.java | 129 +++++++++++++++++++++ .../resources/flink-1.6-scala-try-serializer-data | Bin 1658 -> 0 bytes .../flink-1.6-scala-try-serializer-snapshot | Bin 7054 -> 0 bytes .../resources/flink-1.7-scala-try-serializer-data | Bin 1658 -> 0 bytes .../flink-1.7-scala-try-serializer-snapshot | Bin 8932 -> 0 bytes 6 files changed, 129 insertions(+), 59 deletions(-) diff --git a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerSnapshotMigrationTest.java b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerSnapshotMigrationTest.java deleted file mode 100644 index 6fd66b1..0000000 --- a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerSnapshotMigrationTest.java +++ /dev/null @@ -1,59 +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.ExecutionConfig; -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.util.Try; - -/** - * Migration test for the {@link TrySerializer}. - */ -@RunWith(Parameterized.class) -public class ScalaTrySerializerSnapshotMigrationTest extends TypeSerializerSnapshotMigrationTestBase<Try<String>> { - - private static final String SPEC_NAME = "scala-try-serializer"; - - public ScalaTrySerializerSnapshotMigrationTest(TestSpecification<Try<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, - TrySerializer.class, - ScalaTrySerializerSnapshot.class, - () -> new TrySerializer<>(StringSerializer.INSTANCE, new ExecutionConfig())); - - return testSpecifications.get(); - } -} diff --git a/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerUpgradeTest.java b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerUpgradeTest.java new file mode 100644 index 0000000..c8607ee --- /dev/null +++ b/flink-scala/src/test/java/org/apache/flink/api/scala/typeutils/ScalaTrySerializerUpgradeTest.java @@ -0,0 +1,129 @@ +/* + * 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.ExecutionConfig; +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 java.util.Objects; + +import scala.util.Failure; +import scala.util.Try; + +import static org.hamcrest.Matchers.is; + +/** + * A {@link TypeSerializerUpgradeTestBase} for {@link TrySerializer}. + */ +@RunWith(Parameterized.class) +public class ScalaTrySerializerUpgradeTest extends TypeSerializerUpgradeTestBase<Try<String>, Try<String>> { + + private static final String SPEC_NAME = "scala-try-serializer"; + + public ScalaTrySerializerUpgradeTest(TestSpecification<Try<String>, Try<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, + ScalaTrySerializerSetup.class, + ScalaTrySerializerVerifier.class)); + } + return testSpecifications; + } + + // ---------------------------------------------------------------------------------------------- + // Specification for "scala-try-serializer" + // ---------------------------------------------------------------------------------------------- + /** + * This class is only public to work with {@link org.apache.flink.api.common.typeutils.ClassRelocator}. + */ + public static final class ScalaTrySerializerSetup implements TypeSerializerUpgradeTestBase.PreUpgradeSetup<Try<String>> { + @Override + public TypeSerializer<Try<String>> createPriorSerializer() { + return new TrySerializer<>(StringSerializer.INSTANCE, new ExecutionConfig()); + } + + @SuppressWarnings("unchecked") + @Override + public Try<String> createTestData() { + return new Failure(new SpecifiedException("Specified exception for ScalaTry.")); + } + } + + /** + * This class is only public to work with {@link org.apache.flink.api.common.typeutils.ClassRelocator}. + */ + public static final class ScalaTrySerializerVerifier implements TypeSerializerUpgradeTestBase.UpgradeVerifier<Try<String>> { + @Override + public TypeSerializer<Try<String>> createUpgradedSerializer() { + return new TrySerializer<>(StringSerializer.INSTANCE, new ExecutionConfig()); + } + + @SuppressWarnings("unchecked") + @Override + public Matcher<Try<String>> testDataMatcher() { + return is(new Failure(new SpecifiedException("Specified exception for ScalaTry."))); + } + + @Override + public Matcher<TypeSerializerSchemaCompatibility<Try<String>>> schemaCompatibilityMatcher(MigrationVersion version) { + return TypeSerializerMatchers.isCompatibleAsIs(); + } + } + + /** + * A specified runtime exception override {@link #equals(Object)}. + */ + public static final class SpecifiedException extends RuntimeException { + public SpecifiedException(String message) { + super(message); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof SpecifiedException)) { + return false; + } + SpecifiedException other = (SpecifiedException) obj; + return Objects.equals(getMessage(), other.getMessage()); + } + } +} diff --git a/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-data b/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-data deleted file mode 100644 index b5739a2..0000000 Binary files a/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-data and /dev/null differ diff --git a/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-snapshot b/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-snapshot deleted file mode 100644 index 43cc75e..0000000 Binary files a/flink-scala/src/test/resources/flink-1.6-scala-try-serializer-snapshot and /dev/null differ diff --git a/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-data b/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-data deleted file mode 100644 index 585c1a5..0000000 Binary files a/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-data and /dev/null differ diff --git a/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-snapshot b/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-snapshot deleted file mode 100644 index 760da78..0000000 Binary files a/flink-scala/src/test/resources/flink-1.7-scala-try-serializer-snapshot and /dev/null differ
