Skip to content

[FLINK-36334][tests] Enable Remove the Disable markers from the tests in the various TypeSerializerUpgradeTestBase subclasses in flink-table-api-scala module #28549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SteveStevenpoor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLINK-36334][tests] Enable Remove the Disable markers from the tests in the various TypeSerializerUpgradeTestBase subclasses in flink-table-api-scala module #28549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ...e-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot
View file
Open in desktop
Binary file not shown.
0 ...ble-serializer-mutable-list-2.0/test-data → ...able-serializer-list-buffer-2.0/test-data
View file
Open in desktop
File renamed without changes.
Binary file added ...e-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot
View file
Open in desktop
Binary file not shown.
0 ...ble-serializer-mutable-list-2.1/test-data → ...able-serializer-list-buffer-2.1/test-data
View file
Open in desktop
File renamed without changes.
Binary file added ...e-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot
View file
Open in desktop
Binary file not shown.
0 ...ble-serializer-mutable-list-2.2/test-data → ...able-serializer-list-buffer-2.2/test-data
View file
Open in desktop
File renamed without changes.
Binary file removed ...-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot
View file
Open in desktop
Binary file not shown.
Binary file removed ...-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot
View file
Open in desktop
Binary file not shown.
Binary file removed ...-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot
View file
Open in desktop
Binary file not shown.
18 changes: 8 additions & 10 deletions ...rc/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import org.apache.flink.table.api.typeutils.TraversableSerializerUpgradeTest.Typ
import org.apache.flink.test.util.MigrationTest

import org.assertj.core.api.Condition
import org.junit.jupiter.api.Disabled

import java.util
import java.util.Objects
Expand All @@ -37,7 +36,6 @@ import java.util.function.Supplier
import scala.collection.{mutable, BitSet, LinearSeq}

/** A [[TypeSerializerUpgradeTestBase]] for [[TraversableSerializer]]. */
@Disabled("FLINK-36334")
class TraversableSerializerUpgradeTest
extends TypeSerializerUpgradeTestBase[TraversableOnce[_], TraversableOnce[_]] {

Expand Down Expand Up @@ -71,10 +69,10 @@ class TraversableSerializerUpgradeTest
classOf[MapSerializerVerifier]))
testSpecifications.add(
new TestSpecification[mutable.ListBuffer[Int], mutable.ListBuffer[Int]](
"traversable-serializer-mutable-list",
"traversable-serializer-list-buffer",
migrationVersion,
classOf[MutableListSerializerSetup],
classOf[MutableListSerializerVerifier]))
classOf[ListBufferSerializerSetup],
classOf[ListBufferSerializerVerifier]))
testSpecifications.add(
new TestSpecification[Seq[Int], Seq[Int]](
"traversable-serializer-seq",
Expand Down Expand Up @@ -130,7 +128,7 @@ object TraversableSerializerUpgradeTest {
val mapTypeInfo = implicitly[TypeInformation[Map[String, Int]]]
val setTypeInfo = implicitly[TypeInformation[Set[Int]]]
val bitsetTypeInfo = implicitly[TypeInformation[BitSet]]
val mutableListTypeInfo =
val listBufferTypeInfo =
implicitly[TypeInformation[mutable.ListBuffer[Int]]]
val seqTupleTypeInfo = implicitly[TypeInformation[Seq[(Int, String)]]]
val seqPojoTypeInfo = implicitly[TypeInformation[Seq[Pojo]]]
Expand Down Expand Up @@ -224,18 +222,18 @@ object TraversableSerializerUpgradeTest {
TypeSerializerConditions.isCompatibleAsIs[Map[String, Int]]()
}

final class MutableListSerializerSetup
final class ListBufferSerializerSetup
extends TypeSerializerUpgradeTestBase.PreUpgradeSetup[mutable.ListBuffer[Int]] {
override def createPriorSerializer: TypeSerializer[mutable.ListBuffer[Int]] =
new TypeSerializerSupplier(mutableListTypeInfo).get()
new TypeSerializerSupplier(listBufferTypeInfo).get()

override def createTestData: mutable.ListBuffer[Int] = mutable.ListBuffer(1, 2, 3)
}

final class MutableListSerializerVerifier
final class ListBufferSerializerVerifier
extends TypeSerializerUpgradeTestBase.UpgradeVerifier[mutable.ListBuffer[Int]] {
override def createUpgradedSerializer: TypeSerializer[mutable.ListBuffer[Int]] =
new TypeSerializerSupplier(mutableListTypeInfo).get()
new TypeSerializerSupplier(listBufferTypeInfo).get()

override def testDataCondition: Condition[mutable.ListBuffer[Int]] =
new Condition[mutable.ListBuffer[Int]](
Expand Down