[flink] 03/03: [hotfix][table-api] Uncouple case classes from other API tests

[tw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 85a93207c3d09c2234bdbfaf04121c557b5ea5c7
Author: Timo Walther <tw...@apache.org>
AuthorDate: Fri Mar 1 11:52:43 2019 +0100

    [hotfix][table-api] Uncouple case classes from other API tests
---
 .../scala/org/apache/flink/table/api/batch/table/CalcTest.scala   | 5 ++---
 .../scala/org/apache/flink/table/api/stream/table/CalcTest.scala  | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
index 59ecec0..65e0122 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/batch/table/CalcTest.scala
@@ -22,10 +22,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation
 import org.apache.flink.api.scala.createTypeInformation
 import org.apache.flink.table.api.batch.table.CalcTest.{MyHashCode, TestCaseClass, WC, giveMeCaseClass}
 import org.apache.flink.table.api.scala._
-import org.apache.flink.table.expressions.Upper
 import org.apache.flink.table.functions.ScalarFunction
-import org.apache.flink.table.utils.TableTestUtil._
 import org.apache.flink.table.utils.TableTestBase
+import org.apache.flink.table.utils.TableTestUtil._
 import org.junit.Test
 
 class CalcTest extends TableTestBase {
@@ -239,7 +238,7 @@ class CalcTest extends TableTestBase {
   def testSelectFromGroupedTableWithNonTrivialKey(): Unit = {
     val util = batchTestUtil()
     val sourceTable = util.addTable[(Int, Long, String, Double)]("MyTable", 'a, 'b, 'c, 'd)
-    val resultTable = sourceTable.groupBy(Upper('c) as 'k).select('a.sum)
+    val resultTable = sourceTable.groupBy('c.upperCase() as 'k).select('a.sum)
 
     val expected =
       unaryNode(
diff --git a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
index 6f2718b..5298ea4 100644
--- a/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
+++ b/flink-table/flink-table-planner/src/test/scala/org/apache/flink/table/api/stream/table/CalcTest.scala
@@ -20,10 +20,10 @@ package org.apache.flink.table.api.stream.table
 
 import org.apache.flink.api.scala._
 import org.apache.flink.table.api.scala._
-import org.apache.flink.table.expressions.{Upper, WindowReference}
+import org.apache.flink.table.expressions.WindowReference
 import org.apache.flink.table.plan.logical.TumblingGroupWindow
-import org.apache.flink.table.utils.TableTestUtil._
 import org.apache.flink.table.utils.TableTestBase
+import org.apache.flink.table.utils.TableTestUtil._
 import org.junit.Test
 
 class CalcTest extends TableTestBase {
@@ -41,7 +41,7 @@ class CalcTest extends TableTestBase {
     val resultTable = sourceTable
         .window(Tumble over 5.millis on 'rowtime as 'w)
         .groupBy('w)
-        .select(Upper('c).count, 'a.sum)
+        .select('c.upperCase().count, 'a.sum)
 
     val expected =
       unaryNode(
@@ -70,7 +70,7 @@ class CalcTest extends TableTestBase {
     val resultTable = sourceTable
         .window(Tumble over 5.millis on 'rowtime as 'w)
         .groupBy('w, 'b)
-        .select(Upper('c).count, 'a.sum, 'b)
+        .select('c.upperCase().count, 'a.sum, 'b)
 
     val expected = unaryNode(
         "DataStreamCalc",