[hotfix][python] Using fully qualified function names in python tests.

maplebeats · Jun 21, 2019 · de1fd6d · de1fd6d
1 parent 7992e98
commit de1fd6d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/flink-python/pyflink/table/tests/test_aggregate.py b/flink-python/pyflink/table/tests/test_aggregate.py
@@ -26,7 +26,8 @@ def test_group_by(self):
         result = t.group_by("c").select("a.sum, c as b")
         query_operation = result._j_table.getQueryOperation().getChildren().get(0)
         self.assertEqual("[c]", query_operation.getGroupingExpressions().toString())
-        self.assertEqual("[as(sum(a), 'EXPR$0')]",
+        self.assertEqual("[`default_catalog`.`default_database`.`as`("
+                         "`default_catalog`.`default_database`.`sum`(a), 'EXPR$0')]",
                          query_operation.getAggregateExpressions().toString())
 
 

diff --git a/flink-python/pyflink/table/tests/test_calc.py b/flink-python/pyflink/table/tests/test_calc.py
@@ -33,7 +33,8 @@ def test_select(self):
         t = self.t_env.from_elements([(1, 'hi', 'hello')], ['a', 'b', 'c'])
         result = t.select("a + 1, b, c")
         query_operation = result._j_table.getQueryOperation()
-        self.assertEqual('[plus(a, 1), b, c]', query_operation.getProjectList().toString())
+        self.assertEqual('[`default_catalog`.`default_database`.`plus`(a, 1), b, c]',
+                         query_operation.getProjectList().toString())
 
     def test_alias(self):
         t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
@@ -46,14 +47,18 @@ def test_where(self):
         t = t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
         result = t.where("a > 1 && b = 'Hello'")
         query_operation = result._j_table.getQueryOperation()
-        self.assertEqual("and(greaterThan(a, 1), equals(b, 'Hello'))",
+        self.assertEqual("`default_catalog`.`default_database`.`and`("
+                         "`default_catalog`.`default_database`.`greaterThan`(a, 1), "
+                         "`default_catalog`.`default_database`.`equals`(b, 'Hello'))",
                          query_operation.getCondition().toString())
 
     def test_filter(self):
         t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
         result = t.filter("a > 1 && b = 'Hello'")
         query_operation = result._j_table.getQueryOperation()
-        self.assertEqual("and(greaterThan(a, 1), equals(b, 'Hello'))",
+        self.assertEqual("`default_catalog`.`default_database`.`and`("
+                         "`default_catalog`.`default_database`.`greaterThan`(a, 1), "
+                         "`default_catalog`.`default_database`.`equals`(b, 'Hello'))",
                          query_operation.getCondition().toString())
 
     def test_from_element(self):

diff --git a/flink-python/pyflink/table/tests/test_column_operation.py b/flink-python/pyflink/table/tests/test_column_operation.py
@@ -25,13 +25,17 @@ def test_add_columns(self):
         t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
         result = t.select("a").add_columns("a + 1 as b, a + 2 as c")
         query_operation = result._j_table.getQueryOperation()
-        self.assertEqual('[a, plus(a, 1), plus(a, 2)]', query_operation.getProjectList().toString())
+        self.assertEqual('[a, `default_catalog`.`default_database`.`plus`(a, 1), '
+                         '`default_catalog`.`default_database`.`plus`(a, 2)]',
+                         query_operation.getProjectList().toString())
 
     def test_add_or_replace_columns(self):
         t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])
         result = t.select("a").add_or_replace_columns("a + 1 as b, a + 2 as a")
         query_operation = result._j_table.getQueryOperation()
-        self.assertEqual('[plus(a, 2), plus(a, 1)]', query_operation.getProjectList().toString())
+        self.assertEqual('[`default_catalog`.`default_database`.`plus`(a, 2), '
+                         '`default_catalog`.`default_database`.`plus`(a, 1)]',
+                         query_operation.getProjectList().toString())
 
     def test_rename_columns(self):
         t = self.t_env.from_elements([(1, 'Hi', 'Hello')], ['a', 'b', 'c'])

diff --git a/flink-python/pyflink/table/tests/test_join.py b/flink-python/pyflink/table/tests/test_join.py
@@ -29,7 +29,8 @@ def test_join_without_where(self):
 
         query_operation = result._j_table.getQueryOperation()
         self.assertEqual('INNER', query_operation.getJoinType().toString())
-        self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+        self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+                         query_operation.getCondition().toString())
         self.assertFalse(query_operation.isCorrelated())
 
     def test_join_with_where(self):
@@ -51,7 +52,8 @@ def test_left_outer_join_without_where(self):
 
         query_operation = result._j_table.getQueryOperation()
         self.assertEqual('LEFT_OUTER', query_operation.getJoinType().toString())
-        self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+        self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+                         query_operation.getCondition().toString())
         self.assertFalse(query_operation.isCorrelated())
 
     def test_left_outer_join_with_where(self):
@@ -73,7 +75,8 @@ def test_right_outer_join(self):
 
         query_operation = result._j_table.getQueryOperation()
         self.assertEqual('RIGHT_OUTER', query_operation.getJoinType().toString())
-        self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+        self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+                         query_operation.getCondition().toString())
         self.assertFalse(query_operation.isCorrelated())
 
     def test_full_outer_join(self):
@@ -84,7 +87,8 @@ def test_full_outer_join(self):
         result = t1.full_outer_join(t2, "a = d")
         query_operation = result._j_table.getQueryOperation()
         self.assertEqual('FULL_OUTER', query_operation.getJoinType().toString())
-        self.assertEqual('equals(a, d)', query_operation.getCondition().toString())
+        self.assertEqual('`default_catalog`.`default_database`.`equals`(a, d)',
+                         query_operation.getCondition().toString())
         self.assertFalse(query_operation.isCorrelated())
 
 

diff --git a/flink-python/pyflink/table/tests/test_sort.py b/flink-python/pyflink/table/tests/test_sort.py
@@ -28,7 +28,8 @@ def test_order_by_offset_fetch(self):
         query_operation = result._j_table.getQueryOperation()
         self.assertEqual(2, query_operation.getOffset())
         self.assertEqual(2, query_operation.getFetch())
-        self.assertEqual('[desc(a)]', query_operation.getOrder().toString())
+        self.assertEqual('[`default_catalog`.`default_database`.`desc`(a)]',
+                         query_operation.getOrder().toString())
 
 
 if __name__ == '__main__':