[GLUTEN-3559][VL] Fix GlutenStringExpressionsSuite (apache#4579)

surnaik · web-flow · commit 1b76bd07e0cc · 2024-01-31T10:04:56.000+08:00
diff --git a/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -228,7 +228,6 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenSortOrderExpressionsSuite]
   enableSuite[GlutenBitwiseExpressionsSuite]
   enableSuite[GlutenStringExpressionsSuite]
-    .exclude("concat")
   enableSuite[GlutenMiscExpressionsSuite]
   enableSuite[GlutenNondeterministicSuite]
     // No need due to testing framework change.
diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala
@@ -16,9 +16,7 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST
 import org.apache.spark.sql.GlutenTestsTrait
-import org.apache.spark.sql.types._
 
 class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTestsTrait {
 
@@ -33,26 +31,4 @@ class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTes
       c => checkEvaluation(Ascii(Chr(Literal(c.toLong))), c, create_row(c.toLong))
     }
   }
-
-  test(GLUTEN_TEST + "concat") {
-    def testConcat(inputs: String*): Unit = {
-      val expected = if (inputs.contains(null)) null else inputs.mkString
-      checkEvaluation(Concat(inputs.map(Literal.create(_, StringType))), expected)
-    }
-
-    // testConcat() velox not supported
-    testConcat(null)
-    testConcat("")
-    testConcat("ab")
-    testConcat("a", "b")
-    testConcat("a", "b", "C")
-    testConcat("a", null, "C")
-    testConcat("a", null, null)
-    testConcat(null, null, null)
-
-    // scalastyle:off
-    // non ascii characters are not allowed in the code, so we disable the scalastyle here.
-    testConcat("数据", null, "砖头")
-    // scalastyle:on
-  }
 }
diff --git a/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -158,7 +158,6 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenRegexpExpressionsSuite]
   enableSuite[GlutenSortOrderExpressionsSuite]
   enableSuite[GlutenStringExpressionsSuite]
-    .exclude("concat")
   enableSuite[VeloxAdaptiveQueryExecSuite]
     .includeByPrefix(
       "gluten",
diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala
@@ -16,30 +16,6 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST
 import org.apache.spark.sql.GlutenTestsTrait
-import org.apache.spark.sql.types._
 
-class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTestsTrait {
-  test(GLUTEN_TEST + "concat") {
-    def testConcat(inputs: String*): Unit = {
-      val expected = if (inputs.contains(null)) null else inputs.mkString
-      checkEvaluation(Concat(inputs.map(Literal.create(_, StringType))), expected)
-    }
-
-    // testConcat() velox not supported
-    testConcat(null)
-    testConcat("")
-    testConcat("ab")
-    testConcat("a", "b")
-    testConcat("a", "b", "C")
-    testConcat("a", null, "C")
-    testConcat("a", null, null)
-    testConcat(null, null, null)
-
-    // scalastyle:off
-    // non ascii characters are not allowed in the code, so we disable the scalastyle here.
-    testConcat("数据", null, "砖头")
-    // scalastyle:on
-  }
-}
+class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTestsTrait {}
diff --git a/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala
@@ -138,7 +138,6 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenRegexpExpressionsSuite]
   enableSuite[GlutenSortOrderExpressionsSuite]
   enableSuite[GlutenStringExpressionsSuite]
-    .exclude("concat")
   enableSuite[VeloxAdaptiveQueryExecSuite]
     .includeByPrefix(
       "gluten",
diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenStringExpressionsSuite.scala
@@ -16,30 +16,6 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestConstants.GLUTEN_TEST
 import org.apache.spark.sql.GlutenTestsTrait
-import org.apache.spark.sql.types._
 
-class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTestsTrait {
-  test(GLUTEN_TEST + "concat") {
-    def testConcat(inputs: String*): Unit = {
-      val expected = if (inputs.contains(null)) null else inputs.mkString
-      checkEvaluation(Concat(inputs.map(Literal.create(_, StringType))), expected)
-    }
-
-    // testConcat() velox not supported
-    testConcat(null)
-    testConcat("")
-    testConcat("ab")
-    testConcat("a", "b")
-    testConcat("a", "b", "C")
-    testConcat("a", null, "C")
-    testConcat("a", null, null)
-    testConcat(null, null, null)
-
-    // scalastyle:off
-    // non ascii characters are not allowed in the code, so we disable the scalastyle here.
-    testConcat("数据", null, "砖头")
-    // scalastyle:on
-  }
-}
+class GlutenStringExpressionsSuite extends StringExpressionsSuite with GlutenTestsTrait {}
