Switch to scalatest and cross-compile to Scala 2.12

Author: rtyley

build.sbt

@@ -1,8 +1,8 @@
 import ReleaseTransformations._
 
 lazy val baseSettings = Seq(
-  scalaVersion := "2.11.11",
-  crossScalaVersions := Seq(scalaVersion.value, "2.10.6"),
+  scalaVersion := "2.12.3",
+  crossScalaVersions := Seq(scalaVersion.value, "2.11.11"),
   organization := "com.madgag.scala-git",
   scmInfo := Some(ScmInfo(
     url("https://github.com/rtyley/scala-git"),

project/Dependencies.scala

@@ -6,7 +6,7 @@ object Dependencies {
   val eclipseJgit = "org.eclipse.jgit" % "org.eclipse.jgit" % "4.0.1.201506240215-r"
   val jgit = eclipseJgit
 
-  val specs2 = "org.specs2" %% "specs2" % "2.3.13"
+  val scalatest = "org.scalatest" %% "scalatest" % "3.0.4"
 
   val madgagCompress = "com.madgag" % "util-compress" % "1.33"
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.0
+sbt.version=1.0.2

project/plugins.sbt

@@ -2,4 +2,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")

scala-git/build.sbt

@@ -4,5 +4,5 @@ description := "Scala veneer for JGit"
 
 libraryDependencies ++= Seq(
   jgit,
-  specs2 % "test"
+  scalatest % "test"
 )

scala-git/src/main/scala/com/madgag/git/package.scala

@@ -34,7 +34,7 @@ import org.eclipse.jgit.treewalk.filter.{AndTreeFilter, TreeFilter}
 import org.eclipse.jgit.util.FS
 
 import scala.annotation.tailrec
-import scala.collection.convert.wrapAsScala._
+import scala.collection.JavaConverters._
 import scala.language.implicitConversions
 import scala.util.{Success, Try}
 
@@ -77,7 +77,7 @@ package object git {
   implicit class RichObjectDirectory(objectDirectory: ObjectDirectory) {
 
     def packedObjects: Iterable[ObjectId] =
-      for { pack <- objectDirectory.getPacks ; entry <- pack } yield entry.toObjectId
+      for { pack <- objectDirectory.getPacks.asScala ; entry <- pack.asScala } yield entry.toObjectId
 
   }
 
@@ -91,7 +91,7 @@ package object git {
       (revWalk, revWalk.getObjectReader)
     }
 
-    def nonSymbolicRefs = repo.getAllRefs.values.filterNot(_.isSymbolic)
+    def nonSymbolicRefs = repo.getAllRefs.asScala.values.filterNot(_.isSymbolic)
 
   }
 
@@ -237,7 +237,7 @@ package object git {
   }
 
   implicit class RichObjectReader(reader: ObjectReader) {
-    def resolveUniquely(id: AbbreviatedObjectId): Try[ObjectId] = Try(reader.resolve(id).toList).flatMap {
+    def resolveUniquely(id: AbbreviatedObjectId): Try[ObjectId] = Try(reader.resolve(id).asScala.toList).flatMap {
       _ match {
         case fullId :: Nil => Success(fullId)
         case ids => val resolution = if (ids.isEmpty) "no Git object" else s"${ids.size} objects : ${ids.map(reader.abbreviate).map(_.name).mkString(",")}"
@@ -262,7 +262,7 @@ package object git {
   }
 
   def diff(trees: RevTree*)(implicit reader: ObjectReader): Seq[DiffEntry] =
-    DiffEntry.scan(walk(trees: _*)(TreeFilter.ANY_DIFF))
+    DiffEntry.scan(walk(trees: _*)(TreeFilter.ANY_DIFF)).asScala
 
   def allBlobsUnder(tree: RevTree)(implicit reader: ObjectReader): Set[ObjectId] =
     tree.walk().map(_.getObjectId(0)).toSet

scala-git/src/test/scala/com/madgag/git/ReachableBlobSpec.scala

@@ -16,19 +16,17 @@
 
 package com.madgag.git
 
-import org.specs2.mutable._
+import org.scalatest.{FlatSpec, Matchers}
 import com.madgag.git.test._
 
 
-class ReachableBlobSpec extends Specification {
+class ReachableBlobSpec extends FlatSpec with Matchers {
 
   implicit val repo = unpackRepo("/sample-repos/example.git.zip")
 
-  "reachable blobs" should {
-    "match expectations" in {
-      implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+  "reachable blobs" should "match expectations" in {
+    implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-      allBlobsReachableFrom(abbrId("475d") asRevCommit) mustEqual Set("d8d1", "34bd", "e69d", "c784", "d004").map(abbrId)
-    }
+    allBlobsReachableFrom(abbrId("475d") asRevCommit) shouldBe Set("d8d1", "34bd", "e69d", "c784", "d004").map(abbrId)
   }
 }

scala-git/src/test/scala/com/madgag/git/RichTreeWalkSpec.scala

@@ -16,71 +16,72 @@
 
 package com.madgag.git
 
-import org.specs2.mutable._
-import collection.mutable
 import com.madgag.git.test._
+import org.scalatest.{FlatSpec, Matchers}
 
+import scala.collection.mutable
 
-class RichTreeWalkSpec extends Specification {
+class RichTreeWalkSpec extends FlatSpec with Matchers {
 
    implicit val repo = unpackRepo("/sample-repos/example.git.zip")
 
-   "rich tree" should {
-     "implement exists" in {
-       implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+   "rich tree" should "implement exists" in {
+     implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-       val tree = abbrId("830e").asRevTree
+     val tree = abbrId("830e").asRevTree
 
-       tree.walk().exists(_.getNameString == "one-kb-random") must beTrue
-       tree.walk().exists(_.getNameString == "chimera") must beFalse
-     }
-     "implement map" in {
-       implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+     tree.walk().exists(_.getNameString == "one-kb-random") shouldBe true
+     tree.walk().exists(_.getNameString == "chimera") shouldBe false
+   }
+
+   it should "implement map" in {
+     implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+
+     val tree = abbrId("830e").asRevTree
+
+     val fileNameList = tree.walk().map(_.getNameString).toList
 
-       val tree = abbrId("830e").asRevTree
+     fileNameList should have size 6
 
-       val fileNameList = tree.walk().map(_.getNameString).toList
+     fileNameList.groupBy(identity).mapValues(_.size) should contain ("zero" -> 2)
+   }
+
+   it should "implement withFilter" in {
+     implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-       fileNameList must haveSize(6)
+     val tree = abbrId("830e").asRevTree
 
-       fileNameList.groupBy(identity).mapValues(_.size) must havePair("zero" -> 2)
-     }
-     "implement withFilter" in {
-       implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+     val filteredTreeWalk = tree.walk().withFilter(_.getNameString != "zero")
 
-       val tree = abbrId("830e").asRevTree
+     val filenames = filteredTreeWalk.map(_.getNameString).toList
 
-       val filteredTreeWalk = tree.walk().withFilter(_.getNameString != "zero")
+     filenames should have size 4
 
-       val filenames = filteredTreeWalk.map(_.getNameString).toList
+     filenames should not contain "zero"
+   }
 
-       filenames must haveSize(4)
+   it should "implement foreach" in {
+     implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-       filenames must not contain "zero"
-     }
-     "implement foreach" in {
-       implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+     val tree = abbrId("830e").asRevTree
 
-       val tree = abbrId("830e").asRevTree
+     val fileNames = mutable.Buffer[String]()
 
-       val fileNames = mutable.Buffer[String]()
+     tree.walk().foreach(tw => fileNames += tw.getNameString)
 
-       tree.walk().foreach(tw => fileNames += tw.getNameString)
+     fileNames.toList should have size 6
+   }
 
-       fileNames.toList must haveSize(6)
-     }
-     "work with for comprehensions" in {
-       implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+   it should "work with for comprehensions" in {
+     implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-       val tree = abbrId("830e").asRevTree
+     val tree = abbrId("830e").asRevTree
 
-       for (t <- tree.walk()) yield t.getNameString
+     for (t <- tree.walk()) yield t.getNameString
 
-       for (t <- tree.walk()) { t.getNameString }
+     for (t <- tree.walk()) { t.getNameString }
 
-       for (t <- tree.walk() if t.getNameString == "zero") { t.getDepth }
+     for (t <- tree.walk() if t.getNameString == "zero") { t.getDepth }
 
-       success
-     }
    }
  }

scala-git/src/test/scala/com/madgag/git/TreeOrBlobResolverSpec.scala

@@ -16,23 +16,18 @@
 
 package com.madgag.git
 
-
-import org.specs2.mutable._
-import collection.mutable
 import com.madgag.git.test._
+import org.scalatest.{EitherValues, FlatSpec, Matchers}
 
-
-class TreeOrBlobResolverSpec extends Specification {
+class TreeOrBlobResolverSpec extends FlatSpec with Matchers with EitherValues {
 
   implicit val repo = unpackRepo("/sample-repos/annotatedTagExample.git.zip")
 
-  "annotated tag" should {
-    "be correctly evaluated, not null" in {
-      implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
+  "annotated tag" should "be correctly evaluated, not null" in {
+    implicit val (revWalk, reader) = repo.singleThreadedReaderTuple
 
-      val annotatedTag = repo.resolve("chapter1").asRevTag
+    val annotatedTag = repo.resolve("chapter1").asRevTag
 
-      treeOrBlobPointedToBy(annotatedTag) must beRight(abbrId("4c6a"))
-    }
+    treeOrBlobPointedToBy(annotatedTag).right.value shouldBe abbrId("4c6a")
   }
 }

scala-git/src/test/scala/com/madgag/git/model/TreeEntrySpec.scala

@@ -16,19 +16,17 @@
 
 package com.madgag.git.model
 
-import org.eclipse.jgit.lib.ObjectId.zeroId
-import org.eclipse.jgit.lib.FileMode
-import FileMode._
-import org.specs2.mutable._
 import com.madgag.git.bfg.model.{FileName, Tree}
+import org.eclipse.jgit.lib.FileMode
+import org.eclipse.jgit.lib.FileMode._
+import org.eclipse.jgit.lib.ObjectId.zeroId
+import org.scalatest.{FlatSpec, Matchers}
 
-class TreeEntrySpec extends Specification {
+class TreeEntrySpec extends FlatSpec with Matchers {
 
   def a(mode: FileMode, name: String) = Tree.Entry(FileName(name), mode, zeroId)
 
-  "Tree entry ordering" should {
-    "match ordering used by Git" in {
-      a(TREE, "agit-test-utils") should be < a(TREE, "agit")
-    }
+  "Tree entry ordering" should "match ordering used by Git" in {
+    a(TREE, "agit-test-utils") should be < a(TREE, "agit")
   }
 }