Skip to content

Commit 8d7be61

Browse files
committed
Update randomized test to use ScalaTest's assume()
1 parent b20837b commit 8d7be61

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CodeGenerationSuite.scala

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,23 @@ class CodeGenerationSuite extends SparkFunSuite {
6060
val rowType = StructType(
6161
StructField("a", dataType, nullable = true) ::
6262
StructField("b", dataType, nullable = true) :: Nil)
63+
val maybeDataGenerator = RandomDataGenerator.forType(rowType, nullable = false)
64+
assume(maybeDataGenerator.isDefined)
65+
val randGenerator = maybeDataGenerator.get
6366
val toCatalyst = CatalystTypeConverters.createToCatalystConverter(rowType)
64-
RandomDataGenerator.forType(rowType, nullable = false).foreach { randGenerator =>
65-
for (_ <- 1 to 50) {
66-
val a = toCatalyst(randGenerator()).asInstanceOf[InternalRow]
67-
val b = toCatalyst(randGenerator()).asInstanceOf[InternalRow]
68-
withClue(s"a = $a, b = $b") {
69-
assert(genOrdering.compare(a, a) === 0)
70-
assert(genOrdering.compare(b, b) === 0)
71-
assert(rowOrdering.compare(a, a) === 0)
72-
assert(rowOrdering.compare(b, b) === 0)
73-
assert(signum(genOrdering.compare(a, b)) === -1 * signum(genOrdering.compare(b, a)))
74-
assert(signum(rowOrdering.compare(a, b)) === -1 * signum(rowOrdering.compare(b, a)))
75-
assert(
76-
signum(rowOrdering.compare(a, b)) === signum(genOrdering.compare(a, b)),
77-
"Generated and non-generated orderings should agree")
78-
}
67+
for (_ <- 1 to 50) {
68+
val a = toCatalyst(randGenerator()).asInstanceOf[InternalRow]
69+
val b = toCatalyst(randGenerator()).asInstanceOf[InternalRow]
70+
withClue(s"a = $a, b = $b") {
71+
assert(genOrdering.compare(a, a) === 0)
72+
assert(genOrdering.compare(b, b) === 0)
73+
assert(rowOrdering.compare(a, a) === 0)
74+
assert(rowOrdering.compare(b, b) === 0)
75+
assert(signum(genOrdering.compare(a, b)) === -1 * signum(genOrdering.compare(b, a)))
76+
assert(signum(rowOrdering.compare(a, b)) === -1 * signum(rowOrdering.compare(b, a)))
77+
assert(
78+
signum(rowOrdering.compare(a, b)) === signum(genOrdering.compare(a, b)),
79+
"Generated and non-generated orderings should agree")
7980
}
8081
}
8182
}

0 commit comments

Comments
 (0)