luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1316 from sbt/wip/fix-broken-build 

This doesn't quite fix the build, but gets closer
This commit is contained in:
eugene yokota 2014-05-07 12:23:09 -04:00
parent b201e0431a fc5da1fa65
commit d3aa84ff7a
3 changed files with 210 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ivy/src/test/scala/ComponentManagerTest.scala
View File

@ -7,8 +7,7 @@ import IO.{createDirectory, delete, touch, withTemporaryDirectory}
import org.apache.ivy.util.ChecksumHelper import org.apache.ivy.util.ChecksumHelper
import IfMissing.Fail import IfMissing.Fail
object ComponentManagerTest extends Specification object ComponentManagerTest extends Specification {
{
val TestID = "manager-test" val TestID = "manager-test"
"Component manager" should { "Component manager" should {
"throw an exception if 'file' is called for a non-existing component" in { "throw an exception if 'file' is called for a non-existing component" in {
@ -53,14 +52,12 @@ object ComponentManagerTest extends Specification
withTemporaryDirectory { ivyHome => withTemporaryDirectory { ivyHome =>
withManagerHome(ivyHome) { definingManager => withManagerHome(ivyHome) { definingManager =>
val hash = defineFile(definingManager, TestID, "a") val hash = defineFile(definingManager, TestID, "a")
try try {
{
definingManager.cache(TestID) definingManager.cache(TestID)
withManagerHome(ivyHome) { usingManager => withManagerHome(ivyHome) { usingManager =>
checksum(usingManager.file(TestID)(Fail)) must beEqualTo(hash) checksum(usingManager.file(TestID)(Fail)) must beEqualTo(hash)
} }
} } finally { definingManager.clearCache(TestID) }
finally { definingManager.clearCache(TestID) }
} }
} }
} }

3
ivy/src/test/scala/CrossVersionTest.scala
View File

@ -4,8 +4,7 @@ import java.io.File
import org.specs2._ import org.specs2._
import mutable.Specification import mutable.Specification
object CrossVersionTest extends Specification object CrossVersionTest extends Specification {
{
"Cross version" should { "Cross version" should {
"return sbt API for xyz as None" in { "return sbt API for xyz as None" in {
CrossVersion.sbtApiVersion("xyz") must_== None CrossVersion.sbtApiVersion("xyz") must_== None

3
ivy/src/test/scala/MakePomTest.scala
View File

@ -4,8 +4,7 @@ import java.io.File
import org.specs2._ import org.specs2._
import mutable.Specification import mutable.Specification
object MakePomTest extends Specification object MakePomTest extends Specification {
{
val mp = new MakePom(ConsoleLogger()) val mp = new MakePom(ConsoleLogger())
import mp.{ makeDependencyVersion => v } import mp.{ makeDependencyVersion => v }
"MakePom makeDependencyVersion" should { "MakePom makeDependencyVersion" should {