From 110d335780d15787f535950abdf299a41f06b405 Mon Sep 17 00:00:00 2001 From: Fabian Hueske Date: Thu, 28 Apr 2016 22:51:49 +0200 Subject: [PATCH] [FLINK-3847] Restructure flink-table test packages. --- .../ExplainTest.java} | 8 +-- .../TableEnvironmentITCase.java | 4 +- .../test => batch}/TableSourceITCase.java | 7 +-- .../sql/SqlITCase.java} | 8 +-- .../table}/AggregationsITCase.java | 3 +- .../test => batch/table}/CastingITCase.java | 4 +- .../test => batch/table}/DistinctITCase.java | 2 +- .../table}/ExpressionsITCase.java | 4 +- .../test => batch/table}/FilterITCase.java | 4 +- .../table}/FromDataSetITCase.java | 4 +- .../table}/GroupedAggregationsITCase.java | 2 +- .../test => batch/table}/JoinITCase.java | 2 +- .../table}/PojoGroupingITCase.java | 2 +- .../test => batch/table}/SelectITCase.java | 4 +- .../table}/StringExpressionsITCase.java | 2 +- .../test => batch/table}/UnionITCase.java | 2 +- .../sql/SqlITCase.java} | 8 +-- .../test => stream}/utils/StreamTestData.java | 2 +- .../ExplainTest.scala} | 9 ++- .../TableEnvironmentITCase.scala | 8 +-- .../test => batch}/TableSourceITCase.scala | 27 ++++---- .../sql}/AggregationsITCase.scala | 8 +-- .../sql}/ExpressionsITCase.scala | 10 +-- .../test => batch/sql}/FilterITCase.scala | 8 +-- .../{sql/test => batch/sql}/JoinITCase.scala | 8 +-- .../test => batch/sql}/SelectITCase.scala | 8 +-- .../api/scala/batch/sql/SortITCase.scala | 63 +++++++++++++++++++ .../sql}/TableWithSQLITCase.scala | 8 +-- .../{sql/test => batch/sql}/UnionITCase.scala | 8 +-- .../table}/AggregationsITCase.scala | 11 ++-- .../test => batch/table}/CalcITCase.scala | 9 +-- .../test => batch/table}/CastingITCase.scala | 5 +- .../test => batch/table}/DistinctITCase.scala | 6 +- .../table}/ExpressionsITCase.scala | 11 ++-- .../test => batch/table}/FilterITCase.scala | 8 +-- .../table}/GroupedAggregationsITCase.scala | 5 +- .../test => batch/table}/JoinITCase.scala | 7 ++- .../test => batch/table}/SelectITCase.scala | 9 ++- .../test => batch/table}/SortITCase.scala | 53 ++-------------- .../table}/StringExpressionsITCase.scala | 4 +- .../test => batch/table}/ToTableITCase.scala | 9 ++- .../test => batch/table}/UnionITCase.scala | 9 +-- .../api/scala/batch/utils/SortTestUtils.scala | 49 +++++++++++++++ .../batch}/utils/TableProgramsTestBase.scala | 12 ++-- .../expression}/ScalarFunctionsTest.scala | 6 +- .../utils/ExpressionEvaluator.scala | 6 +- .../test => stream}/TableSourceITCase.scala | 4 +- .../sql/SqlITCase.scala} | 6 +- .../test => stream/table}/FilterITCase.scala | 14 ++--- .../test => stream/table}/SelectITCase.scala | 14 ++--- .../test => stream/table}/UnionITCase.scala | 16 +++-- .../table}/UnsupportedOpsTest.scala | 8 +-- .../test => stream}/utils/StreamITCase.scala | 2 +- .../utils/StreamTestData.scala | 2 +- .../typeutils/RowComparatorTest.scala | 6 +- .../typeutils/RowSerializerTest.scala | 0 56 files changed, 291 insertions(+), 237 deletions(-) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test/SqlExplainTest.java => batch/ExplainTest.java} (96%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch}/TableEnvironmentITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch}/TableSourceITCase.java (95%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{sql/test/BatchSQLITCase.java => batch/sql/SqlITCase.java} (95%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/AggregationsITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/CastingITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/DistinctITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/ExpressionsITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/FilterITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/FromDataSetITCase.java (99%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/GroupedAggregationsITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/JoinITCase.java (99%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/PojoGroupingITCase.java (98%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/SelectITCase.java (97%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/StringExpressionsITCase.java (99%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => batch/table}/UnionITCase.java (99%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{sql/test/StreamingSQLITCase.java => stream/sql/SqlITCase.java} (94%) rename flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/{table/test => stream}/utils/StreamTestData.java (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test/SqlExplainTest.scala => batch/ExplainTest.scala} (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch}/TableEnvironmentITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch}/TableSourceITCase.scala (88%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/AggregationsITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/ExpressionsITCase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/FilterITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/JoinITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/SelectITCase.scala (95%) create mode 100644 flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/TableWithSQLITCase.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/test => batch/sql}/UnionITCase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/AggregationsITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/CalcITCase.scala (93%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/CastingITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/DistinctITCase.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/ExpressionsITCase.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/FilterITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/GroupedAggregationsITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/JoinITCase.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/SelectITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/SortITCase.scala (67%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/StringExpressionsITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/ToTableITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/test => batch/table}/UnionITCase.scala (96%) create mode 100644 flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/{table/test => scala/batch}/utils/TableProgramsTestBase.scala (80%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/{table/test => scala/expression}/ScalarFunctionsTest.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/{table/test => scala/expression}/utils/ExpressionEvaluator.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream}/TableSourceITCase.scala (97%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{sql/streaming/test/StreamSQLITCase.scala => stream/sql/SqlITCase.scala} (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream/table}/FilterITCase.scala (94%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream/table}/SelectITCase.scala (95%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream/table}/UnionITCase.scala (92%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream/table}/UnsupportedOpsTest.scala (90%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream}/utils/StreamITCase.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/{table/streaming/test => stream}/utils/StreamTestData.scala (98%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/{table => scala}/typeutils/RowComparatorTest.scala (96%) rename flink-libraries/flink-table/src/test/scala/org/apache/flink/api/{table => scala}/typeutils/RowSerializerTest.scala (100%) diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java similarity index 96% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java index 9389a0c6d880d..29cc0d9a0c027 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SqlExplainTest.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/ExplainTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; @@ -32,13 +32,13 @@ import static org.junit.Assert.assertEquals; -public class SqlExplainTest extends MultipleProgramsTestBase { +public class ExplainTest extends MultipleProgramsTestBase { - public SqlExplainTest() { + public ExplainTest() { super(TestExecutionMode.CLUSTER); } - private static String testFilePath = SqlExplainTest.class.getResource("/").getFile(); + private static String testFilePath = ExplainTest.class.getResource("/").getFile(); @Test public void testFilterWithoutExtended() throws Exception { diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableEnvironmentITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableEnvironmentITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java index c596014c9e181..0a2cf57810497 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableEnvironmentITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableEnvironmentITCase.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.table.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.TableEnvironment; import org.apache.flink.api.table.TableException; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableSourceITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java similarity index 95% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableSourceITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java index 27129a33c6f85..ffe0dc19df7a3 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/TableSourceITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/TableSourceITCase.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.table.BatchTableEnvironment; -import org.apache.flink.api.scala.table.test.GeneratingInputFormat; +import org.apache.flink.api.scala.batch.GeneratingInputFormat; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.TableEnvironment; import org.apache.flink.api.table.sources.BatchTableSource; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.api.table.typeutils.RowTypeInfo; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,7 +36,6 @@ import java.util.List; - @RunWith(Parameterized.class) public class TableSourceITCase extends TableProgramsTestBase { diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/BatchSQLITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java similarity index 95% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/BatchSQLITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java index 31a5d53e4c24c..1cc4ff7b419d6 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/BatchSQLITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/sql/SqlITCase.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.apache.flink.api.java.sql.test; +package org.apache.flink.api.java.batch.sql; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.table.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,9 +35,9 @@ import java.util.List; @RunWith(Parameterized.class) -public class BatchSQLITCase extends TableProgramsTestBase { +public class SqlITCase extends TableProgramsTestBase { - public BatchSQLITCase(TestExecutionMode mode, TableConfigMode configMode) { + public SqlITCase(TestExecutionMode mode, TableConfigMode configMode) { super(mode, configMode); } diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java index 35edb09e2eefa..d4af08d1edecf 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/AggregationsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/AggregationsITCase.java @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; -import org.apache.flink.api.table.ExpressionParserException; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java index 2a17c126e8873..8336609957caf 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/CastingITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/CastingITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import java.util.List; import org.apache.flink.api.java.DataSet; @@ -28,10 +28,10 @@ import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.api.java.tuple.Tuple6; import org.apache.flink.api.java.tuple.Tuple8; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/DistinctITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/DistinctITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/DistinctITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/DistinctITCase.java index aca0c30ebb486..7f10433bd97af 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/DistinctITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/DistinctITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import java.util.List; import org.apache.flink.api.java.DataSet; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/ExpressionsITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/ExpressionsITCase.java index 4d6adfa7af111..02469045a3ba3 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/ExpressionsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/ExpressionsITCase.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.Row; import org.apache.flink.api.java.DataSet; @@ -28,7 +29,6 @@ import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.table.TableEnvironment; import org.apache.flink.api.table.codegen.CodeGenException; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import static org.junit.Assert.fail; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FilterITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FilterITCase.java index 30b5aab9235e8..284834781d006 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FilterITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FilterITCase.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.Row; import org.apache.flink.api.java.DataSet; @@ -25,7 +26,6 @@ import org.apache.flink.api.java.table.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FromDataSetITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FromDataSetITCase.java similarity index 99% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FromDataSetITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FromDataSetITCase.java index 64a40928c0da1..a3204f93d7b7e 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/FromDataSetITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/FromDataSetITCase.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.common.typeinfo.BasicTypeInfo; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple4; import org.apache.flink.api.java.typeutils.TupleTypeInfo; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.Row; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.table.BatchTableEnvironment; import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/GroupedAggregationsITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/GroupedAggregationsITCase.java index c57c514c0a7c0..70dd79317a0ad 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/GroupedAggregationsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/GroupedAggregationsITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.Row; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java similarity index 99% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java index 8348a4a91768a..4c40596985bfd 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/JoinITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/JoinITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/PojoGroupingITCase.java similarity index 98% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/PojoGroupingITCase.java index 1109e78a6c7ba..ba564bf5c8144 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/PojoGroupingITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/PojoGroupingITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import java.io.Serializable; import java.util.List; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/SelectITCase.java similarity index 97% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/SelectITCase.java index 5029808e91298..7c9478ac40516 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/SelectITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/SelectITCase.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.Row; import org.apache.flink.api.java.DataSet; @@ -25,7 +26,6 @@ import org.apache.flink.api.java.table.BatchTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.table.TableEnvironment; -import org.apache.flink.api.table.test.utils.TableProgramsTestBase; import org.apache.flink.test.javaApiOperators.util.CollectionDataSets; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/StringExpressionsITCase.java similarity index 99% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/StringExpressionsITCase.java index 32afc5dd2a019..e55bd227fce81 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/StringExpressionsITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/StringExpressionsITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.java.tuple.Tuple3; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/UnionITCase.java similarity index 99% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/UnionITCase.java index b69fec47b553b..a7805f8fd6e23 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/UnionITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/batch/table/UnionITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test; +package org.apache.flink.api.java.batch.table; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/StreamingSQLITCase.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java similarity index 94% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/StreamingSQLITCase.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java index 8e420f2014ed5..4161b1e431b34 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/sql/test/StreamingSQLITCase.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/sql/SqlITCase.java @@ -16,25 +16,25 @@ * limitations under the License. */ -package org.apache.flink.api.java.sql.test; +package org.apache.flink.api.java.stream.sql; import org.apache.flink.api.java.table.StreamTableEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; -import org.apache.flink.api.scala.table.streaming.test.utils.StreamITCase; +import org.apache.flink.api.scala.stream.utils.StreamITCase; import org.apache.flink.api.table.Row; import org.apache.flink.api.table.Table; import org.apache.flink.api.table.TableEnvironment; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase; -import org.apache.flink.api.java.table.test.utils.StreamTestData; +import org.apache.flink.api.java.stream.utils.StreamTestData; import org.junit.Test; import java.util.ArrayList; import java.util.List; -public class StreamingSQLITCase extends StreamingMultipleProgramsTestBase { +public class SqlITCase extends StreamingMultipleProgramsTestBase { @Test public void testSelect() throws Exception { diff --git a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/utils/StreamTestData.java b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java similarity index 97% rename from flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/utils/StreamTestData.java rename to flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java index dc3a8dc5f7464..82ebf95234ed6 100644 --- a/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/table/test/utils/StreamTestData.java +++ b/flink-libraries/flink-table/src/test/java/org/apache/flink/api/java/stream/utils/StreamTestData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.java.table.test.utils; +package org.apache.flink.api.java.stream.utils; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.api.java.tuple.Tuple5; diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala index 545721dd077c3..77bb4719e5e4c 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SqlExplainTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/ExplainTest.scala @@ -16,20 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.table.TableEnvironment import org.apache.flink.test.util.MultipleProgramsTestBase - -import org.junit._ import org.junit.Assert.assertEquals +import org.junit._ -class SqlExplainTest +class ExplainTest extends MultipleProgramsTestBase(MultipleProgramsTestBase.TestExecutionMode.CLUSTER) { - val testFilePath = SqlExplainTest.this.getClass.getResource("/").getFile + val testFilePath = ExplainTest.this.getClass.getResource("/").getFile @Test def testFilterWithoutExtended() : Unit = { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableEnvironmentITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableEnvironmentITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala index bd1ce46713074..80a491bdda89c 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableEnvironmentITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableEnvironmentITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, TableException, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableSourceITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala similarity index 88% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableSourceITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala index 8274d46c8776f..def6fb6568f90 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/TableSourceITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/TableSourceITCase.scala @@ -16,21 +16,20 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch -import java.io.{FileOutputStream, OutputStreamWriter, File} +import java.io.{File, FileOutputStream, OutputStreamWriter} import org.apache.flink.api.common.io.GenericInputFormat -import org.apache.flink.api.common.typeinfo.{TypeInformation, BasicTypeInfo} -import org.apache.flink.api.scala._ -import org.apache.flink.api.scala.table._ -import org.apache.flink.api.java.{ExecutionEnvironment => JavaExecEnv, DataSet => JavaSet} +import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} +import org.apache.flink.api.java.{DataSet => JavaSet, ExecutionEnvironment => JavaExecEnv} import org.apache.flink.api.scala.ExecutionEnvironment -import org.apache.flink.api.table.sources.{CsvTableSource, BatchTableSource} +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.scala.table._ +import org.apache.flink.api.table.sources.{BatchTableSource, CsvTableSource} import org.apache.flink.api.table.typeutils.RowTypeInfo import org.apache.flink.api.table.{Row, TableEnvironment} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Test @@ -56,7 +55,7 @@ class TableSourceITCase( .scan("MyTestTable") .where('amount < 4) .select('amount * 'id, 'name) - .toDataSet[Row].collect() + .collect() val expected = Seq( "0,Record_0", "0,Record_16", "0,Record_32", "1,Record_1", "17,Record_17", @@ -72,8 +71,7 @@ class TableSourceITCase( tEnv.registerTableSource("MyTestTable", new TestBatchTableSource()) val results = tEnv.sql( - "SELECT amount * id, name FROM MyTestTable WHERE amount < 4") - .toDataSet[Row].collect() + "SELECT amount * id, name FROM MyTestTable WHERE amount < 4").collect() val expected = Seq( "0,Record_0", "0,Record_16", "0,Record_32", "1,Record_1", "17,Record_17", @@ -123,8 +121,7 @@ class TableSourceITCase( tEnv.registerTableSource("csvTable", csvTable) val results = tEnv.sql( - "SELECT last, sum(score), max(id) FROM csvTable GROUP BY last") - .toDataSet[Row].collect() + "SELECT last, sum(score), max(id) FROM csvTable GROUP BY last").collect() val expected = Seq( "Smith,102.52,7", @@ -144,7 +141,7 @@ class TestBatchTableSource extends BatchTableSource[Row] { BasicTypeInfo.INT_TYPE_INFO ) - /** Returns the data of the table as a [[DataSet]]. */ + /** Returns the data of the table as a [[org.apache.flink.api.java.DataSet]]. */ override def getDataSet(execEnv: JavaExecEnv): JavaSet[Row] = { execEnv.createInput(new GeneratingInputFormat(33), getReturnType).setParallelism(1) } diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/AggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala index 08f44d30698ad..49541eb2b057a 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/AggregationsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/ExpressionsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/ExpressionsITCase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/ExpressionsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/ExpressionsITCase.scala index 9aac4f8cfe180..1091a573c5ccc 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/ExpressionsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/ExpressionsITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql -import org.apache.flink.api.scala.{ExecutionEnvironment, _} -import org.apache.flink.api.table.{TableEnvironment, Row} +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase import org.apache.flink.api.scala.table._ +import org.apache.flink.api.scala.{ExecutionEnvironment, _} import org.apache.flink.api.table.codegen.CodeGenException -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/FilterITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/FilterITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/FilterITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/FilterITCase.scala index e1edd875b0bd8..cc4da3824abda 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/FilterITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/FilterITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/JoinITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala index 561f2a7a6ddc5..40d75467f72eb 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/JoinITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/JoinITCase.scala @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.calcite.tools.ValidationException import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, TableException, Row} import org.apache.flink.api.table.plan.PlanGenException -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/SelectITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SelectITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/SelectITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SelectITCase.scala index b1d423be852d4..75de9b5915cbb 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/SelectITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SelectITCase.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.calcite.tools.ValidationException import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala new file mode 100644 index 0000000000000..0dea0b6aaa62b --- /dev/null +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/SortITCase.scala @@ -0,0 +1,63 @@ +/* + * 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.batch.sql + +import org.apache.flink.api.scala.ExecutionEnvironment +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.scala.batch.utils.SortTestUtils._ +import org.apache.flink.api.scala.util.CollectionDataSets +import org.apache.flink.api.scala.table._ +import org.apache.flink.api.scala._ +import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode +import org.apache.flink.test.util.TestBaseUtils +import org.junit._ +import org.junit.runner.RunWith +import org.junit.runners.Parameterized + +import scala.collection.JavaConverters._ + +@RunWith(classOf[Parameterized]) +class SortITCase( + mode: TestExecutionMode, + configMode: TableConfigMode) + extends TableProgramsTestBase(mode, configMode) { + + @Test + def testOrderByMultipleFieldsWithSql(): Unit = { + val env = ExecutionEnvironment.getExecutionEnvironment + val tEnv = TableEnvironment.getTableEnvironment(env, config) + + val sqlQuery = "SELECT * FROM MyTable ORDER BY _1 DESC, _2 DESC" + implicit def rowOrdering[T <: Product] = Ordering.by((x : T) => + (- x.productElement(0).asInstanceOf[Int], - x.productElement(1).asInstanceOf[Long])) + + val ds = CollectionDataSets.get3TupleDataSet(env) + tEnv.registerDataSet("MyTable", ds) + + val expected = sortExpectedly(tupleDataSetStrings) + val results = tEnv.sql(sqlQuery).toDataSet[Row].mapPartition(rows => Seq(rows.toSeq)).collect() + + val result = results.filterNot(_.isEmpty).sortBy(p => p.head).reduceLeft(_ ++ _) + + TestBaseUtils.compareOrderedResultAsText(result.asJava, expected) + } + +} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/TableWithSQLITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/TableWithSQLITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala index 71334f4ef0594..30e44f0c9a4ce 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/TableWithSQLITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/TableWithSQLITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/UnionITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UnionITCase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/UnionITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UnionITCase.scala index fadc48f4732cf..a42d3283835d9 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/test/UnionITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/sql/UnionITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.test +package org.apache.flink.api.scala.batch.sql import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableException, TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala index 26cdc761c2c4b..c34edbc0a153c 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/AggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/AggregationsITCase.scala @@ -16,20 +16,21 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table -import org.apache.flink.api.table.plan.PlanGenException -import org.apache.flink.api.table.{TableEnvironment, Row} import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.test.util.{TestBaseUtils, MultipleProgramsTestBase} +import org.apache.flink.api.table.plan.PlanGenException +import org.apache.flink.api.table.{Row, TableEnvironment} +import org.apache.flink.examples.scala.WordCountTable.{WC => MyWC} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode +import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit._ import org.junit.runner.RunWith import org.junit.runners.Parameterized + import scala.collection.JavaConverters._ -import org.apache.flink.examples.scala.WordCountTable.{WC => MyWC} @RunWith(classOf[Parameterized]) class AggregationsITCase(mode: TestExecutionMode) extends MultipleProgramsTestBase(mode) { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CalcITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala similarity index 93% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CalcITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala index af5e6d7e5dacd..d64e414049396 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CalcITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CalcITCase.scala @@ -16,19 +16,20 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ import org.junit.runner.RunWith import org.junit.runners.Parameterized + import scala.collection.JavaConverters._ @RunWith(classOf[Parameterized]) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CastingITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CastingITCase.scala index c0499e45098b7..8dfba50fa28ed 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/CastingITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/CastingITCase.scala @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import java.util.Date import org.apache.flink.api.common.typeinfo.BasicTypeInfo import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.codegen.CodeGenException +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/DistinctITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/DistinctITCase.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/DistinctITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/DistinctITCase.scala index fc1284e428e9f..55c7944a16cdc 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/DistinctITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/DistinctITCase.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.test.util.{TestBaseUtils, MultipleProgramsTestBase} +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode +import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ExpressionsITCase.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ExpressionsITCase.scala index 59b835c5d5d38..fdbe3c9aa1107 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ExpressionsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ExpressionsITCase.scala @@ -16,19 +16,18 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import java.util.Date import org.apache.flink.api.common.typeinfo.BasicTypeInfo import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.table.codegen.CodeGenException -import org.apache.flink.api.table.expressions.Null -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.expressions.{Literal, Null} +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit.Assert._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/FilterITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/FilterITCase.scala index 51dfe74c5cf95..5deff9e864358 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/FilterITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/FilterITCase.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggregationsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/GroupedAggregationsITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggregationsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/GroupedAggregationsITCase.scala index a9edbb0c369ae..cbd42b21a8ecf 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/GroupedAggregationsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/GroupedAggregationsITCase.scala @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table -import org.apache.flink.api.table.{TableEnvironment, Row} import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.expressions.Literal +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala index 24420919a4047..3a89de2a4d5b2 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/JoinITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/JoinITCase.scala @@ -16,18 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table -import org.apache.flink.api.table.{TableEnvironment, TableException, Row} import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.test.util.{TestBaseUtils, MultipleProgramsTestBase} +import org.apache.flink.api.table.{Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode +import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit._ import org.junit.runner.RunWith import org.junit.runners.Parameterized + import scala.collection.JavaConverters._ @RunWith(classOf[Parameterized]) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SelectITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SelectITCase.scala index 82668a1f5f903..c6a61225d32e7 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SelectITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SelectITCase.scala @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.table.test.utils.TableProgramsTestBase +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SortITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala similarity index 67% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SortITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala index 94361c66090b6..235fc4593d857 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/SortITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/SortITCase.scala @@ -16,14 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.scala.batch.utils.SortTestUtils._ import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets import org.apache.flink.api.scala.{ExecutionEnvironment, _} import org.apache.flink.api.table.{Row, TableEnvironment} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ @@ -44,28 +45,6 @@ class SortITCase( env } - val tupleDataSetStrings = List((1, 1L, "Hi") - ,(2, 2L, "Hello") - ,(3, 2L, "Hello world") - ,(4, 3L, "Hello world, how are you?") - ,(5, 3L, "I am fine.") - ,(6, 3L, "Luke Skywalker") - ,(7, 4L, "Comment#1") - ,(8, 4L, "Comment#2") - ,(9, 4L, "Comment#3") - ,(10, 4L, "Comment#4") - ,(11, 5L, "Comment#5") - ,(12, 5L, "Comment#6") - ,(13, 5L, "Comment#7") - ,(14, 5L, "Comment#8") - ,(15, 5L, "Comment#9") - ,(16, 6L, "Comment#10") - ,(17, 6L, "Comment#11") - ,(18, 6L, "Comment#12") - ,(19, 6L, "Comment#13") - ,(20, 6L, "Comment#14") - ,(21, 6L, "Comment#15")) - @Test def testOrderByDesc(): Unit = { val env = getExecutionEnvironment @@ -120,28 +99,4 @@ class SortITCase( TestBaseUtils.compareOrderedResultAsText(result.asJava, expected) } - @Test - def testOrderByMultipleFieldsWithSql(): Unit = { - val env = getExecutionEnvironment - val tEnv = TableEnvironment.getTableEnvironment(env, config) - - val sqlQuery = "SELECT * FROM MyTable ORDER BY _1 DESC, _2 DESC" - implicit def rowOrdering[T <: Product] = Ordering.by((x : T) => - (- x.productElement(0).asInstanceOf[Int], - x.productElement(1).asInstanceOf[Long])) - - val ds = CollectionDataSets.get3TupleDataSet(env) - tEnv.registerDataSet("MyTable", ds) - - val expected = sortExpectedly(tupleDataSetStrings) - val results = tEnv.sql(sqlQuery).toDataSet[Row].mapPartition(rows => Seq(rows.toSeq)).collect() - - val result = results.filterNot(_.isEmpty).sortBy(p => p.head).reduceLeft(_ ++ _) - - TestBaseUtils.compareOrderedResultAsText(result.asJava, expected) - } - - def sortExpectedly(dataSet: List[Product])(implicit ordering: Ordering[Product]): String = { - dataSet.sorted(ordering).mkString("\n").replaceAll("[\\(\\)]", "") - } - } diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/StringExpressionsITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/StringExpressionsITCase.scala index 1ad57b4334c5d..e42830649bb4e 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/StringExpressionsITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/StringExpressionsITCase.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableEnvironment, Row} import org.apache.flink.api.table.codegen.CodeGenException +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils} import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ToTableITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ToTableITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ToTableITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ToTableITCase.scala index f16284626583c..ed7b88f3f4135 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/ToTableITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/ToTableITCase.scala @@ -16,15 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.table.test.utils.TableProgramsTestBase +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UnionITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UnionITCase.scala index 0448386391957..7c109a3abae53 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/test/UnionITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/table/UnionITCase.scala @@ -16,20 +16,21 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.test +package org.apache.flink.api.scala.batch.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode import org.apache.flink.api.scala.table._ import org.apache.flink.api.scala.util.CollectionDataSets -import org.apache.flink.api.table.{TableException, TableEnvironment, Row} +import org.apache.flink.api.table.{Row, TableEnvironment, TableException} import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.apache.flink.test.util.TestBaseUtils import org.junit._ import org.junit.runner.RunWith import org.junit.runners.Parameterized + import scala.collection.JavaConverters._ -import org.apache.flink.api.table.test.utils.TableProgramsTestBase -import TableProgramsTestBase.TableConfigMode @RunWith(classOf[Parameterized]) class UnionITCase( diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala new file mode 100644 index 0000000000000..07765fd3dadcb --- /dev/null +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/SortTestUtils.scala @@ -0,0 +1,49 @@ +/* + * 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.batch.utils + +object SortTestUtils { + + val tupleDataSetStrings = List((1, 1L, "Hi") + ,(2, 2L, "Hello") + ,(3, 2L, "Hello world") + ,(4, 3L, "Hello world, how are you?") + ,(5, 3L, "I am fine.") + ,(6, 3L, "Luke Skywalker") + ,(7, 4L, "Comment#1") + ,(8, 4L, "Comment#2") + ,(9, 4L, "Comment#3") + ,(10, 4L, "Comment#4") + ,(11, 5L, "Comment#5") + ,(12, 5L, "Comment#6") + ,(13, 5L, "Comment#7") + ,(14, 5L, "Comment#8") + ,(15, 5L, "Comment#9") + ,(16, 6L, "Comment#10") + ,(17, 6L, "Comment#11") + ,(18, 6L, "Comment#12") + ,(19, 6L, "Comment#13") + ,(20, 6L, "Comment#14") + ,(21, 6L, "Comment#15")) + + def sortExpectedly(dataSet: List[Product])(implicit ordering: Ordering[Product]): String = { + dataSet.sorted(ordering).mkString("\n").replaceAll("[\\(\\)]", "") + } + +} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/TableProgramsTestBase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala similarity index 80% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/TableProgramsTestBase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala index 723646bee3cbb..37aaa5298c242 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/TableProgramsTestBase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/batch/utils/TableProgramsTestBase.scala @@ -16,17 +16,13 @@ * limitations under the License. */ -package org.apache.flink.api.table.test.utils +package org.apache.flink.api.scala.batch.utils import java.util -import org.apache.flink.api.java.table.{BatchTableEnvironment => JavaTableEnv} -import org.apache.flink.api.java.{ExecutionEnvironment => JavaEnv} -import org.apache.flink.api.scala.table.{BatchTableEnvironment => ScalaTableEnv} -import org.apache.flink.api.scala.{ExecutionEnvironment => ScalaEnv} -import org.apache.flink.api.table.{TableEnvironment, TableConfig} -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode -import org.apache.flink.api.table.test.utils.TableProgramsTestBase.TableConfigMode.{EFFICIENT, NULL} +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode +import org.apache.flink.api.scala.batch.utils.TableProgramsTestBase.TableConfigMode._ +import org.apache.flink.api.table.TableConfig import org.apache.flink.test.util.MultipleProgramsTestBase import org.apache.flink.test.util.MultipleProgramsTestBase.TestExecutionMode import org.junit.runners.Parameterized diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/ScalarFunctionsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/ScalarFunctionsTest.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/ScalarFunctionsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/ScalarFunctionsTest.scala index 8f242e91b78d9..dde84ced9a783 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/ScalarFunctionsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/ScalarFunctionsTest.scala @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.api.table.test +package org.apache.flink.api.scala.expression import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation +import org.apache.flink.api.scala.expression.utils.ExpressionEvaluator import org.apache.flink.api.scala.table._ import org.apache.flink.api.table.Row -import org.apache.flink.api.table.expressions.{ExpressionParser, Expression} -import org.apache.flink.api.table.test.utils.ExpressionEvaluator +import org.apache.flink.api.table.expressions.{Expression, ExpressionParser} import org.apache.flink.api.table.typeutils.RowTypeInfo import org.junit.Assert.assertEquals import org.junit.Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/ExpressionEvaluator.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/utils/ExpressionEvaluator.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/ExpressionEvaluator.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/utils/ExpressionEvaluator.scala index 4e1ae02746f5a..e0316c2b9b3bc 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/test/utils/ExpressionEvaluator.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/expression/utils/ExpressionEvaluator.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.table.test.utils +package org.apache.flink.api.scala.expression.utils import org.apache.calcite.rel.logical.LogicalProject import org.apache.calcite.rex.RexNode @@ -25,12 +25,12 @@ import org.apache.calcite.tools.{Frameworks, RelBuilder} import org.apache.flink.api.common.functions.{Function, MapFunction} import org.apache.flink.api.common.typeinfo.BasicTypeInfo._ import org.apache.flink.api.common.typeinfo.TypeInformation -import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} import org.apache.flink.api.java.{DataSet => JDataSet} -import org.apache.flink.api.table.{TableEnvironment, TableConfig} +import org.apache.flink.api.scala.{DataSet, ExecutionEnvironment} import org.apache.flink.api.table.codegen.{CodeGenerator, GeneratedFunction} import org.apache.flink.api.table.expressions.Expression import org.apache.flink.api.table.runtime.FunctionCompiler +import org.apache.flink.api.table.{TableConfig, TableEnvironment} import org.mockito.Mockito._ /** diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/TableSourceITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala similarity index 97% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/TableSourceITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala index f3d60a44237b5..687cc2874937b 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/TableSourceITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/TableSourceITCase.scala @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test +package org.apache.flink.api.scala.stream import org.apache.flink.api.common.typeinfo.{BasicTypeInfo, TypeInformation} import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.stream.utils.StreamITCase import org.apache.flink.api.scala.table._ -import org.apache.flink.api.scala.table.streaming.test.utils.StreamITCase import org.apache.flink.api.table.sources.StreamTableSource import org.apache.flink.api.table.typeutils.RowTypeInfo import org.apache.flink.api.table.{Row, TableEnvironment} diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/streaming/test/StreamSQLITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/streaming/test/StreamSQLITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala index 573a6286d08dd..26c701fd318ab 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/sql/streaming/test/StreamSQLITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/sql/SqlITCase.scala @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.flink.api.scala.sql.streaming.test +package org.apache.flink.api.scala.stream.sql import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.stream.utils.{StreamTestData, StreamITCase} import org.apache.flink.api.scala.table._ -import org.apache.flink.api.scala.table.streaming.test.utils.{StreamITCase, StreamTestData} import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase @@ -29,7 +29,7 @@ import org.junit._ import scala.collection.mutable -class StreamSQLITCase extends StreamingMultipleProgramsTestBase { +class SqlITCase extends StreamingMultipleProgramsTestBase { /** test selection **/ @Test diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/FilterITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/FilterITCase.scala similarity index 94% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/FilterITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/FilterITCase.scala index 3147a8ed1463e..45b9b04582f3b 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/FilterITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/FilterITCase.scala @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test +package org.apache.flink.api.scala.stream.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.stream.utils.{StreamITCase, StreamTestData} import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableEnvironment, Row} import org.apache.flink.api.table.expressions.Literal -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment -import scala.collection.mutable -import org.junit.Test +import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ -import org.apache.flink.api.scala.table.streaming.test.utils.StreamITCase -import org.apache.flink.api.scala.table.streaming.test.utils.StreamTestData +import org.junit.Test + +import scala.collection.mutable class FilterITCase extends StreamingMultipleProgramsTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/SelectITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/SelectITCase.scala similarity index 95% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/SelectITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/SelectITCase.scala index d606a80a0a4ec..e3eb19a7c5b21 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/SelectITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/SelectITCase.scala @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test +package org.apache.flink.api.scala.stream.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.stream.utils.{StreamTestData, StreamITCase} import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableEnvironment, Row} -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase +import org.apache.flink.api.table.{Row, TableEnvironment} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment -import scala.collection.mutable -import org.junit.Test +import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ -import org.apache.flink.api.scala.table.streaming.test.utils.StreamITCase -import org.apache.flink.api.scala.table.streaming.test.utils.StreamTestData +import org.junit.Test + +import scala.collection.mutable class SelectITCase extends StreamingMultipleProgramsTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnionITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala similarity index 92% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnionITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala index ae81f3b9b2d0b..ff0e961856a37 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnionITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnionITCase.scala @@ -16,20 +16,18 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test +package org.apache.flink.api.scala.stream.table import org.apache.flink.api.scala._ +import org.apache.flink.api.scala.stream.utils.{StreamTestData, StreamITCase} import org.apache.flink.api.scala.table._ -import org.apache.flink.api.table.{TableException, TableEnvironment, Row} -import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase +import org.apache.flink.api.table.{Row, TableEnvironment, TableException} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment -import scala.collection.JavaConverters._ -import scala.collection.mutable -import scala.collection.JavaConversions._ -import org.junit.Test +import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Assert._ -import org.apache.flink.api.scala.table.streaming.test.utils.StreamITCase -import org.apache.flink.api.scala.table.streaming.test.utils.StreamTestData +import org.junit.Test + +import scala.collection.mutable class UnionITCase extends StreamingMultipleProgramsTestBase { diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnsupportedOpsTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala similarity index 90% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnsupportedOpsTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala index f7bd0ff79f926..e6309a28f963b 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/UnsupportedOpsTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/table/UnsupportedOpsTest.scala @@ -16,17 +16,15 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test +package org.apache.flink.api.scala.stream.table +import org.apache.flink.api.scala.stream.utils.StreamTestData import org.apache.flink.api.scala.table._ -import org.apache.flink.api.scala.table.streaming.test.utils.{StreamITCase, StreamTestData} -import org.apache.flink.api.table.{TableException, TableEnvironment} +import org.apache.flink.api.table.{TableEnvironment, TableException} import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment import org.apache.flink.streaming.util.StreamingMultipleProgramsTestBase import org.junit.Test -import scala.collection.mutable - class UnsupportedOpsTest extends StreamingMultipleProgramsTestBase { @Test(expected = classOf[TableException]) diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamITCase.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamITCase.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala index e7dc518a82373..48600055770cd 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamITCase.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamITCase.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test.utils +package org.apache.flink.api.scala.stream.utils import java.util.Collections diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamTestData.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala similarity index 98% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamTestData.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala index 3ab5f959a6f09..321b8ac7909dd 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/table/streaming/test/utils/StreamTestData.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/stream/utils/StreamTestData.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.api.scala.table.streaming.test.utils +package org.apache.flink.api.scala.stream.utils import org.apache.flink.api.scala._ import scala.collection.mutable diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/typeutils/RowComparatorTest.scala similarity index 96% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/typeutils/RowComparatorTest.scala index 6d31187d3b7b4..9ceb9d299f0eb 100644 --- a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowComparatorTest.scala +++ b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/typeutils/RowComparatorTest.scala @@ -16,15 +16,16 @@ * limitations under the License. */ -package org.apache.flink.api.table.typeutils +package org.apache.flink.api.scala.typeutils import org.apache.flink.api.common.ExecutionConfig import org.apache.flink.api.common.typeinfo.BasicTypeInfo import org.apache.flink.api.common.typeutils.{ComparatorTestBase, TypeComparator, TypeSerializer} import org.apache.flink.api.java.tuple import org.apache.flink.api.java.typeutils.{TupleTypeInfo, TypeExtractor} +import org.apache.flink.api.scala.typeutils.RowComparatorTest.MyPojo import org.apache.flink.api.table.Row -import org.apache.flink.api.table.typeutils.RowComparatorTest.MyPojo +import org.apache.flink.api.table.typeutils.RowTypeInfo import org.junit.Assert._ class RowComparatorTest extends ComparatorTestBase[Row] { @@ -107,6 +108,7 @@ class RowComparatorTest extends ComparatorTestBase[Row] { } object RowComparatorTest { + class MyPojo() extends Serializable with Comparable[MyPojo] { // we cannot use null because the PojoComparator does not support null properly var name: String = "" diff --git a/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowSerializerTest.scala b/flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/typeutils/RowSerializerTest.scala similarity index 100% rename from flink-libraries/flink-table/src/test/scala/org/apache/flink/api/table/typeutils/RowSerializerTest.scala rename to flink-libraries/flink-table/src/test/scala/org/apache/flink/api/scala/typeutils/RowSerializerTest.scala