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

fix launcher tests

This commit is contained in:
Mark Harrah 2012-07-01 15:16:41 -04:00
parent 79bab4727a
commit 113fdbaff1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
launch/src/test/scala/ScalaProviderTest.scala
View File

@ -1,6 +1,7 @@
package xsbt.boot package xsbt.boot
import java.io.File import java.io.{File,InputStream}
import java.net.URL
import java.util.Properties import java.util.Properties
import xsbti._ import xsbti._
import org.specs._ import org.specs._
@ -70,16 +71,18 @@ object LaunchTest
f(Launcher(bootDirectory, testRepositories)) f(Launcher(bootDirectory, testRepositories))
} }
val finalStyle = Set("2.9.1", "2.9.0-1", "2.9.0", "2.8.2", "2.8.1", "2.8.0")
def unmapScalaVersion(versionNumber: String) = versionNumber.stripSuffix(".final") def unmapScalaVersion(versionNumber: String) = versionNumber.stripSuffix(".final")
def mapScalaVersion(versionNumber: String) = versionNumber + ".final" def mapScalaVersion(versionNumber: String) = if(finalStyle(versionNumber)) versionNumber + ".final" else versionNumber
def getScalaVersion: String = getScalaVersion(getClass.getClassLoader) def getScalaVersion: String = getScalaVersion(getClass.getClassLoader)
def getScalaVersion(loader: ClassLoader): String = loadProperties(loader, "library.properties").getProperty("version.number") def getScalaVersion(loader: ClassLoader): String = getProperty(loader, "library.properties", "version.number")
lazy val AppVersion = loadProperties(getClass.getClassLoader, "xsbt.version.properties").getProperty("version") lazy val AppVersion = getProperty(getClass.getClassLoader, "xsbt.version.properties", "version")
private def getProperty(loader: ClassLoader, res: String, key: String) = loadProperties(loader, res).getProperty(key)
private def loadProperties(loader: ClassLoader, res: String): Properties = private[this] def getProperty(loader: ClassLoader, res: String, prop: String) = loadProperties(loader.getResourceAsStream(res)).getProperty(prop)
private[this] def loadProperties(propertiesStream: InputStream): Properties =
{ {
val properties = new java.util.Properties val properties = new Properties
val propertiesStream = loader.getResourceAsStream(res)
try { properties.load(propertiesStream) } finally { propertiesStream.close() } try { properties.load(propertiesStream) } finally { propertiesStream.close() }
properties properties
} }