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

fix scoping issue in launcher tests

This commit is contained in:
Mark Harrah 2012-12-04 21:08:38 -05:00
parent 005b2b356f
commit b7084ffa1f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
launch/src/test/scala/PreTest.scala
View File

@ -1,7 +1,7 @@
package xsbt.boot package xsbt.boot
import java.io.File import java.io.File
import java.util.Arrays.equals import java.util.Arrays.{equals => arrEquals}
import org.scalacheck._ import org.scalacheck._
object PreTest extends Properties("Pre") object PreTest extends Properties("Pre")
@ -17,8 +17,8 @@ object PreTest extends Properties("Pre")
property("require true") = Prop.forAll { (s: String) => require(true, s); true } property("require true") = Prop.forAll { (s: String) => require(true, s); true }
property("error") = Prop.forAll( (s: String) => Prop.throws(error(s), classOf[BootException]) ) property("error") = Prop.forAll( (s: String) => Prop.throws(error(s), classOf[BootException]) )
property("toBoolean") = Prop.forAll( (s: String) => trap(toBoolean(s)) == trap(java.lang.Boolean.parseBoolean(s)) ) property("toBoolean") = Prop.forAll( (s: String) => trap(toBoolean(s)) == trap(java.lang.Boolean.parseBoolean(s)) )
property("toArray") = Prop.forAll( (list: List[Int]) => equals(list.toArray, toArray(list)) ) property("toArray") = Prop.forAll( (list: List[Int]) => arrEquals(list.toArray, toArray(list)) )
property("toArray") = Prop.forAll( (list: List[String]) => equals(list.toArray, toArray(list)) ) property("toArray") = Prop.forAll( (list: List[String]) => objArrEquals(list.toArray, toArray(list)) )
property("concat") = Prop.forAll(genFiles, genFiles) { (a: Array[File], b: Array[File]) => (a ++ b) sameElements concat(a, b) } property("concat") = Prop.forAll(genFiles, genFiles) { (a: Array[File], b: Array[File]) => (a ++ b) sameElements concat(a, b) }
property("array") = Prop.forAll(genFiles) { (a: Array[File]) => array(a.toList : _*) sameElements Array(a: _*) } property("array") = Prop.forAll(genFiles) { (a: Array[File]) => array(a.toList : _*) sameElements Array(a: _*) }
@ -26,4 +26,7 @@ object PreTest extends Properties("Pre")
implicit lazy val genFiles: Gen[Array[File]] = Arbitrary.arbitrary[Array[File]] implicit lazy val genFiles: Gen[Array[File]] = Arbitrary.arbitrary[Array[File]]
def trap[T](t: => T): Option[T] = try { Some(t) } catch { case e: Exception => None } def trap[T](t: => T): Option[T] = try { Some(t) } catch { case e: Exception => None }
private[this] def objArrEquals[T <: AnyRef](a: Array[T], b: Array[T]): Boolean =
arrEquals(a.asInstanceOf[Array[AnyRef]], b.asInstanceOf[Array[AnyRef]])
} }