Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve mechanism for expected exceptions in tests #1106

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Improve mechanism for expected exceptions in tests #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tests/src/test/scala/com/nvidia/spark/rapids/CsvScanSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ import org.apache.spark.SparkConf
import org.apache.spark.sql.functions.col

class CsvScanSuite extends SparkQueryCompareTestSuite {
testExpectedExceptionStartsWith("Test CSV projection including unsupported types",
classOf[IllegalArgumentException],
"Part of the plan is not columnar",
testExpectedException[IllegalArgumentException]("Test CSV projection including unsupported types",
_.getMessage.startsWith("Part of the plan is not columnar"),
mixedTypesFromCsvWithHeader) {
frame => frame.select(col("c_string"), col("c_int"), col("c_timestamp"))
}
Expand Down
11 changes: 5 additions & 6 deletions tests/src/test/scala/com/nvidia/spark/rapids/HashAggregatesSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,9 @@ class HashAggregatesSuite extends SparkQueryCompareTestSuite {
frame => frame.agg(avg(lit("abc")),avg(lit("pqr")))
}

testExpectedExceptionStartsWith(
testExpectedException[AnalysisException](
"avg literals bools fail",
classOf[AnalysisException],
"cannot resolve",
_.getMessage.startsWith("cannot resolve"),
longsFromCSVDf,
conf = floatAggConf) {
frame => frame.agg(avg(lit(true)),avg(lit(false)))
Expand Down Expand Up @@ -1550,10 +1549,10 @@ class HashAggregatesSuite extends SparkQueryCompareTestSuite {

if (spark.SPARK_VERSION_SHORT < "3.1.0") {
// A test that verifies that Distinct with Filter is not supported on the CPU or the GPU.
testExpectedExceptionStartsWith(
testExpectedException[AnalysisException](
"Avg Distinct with filter - unsupported on CPU and GPU",
classOf[AnalysisException],
"DISTINCT and FILTER cannot be used in aggregate functions at the same time",
_.getMessage.startsWith(
"DISTINCT and FILTER cannot be used in aggregate functions at the same time"),
longsFromCSVDf, conf = floatAggConf) {
frame => frame.selectExpr("avg(distinct longs) filter (where longs < 5)")
}
Expand Down
5 changes: 2 additions & 3 deletions tests/src/test/scala/com/nvidia/spark/rapids/ParquetWriterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,9 @@ class ParquetWriterSuite extends SparkQueryCompareTestSuite {
}
}

testExpectedExceptionStartsWith(
testExpectedException[IllegalArgumentException](
"int96 timestamps not supported",
classOf[IllegalArgumentException],
"Part of the plan is not columnar",
_.getMessage.startsWith("Part of the plan is not columnar"),
frameFromParquet("timestamp-date-test-msec.parquet"),
new SparkConf().set("spark.sql.parquet.outputTimestampType", "INT96")) {
val tempFile = File.createTempFile("int96", "parquet")
Expand Down
9 changes: 4 additions & 5 deletions tests/src/test/scala/com/nvidia/spark/rapids/SparkQueryCompareTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,10 +793,9 @@ trait SparkQueryCompareTestSuite extends FunSuite with Arm {
}
}

def testExpectedExceptionStartsWith[T <: Throwable](
def testExpectedException[T <: Throwable](
testName: String,
exceptionClass: Class[T],
expectedException: String,
expectedException: T => Boolean,
df: SparkSession => DataFrame,
conf: SparkConf = new SparkConf(),
repart: Integer = 1,
Expand All @@ -819,8 +818,8 @@ trait SparkQueryCompareTestSuite extends FunSuite with Arm {
compareResults(sort, maxFloatDiff, fromCpu, fromGpu)
})
t match {
case Failure(e) if e.getClass == exceptionClass => {
assert(e.getMessage != null && e.getMessage.startsWith(expectedException))
case Failure(e) if e.isInstanceOf[T] => {
assert(expectedException(e.asInstanceOf[T]))
}
case Failure(e) => throw e
case _ => fail("Expected an exception")
Expand Down