Skip to content

Commit c818566

Browse files
committed
Use matchers, maybe the asserts were getting misplaced?
1 parent 25c91af commit c818566

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/test/scala/com/sparklingpandas/sparklingml/feature/LuceneAnalyzerGeneratorsTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ package com.sparklingpandas.sparklingml.feature
1919

2020
import sys.process._
2121

22-
import org.scalatest.FunSuite
22+
import org.scalatest._
2323

24-
class LuceneAnalyzerGeneratorsTest extends FunSuite {
24+
class LuceneAnalyzerGeneratorsTest extends FunSuite with Matchers{
2525
test("verify the generated code is up to date") {
2626
LuceneAnalyzerGenerators.main(Array[String]())
2727
val basePath = "scala/com/sparklingpandas/sparklingml/feature/"
2828
val testResult = s"git diff -q ./src/test/${basePath}LuceneAnalyzersTests.scala".!
2929
val transformResult = s"git diff -q ./src/main/${basePath}LuceneAnalyzers.scala".!
30-
assert(testResult === 0)
31-
assert(transformResult === 0)
30+
testResult shouldBe 0
31+
transformResult shouldBe 0
3232
}
3333
}

src/test/scala/com/sparklingpandas/sparklingml/feature/LuceneBaseTests.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.apache.spark.ml.param._
2121

2222
import org.apache.lucene.analysis.Analyzer
2323

24-
import org.scalatest.FunSuite
24+
import org.scalatest._
2525

2626
import com.holdenkarau.spark.testing.DataFrameSuiteBase
2727

@@ -30,7 +30,7 @@ import com.sparklingpandas.sparklingml.param._
3030
case class InputData(input: String)
3131

3232
abstract class LuceneTransformerTest[T <: LuceneTransformer[_]] extends
33-
FunSuite with DataFrameSuiteBase {
33+
FunSuite with DataFrameSuiteBase with Matchers {
3434
val transformer: T
3535

3636
test("verify that the transformer runs") {
@@ -39,7 +39,7 @@ abstract class LuceneTransformerTest[T <: LuceneTransformer[_]] extends
3939
List(InputData("hi"), InputData("boo"), InputData("boop")))
4040
transformer.setInputCol("input")
4141
val result = transformer.transform(input).collect()
42-
assert(result.size === 3)
42+
result.size shouldBe 3
4343
}
4444
}
4545

@@ -54,7 +54,7 @@ abstract class LuceneStopwordTransformerTest[T <: LuceneTransformer[_]] extends
5454
thst.setStopwords(Array("boop"))
5555
transformer.asInstanceOf[T].setInputCol("input")
5656
val result = transformer.transform(input).collect()
57-
assert(result.size === 3)
58-
assert(result(2).getSeq(1).isEmpty)
57+
result.size shouldBe 3
58+
result(2).getSeq(1) shouldBe empty
5959
}
6060
}

src/test/scala/com/sparklingpandas/sparklingml/param/SharedParamsCodeGenTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package com.sparklingpandas.sparklingml.param
1919

2020
import sys.process._
2121

22-
import org.scalatest.FunSuite
22+
import org.scalatest._
2323

24-
class SharedParamsCodeGenTest extends FunSuite {
24+
class SharedParamsCodeGenTest extends FunSuite with Matchers {
2525
test("verify the generated code is up to date") {
2626
SharedParamsCodeGen.main(Array[String]())
2727
val basePath = "scala/com/sparklingpandas/sparklingml/param/"
2828
val result = s"git diff -q ./src/main/${basePath}/sharedParams.scala".!
29-
assert(result === 0)
29+
result shouldBe 0
3030
}
3131
}

0 commit comments

Comments
 (0)