Remove dependency on TestNG

cquiroz · cquiroz · commit 73942a74421d · 2017-05-10T17:21:36.000-03:00
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,4 @@
 import sbt._
-import io.github.soc.testng.{TestNGPlugin, TestNGScalaJSPlugin}
 import TZDBTasks._
 
 enablePlugins(MicrositesPlugin)
@@ -128,8 +127,6 @@ def copyAndReplace(srcDirs: Seq[File], destinationDir: File): Seq[File] = {
 }
 
 lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
-  .jvmConfigure(_.enablePlugins(TestNGPlugin))
-  .jsConfigure(_.enablePlugins(TestNGScalaJSPlugin))
   .settings(commonSettings: _*)
   .jvmSettings(
     resolvers += Resolver.sbtPluginRepo("releases"),
@@ -138,8 +135,7 @@ lazy val scalajavatime = crossProject.crossType(CrossType.Full).in(file("."))
     baseDirectory in Test := baseDirectory.value.getParentFile,
     // Use CLDR provider for locales
     // https://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
-    javaOptions in Test ++= Seq("-Duser.language=en", "-Duser.country=US", "-Djava.locale.providers=CLDR"),
-    TestNGPlugin.testNGSuites := Seq(((resourceDirectory in Test).value / "testng.xml").absolutePath)
+    javaOptions in Test ++= Seq("-Duser.language=en", "-Duser.country=US", "-Djava.locale.providers=CLDR")
   ).jsSettings(
     tzDbSettings: _*
   ).jsSettings(
diff --git a/changes.xml b/changes.xml
@@ -10,6 +10,9 @@
   <body>
     <!-- types are add, fix, remove, update -->
     <release version="2.0.0-M11" date="2017-04-16" description="v2.0.0-M11">
+      <action dev="cquiroz" type="update" >
+        Port all tests to scalatest
+      </action>
       <action dev="alonsodomin" type="update" >
         Support localized timezone names
       </action>
diff --git a/jvm/src/test/resources/testng.xml b/jvm/src/test/resources/testng.xml
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,6 @@ import sbt.Keys._
 resolvers += Resolver.sonatypeRepo("public")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.15")
-addSbtPlugin("io.github.soc" % "sbt-testng" % "4.0.0-M3")
 addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15")
 
 addSbtPlugin("com.fortysevendeg"  % "sbt-microsites" % "0.3.3")
