TST: Add better test errors and messages

MechCoder · MechCoder · commit 64e6d2d993dc · 2015-01-10T02:23:39.000+05:30
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/IndexedRowMatrix.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/IndexedRowMatrix.scala
@@ -103,7 +103,8 @@ class IndexedRowMatrix(
       computeU: Boolean = false,
       rCond: Double = 1e-9): SingularValueDecomposition[IndexedRowMatrix, Matrix] = {
 
-    require(k >= 1, "k should be at least one.")
+    val n = numCols().toInt
+    require(k > 0 && k <= n, s"Requested k singular values but got k=$k and numCols=$n.")
     val indices = rows.map(_.index)
     val svd = toRowMatrix().computeSVD(k, computeU, rCond)
     val U = if (computeU) {
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/distributed/RowMatrix.scala
@@ -212,7 +212,7 @@ class RowMatrix(
       tol: Double,
       mode: String): SingularValueDecomposition[RowMatrix, Matrix] = {
     val n = numCols().toInt
-    require(k > 0 && k <= n, s"Request up to n singular values but got k=$k and n=$n.")
+    require(k > 0 && k <= n, s"Requested k singular values but got k=$k and numCols=$n.")
 
     object SVDMode extends Enumeration {
       val LocalARPACK, LocalLAPACK, DistARPACK = Value
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/distributed/IndexedRowMatrixSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/distributed/IndexedRowMatrixSuite.scala
@@ -115,14 +115,11 @@ class IndexedRowMatrixSuite extends FunSuite with MLlibTestSparkContext {
 
   test("validate k in svd") {
     val A = new IndexedRowMatrix(indexedRows)
-    try {
-        A.computeSVD(-1)
-      } catch {
-        case ie: IllegalArgumentException =>
-      }
+    intercept[IllegalArgumentException] {
+      A.computeSVD(-1)
+    }
   }
 
-
   def closeToZero(G: BDM[Double]): Boolean = {
     G.valuesIterator.map(math.abs).sum < 1e-6
   }
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/linalg/distributed/RowMatrixSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/linalg/distributed/RowMatrixSuite.scala
@@ -173,12 +173,8 @@ class RowMatrixSuite extends FunSuite with MLlibTestSparkContext {
 
   test("validate k in svd") {
     for (mat <- Seq(denseMat, sparseMat)) {
-      for (mode <- Seq("auto", "local-svd", "local-eigs", "dist-eigs")) {
-        try {
-          mat.computeSVD(-1, computeU = true, 1e-6, 300, 1e-10, mode)
-          } catch {
-            case ie: IllegalArgumentException =>
-          }
+      intercept[IllegalArgumentException] {
+        mat.computeSVD(-1)
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,8 @@ class RowMatrixSuite extends FunSuite with MLlibTestSparkContext {`
`173`	`173`
`174`	`174`	`test("validate k in svd") {`
`175`	`175`	`for (mat <- Seq(denseMat, sparseMat)) {`
`176`		`- for (mode <- Seq("auto", "local-svd", "local-eigs", "dist-eigs")) {`
`177`		`- try {`
`178`		`- mat.computeSVD(-1, computeU = true, 1e-6, 300, 1e-10, mode)`
`179`		`- } catch {`
`180`		`- case ie: IllegalArgumentException =>`
`181`		`- }`
	`176`	`+ intercept[IllegalArgumentException] {`
	`177`	`+ mat.computeSVD(-1)`
`182`	`178`	`}`
`183`	`179`	`}`
`184`	`180`	`}`