[flink] 01/02: [hotfix][table] Check if expected exception was thrown

[twalthr]

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

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

commit da14a23432b4e8ed8c5947329b9770ff0b0e14b2
Author: Dawid Wysakowicz <dwysakow...@apache.org>
AuthorDate: Fri Nov 30 09:10:16 2018 +0100

    [hotfix][table] Check if expected exception was thrown
---
 .../validation/WindowAggregateValidationTest.scala | 28 +++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git 
a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
 
b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
index e7cf597..a0157d7 100644
--- 
a/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
+++ 
b/flink-libraries/flink-table/src/test/scala/org/apache/flink/table/api/stream/sql/validation/WindowAggregateValidationTest.scala
@@ -30,8 +30,11 @@ class WindowAggregateValidationTest extends TableTestBase {
   streamUtil.addTable[(Int, String, Long)](
     "MyTable", 'a, 'b, 'c, 'proctime.proctime, 'rowtime.rowtime)
 
-  @Test(expected = classOf[TableException])
+  @Test
   def testTumbleWindowNoOffset(): Unit = {
+    expectedException.expect(classOf[TableException])
+    expectedException.expectMessage("TUMBLE window with alignment is not 
supported yet")
+
     val sqlQuery =
       "SELECT SUM(a) AS sumA, COUNT(b) AS cntB " +
         "FROM MyTable " +
@@ -40,8 +43,11 @@ class WindowAggregateValidationTest extends TableTestBase {
     streamUtil.verifySql(sqlQuery, "n/a")
   }
 
-  @Test(expected = classOf[TableException])
+  @Test
   def testHopWindowNoOffset(): Unit = {
+    expectedException.expect(classOf[TableException])
+    expectedException.expectMessage("HOP window with alignment is not 
supported yet")
+
     val sqlQuery =
       "SELECT SUM(a) AS sumA, COUNT(b) AS cntB " +
         "FROM MyTable " +
@@ -50,8 +56,11 @@ class WindowAggregateValidationTest extends TableTestBase {
     streamUtil.verifySql(sqlQuery, "n/a")
   }
 
-  @Test(expected = classOf[TableException])
+  @Test
   def testSessionWindowNoOffset(): Unit = {
+    expectedException.expect(classOf[TableException])
+    expectedException.expectMessage("SESSION window with alignment is not 
supported yet")
+
     val sqlQuery =
       "SELECT SUM(a) AS sumA, COUNT(b) AS cntB " +
         "FROM MyTable " +
@@ -60,20 +69,27 @@ class WindowAggregateValidationTest extends TableTestBase {
     streamUtil.verifySql(sqlQuery, "n/a")
   }
 
-  @Test(expected = classOf[TableException])
+  @Test
   def testVariableWindowSize() = {
+    expectedException.expect(classOf[TableException])
+    expectedException.expectMessage("Only constant window descriptors with DAY 
TO SECOND " +
+      "resolution are supported")
+
     val sql = "SELECT COUNT(*) FROM MyTable GROUP BY TUMBLE(proctime, c * 
INTERVAL '1' MINUTE)"
     streamUtil.verifySql(sql, "n/a")
   }
 
-  @Test(expected = classOf[ValidationException])
+  @Test
   def testWindowUdAggInvalidArgs(): Unit = {
+    expectedException.expect(classOf[ValidationException])
+    expectedException.expectMessage("Given parameters of function do not match 
any signature")
+
     streamUtil.tableEnv.registerFunction("weightedAvg", new 
WeightedAvgWithMerge)
 
     val sqlQuery =
       "SELECT SUM(a) AS sumA, weightedAvg(a, b) AS wAvg " +
         "FROM MyTable " +
-        "GROUP BY TUMBLE(proctime(), INTERVAL '2' HOUR, TIME '10:00:00')"
+        "GROUP BY TUMBLE(proctime, INTERVAL '2' HOUR, TIME '10:00:00')"
 
     streamUtil.verifySql(sqlQuery, "n/a")
   }