finish killing junit

scalanlp · Apr 14, 2019 · bd7b6ed · bd7b6ed
1 parent 7f9d0da
commit bd7b6ed
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 68 deletions.
diff --git a/math/src/test/scala/breeze/collection/immutable/BeamTest.scala b/math/src/test/scala/breeze/collection/immutable/BeamTest.scala
@@ -18,10 +18,7 @@ package breeze.collection.immutable
 
 import org.scalacheck._
 import org.scalatest._;
-import org.scalatest.junit._;
 import org.scalatestplus.scalacheck._;
-import org.junit.runner.RunWith
-
 
 class BeamTest extends FunSuite with Checkers {
   test("creation doesn't go over size") {

diff --git a/math/src/test/scala/breeze/optimize/flow/LPMaxFlowTest.scala b/math/src/test/scala/breeze/optimize/flow/LPMaxFlowTest.scala
@@ -1,16 +1,6 @@
 package breeze.optimize.flow
 
-import org.scalatest._;
-import org.scalatest.junit._;
-import org.scalatestplus.scalacheck._;
-import org.scalacheck._;
-import org.junit.runner.RunWith
-
-/**
- *
- * @author dlwh
- */
-
+import org.scalatest._
 
 class LPMaxFlowTest extends FunSuite {
 

diff --git a/math/src/test/scala/breeze/optimize/linear/AffineScalingTest.scala b/math/src/test/scala/breeze/optimize/linear/AffineScalingTest.scala
@@ -16,18 +16,9 @@ package breeze.optimize.linear
  */
 
 import org.scalatest._
-import org.scalatest.junit._
-import org.scalatestplus.scalacheck._
-import org.scalacheck._
-import org.junit.runner.RunWith
 
 import breeze.linalg._
 
-/**
- *
- * @author dlwh
- */
-
 class AffineScalingTest extends FunSuite {
   // from: http://en.wikipedia.org/wiki/Karmarkar's_algorithm
   test("Small example") {

diff --git a/math/src/test/scala/breeze/optimize/linear/CompetitiveLinkingTest.scala b/math/src/test/scala/breeze/optimize/linear/CompetitiveLinkingTest.scala
@@ -1,11 +1,7 @@
 package breeze.optimize.linear
 
-import org.scalatest._;
-import org.scalatest.junit._;
-import org.scalatestplus.scalacheck._;
-
-import org.junit.runner.RunWith
-
+import org.scalatest._
+import org.scalatestplus.scalacheck._
 
 class CompetitiveLinkingTest extends FunSuite with Checkers {
   test("sanity check") {

diff --git a/math/src/test/scala/breeze/optimize/linear/ConjugateGradientTest.scala b/math/src/test/scala/breeze/optimize/linear/ConjugateGradientTest.scala
@@ -1,14 +1,7 @@
 package breeze.optimize.linear
 
 import breeze.linalg._
-import org.junit.runner.RunWith
 import org.scalatest._
-import org.scalatest.junit._
-
-/**
- *
- * @author dlwh
- */
 
 class ConjugateGradientTest extends FunSuite {
 

diff --git a/math/src/test/scala/breeze/optimize/linear/InteriorPointTest.scala b/math/src/test/scala/breeze/optimize/linear/InteriorPointTest.scala
@@ -17,17 +17,8 @@ package breeze.optimize.linear
  */
 
 import org.scalatest._
-import org.scalatest.junit._
-
-import org.junit.runner.RunWith
-
 import breeze.linalg._
 
-/**
- *
- * @author dlwh
- */
-
 class InteriorPointTest extends FunSuite {
   // from: http://en.wikipedia.org/wiki/Karmarkar's_algorithm
   test("Small example") {

diff --git a/math/src/test/scala/breeze/optimize/linear/KuhnMunkresTest.scala b/math/src/test/scala/breeze/optimize/linear/KuhnMunkresTest.scala
@@ -1,11 +1,8 @@
 package breeze.optimize.linear
 
-import org.scalatest._;
-import org.scalatest.junit._;
-import org.scalatestplus.scalacheck._;
-import org.scalacheck._;
-import org.junit.runner.RunWith
-
+import org.scalatest._
+import org.scalatestplus.scalacheck._
+import org.scalacheck._
 
 class KuhnMunkresTest extends FunSuite with Checkers {
 

diff --git a/math/src/test/scala/breeze/optimize/linear/PowerMethodTest.scala b/math/src/test/scala/breeze/optimize/linear/PowerMethodTest.scala
@@ -1,12 +1,9 @@
 package breeze.optimize.linear
 
 import breeze.numerics.abs
-import org.junit.runner.RunWith
 import org.scalatest._
-import org.scalatest.junit._
 import breeze.linalg._
 
-
 class PowerMethodTest extends FunSuite {
   val n = 5
   val gram = new DenseMatrix[Double](

diff --git a/math/src/test/scala/breeze/optimize/proximal/NonlinearMinimizerTest.scala b/math/src/test/scala/breeze/optimize/proximal/NonlinearMinimizerTest.scala
@@ -3,13 +3,10 @@ package breeze.optimize.proximal
 import breeze.linalg.{sum, DenseMatrix, norm, DenseVector}
 import breeze.optimize.proximal.Constraint._
 import breeze.optimize.OptimizeTestBase
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
 import breeze.numerics._
 
 import org.scalatest.Matchers
 
-
 class NonlinearMinimizerTest extends OptimizeTestBase with Matchers {
   val n = 5
   val H = new DenseMatrix(

diff --git a/math/src/test/scala/breeze/optimize/proximal/QuadraticMinimizerTest.scala b/math/src/test/scala/breeze/optimize/proximal/QuadraticMinimizerTest.scala
@@ -3,14 +3,11 @@ package breeze.optimize.proximal
 import breeze.numerics.abs
 import breeze.optimize.linear.NNLS
 import org.scalatest._
-import org.scalatest.junit._
-import org.junit.runner.RunWith
 import breeze.linalg._
 import breeze.optimize._
 import breeze.optimize.proximal.Constraint._
 import breeze.numerics._
 
-
 class QuadraticMinimizerTest extends OptimizeTestBase with Matchers {
   def matricesNearlyEqual(A: DenseMatrix[Double], B: DenseMatrix[Double], threshold: Double = 1E-6) {
     for (i <- 0 until A.rows; j <- 0 until A.cols)

diff --git a/math/src/test/scala/breeze/polynomial/DensePolynomialTest.scala b/math/src/test/scala/breeze/polynomial/DensePolynomialTest.scala
@@ -16,20 +16,13 @@ package breeze.polynomial
  limitations under the License.
  */
 
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.FunSuite
 import breeze.linalg.{DenseVector, DenseMatrix, norm}
 import spire.math._
 import spire.math.poly._
 import spire.algebra._
 import spire.implicits._
 
-/**
- *
- * @author dlw
- */
-
 class DensePolynomialTest extends FunSuite {
 
   test("PolyDenseUfuncWrapper applied to doubles") {

diff --git a/project/Build.scala b/project/Build.scala
@@ -22,7 +22,6 @@ object Common {
     javacOptions ++= Seq("-target", "1.7", "-source", "1.7"),
     credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
     libraryDependencies ++= Seq(
-      "junit" % "junit" % "4.12" % "test",
       "org.scalacheck" %% "scalacheck" % "1.14.0" % "test",
       "org.scalatest" %% "scalatest" % "3.0.8-RC2" % "test"
     ),