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

use separate ivy home directories in component provider test so tests can run concurrently

This commit is contained in:
Mark Harrah 2013-03-18 09:52:57 -04:00
parent 6327e11a59
commit e69df1ae9c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,12 +50,13 @@ object ComponentManagerTest extends Specification
} }
"properly cache a file and then retrieve it to an unresolved component" in { "properly cache a file and then retrieve it to an unresolved component" in {
withManager { definingManager => withTemporaryDirectory { ivyHome =>
withManagerHome(ivyHome) { definingManager =>
val hash = defineFile(definingManager, TestID, "a") val hash = defineFile(definingManager, TestID, "a")
try try
{ {
definingManager.cache(TestID) definingManager.cache(TestID)
withManager { usingManager => withManagerHome(ivyHome) { usingManager =>
checksum(usingManager.file(TestID)(Fail)) must beEqualTo(hash) checksum(usingManager.file(TestID)(Fail)) must beEqualTo(hash)
} }
} }
@ -63,6 +64,7 @@ object ComponentManagerTest extends Specification
} }
} }
} }
}
private def checksum(files: Iterable[File]): Seq[String] = files.map(checksum).toSeq private def checksum(files: Iterable[File]): Seq[String] = files.map(checksum).toSeq
private def checksum(file: File): String = if(file.exists) ChecksumHelper.computeAsString(file, "sha1") else "" private def checksum(file: File): String = if(file.exists) ChecksumHelper.computeAsString(file, "sha1") else ""
private def defineFile(manager: ComponentManager, id: String, name: String): String = createFile(manager, id, name)(checksum) private def defineFile(manager: ComponentManager, id: String, name: String): String = createFile(manager, id, name)(checksum)
@ -78,5 +80,13 @@ object ComponentManagerTest extends Specification
private def writeRandomContent(file: File) = IO.write(file, randomString) private def writeRandomContent(file: File) = IO.write(file, randomString)
private def randomString = "asdf" private def randomString = "asdf"
private def withManager[T](f: ComponentManager => T): T = private def withManager[T](f: ComponentManager => T): T =
TestLogger( logger => withTemporaryDirectory { temp => f(new ComponentManager(xsbt.boot.Locks, new xsbt.boot.ComponentProvider(temp, true), None, logger)) } ) withTemporaryDirectory { ivyHome => withManagerHome(ivyHome)(f) }
private def withManagerHome[T](ivyHome: File)(f: ComponentManager => T): T =
TestLogger { logger =>
withTemporaryDirectory { temp =>
val mgr = new ComponentManager(xsbt.boot.Locks, new xsbt.boot.ComponentProvider(temp, true), Some(ivyHome), logger)
f(mgr)
}
}
} }