From aae8b084caccac9b18d2382654139f4c6050f2e4 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 7 May 2011 22:02:05 -0400
Subject: [PATCH] test fixes

---
 sbt/src/sbt-test/project/flatten/project/Flat.scala    | 10 ++++------
 .../project/src-plugins/plugin/TestPlugin.scala        |  2 +-
 sbt/src/sbt-test/tests/it/project/B.scala              |  9 ++++-----
 tasks/Execute.scala                                    |  1 +
 tasks/src/test/scala/DemoTask.scala                    |  2 +-
 tasks/standard/src/test/scala/TaskSerial.scala         |  2 +-
 util/complete/src/test/scala/ParserTest.scala          |  2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sbt/src/sbt-test/project/flatten/project/Flat.scala b/sbt/src/sbt-test/project/flatten/project/Flat.scala
index af3e6588d..5ed835641 100644
--- a/sbt/src/sbt-test/project/flatten/project/Flat.scala
+++ b/sbt/src/sbt-test/project/flatten/project/Flat.scala
@@ -17,12 +17,10 @@ object Flat extends Build
 	def forConfig(conf: Configuration, name: String) = Project.inConfig(conf)( unpackageSettings(name) )
 
 	def unpackageSettings(name: String) = Seq(
-		sourceDirectories := file(name) :: Nil,
-		resourceDirectories :== sourceDirectories,
-		resources <<= (sourceDirectories, sourceFilter, defaultExcludes) map {
-		 (srcs, filter, excl) => srcs.descendentsExcept(-filter,excl).getFiles.toSeq
-		},
-		unpackage <<= (jarPath in packageSrc, baseDirectory) map { (jar, base) =>
+		unmanagedSourceDirectories <<= baseDirectory( base => (base / name) :: Nil ),
+		defaultExcludes in unmanagedResources <<= sourceFilter.identity,
+		unmanagedResourceDirectories <<= unmanagedSourceDirectories.identity,
+		unpackage <<= (artifactPath in packageSrc, baseDirectory) map { (jar, base) =>
 			IO.unzip(jar, base / name)
 		}
 	)
diff --git a/sbt/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala b/sbt/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala
index 5f5ce1ae5..d75d8cd35 100644
--- a/sbt/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala
+++ b/sbt/src/sbt-test/project/src-plugins/plugin/TestPlugin.scala
@@ -3,7 +3,7 @@ import sbt._
 object TestPlugin extends Plugin
 {
 	val Check = TaskKey[Unit]("check")
-	def settings = Seq(
+	override def settings = Seq(
 		Check := assert(JavaTest.X == 9)
 	)
 }
\ No newline at end of file
diff --git a/sbt/src/sbt-test/tests/it/project/B.scala b/sbt/src/sbt-test/tests/it/project/B.scala
index 085637f61..b4ced5412 100644
--- a/sbt/src/sbt-test/tests/it/project/B.scala
+++ b/sbt/src/sbt-test/tests/it/project/B.scala
@@ -1,15 +1,14 @@
-import sbt._
-import Keys._
+	import sbt._
+	import Keys._
 
 object B extends Build
 {
 	lazy val projects = Seq(root)
 	lazy val root =
 		Project("root", file("."))
-			.configs( it )
-			.settings( LibraryDependencies += specs )
+			.configs( IntegrationTest )
+			.settings( libraryDependencies += specs )
 			.settings( Defaults.itSettings : _*)
 
-	lazy val it = Configurations.IntegrationTest
 	lazy val specs = "org.scala-tools.testing" %% "specs" % "1.6.7.2" % "it,test" intransitive()
 }
\ No newline at end of file
diff --git a/tasks/Execute.scala b/tasks/Execute.scala
index d43662ce1..cc791eab9 100644
--- a/tasks/Execute.scala
+++ b/tasks/Execute.scala
@@ -22,6 +22,7 @@ object Execute
 	private[sbt] def completed(p: => Unit): Completed = new Completed {
 		def process() { p }
 	}
+	def noTriggers[A[_]] = new Triggers[A](Map.empty, Map.empty)
 }
 sealed trait Completed {
 	def process(): Unit
diff --git a/tasks/src/test/scala/DemoTask.scala b/tasks/src/test/scala/DemoTask.scala
index fab5d7682..1463b2652 100644
--- a/tasks/src/test/scala/DemoTask.scala
+++ b/tasks/src/test/scala/DemoTask.scala
@@ -139,7 +139,7 @@ object Task
 	{
 		val (service, shutdown) = CompletionService[Task[_], Completed](maxWorkers)
 		
-		val x = new Execute[Task](checkCycles)(taskToNode)
+		val x = new Execute[Task](checkCycles, Execute.noTriggers)(taskToNode)
 		try { x.run(root)(service) } finally { shutdown() }
 	}
 	def tryRun[T](root: Task[T], checkCycles: Boolean, maxWorkers: Int): T =
diff --git a/tasks/standard/src/test/scala/TaskSerial.scala b/tasks/standard/src/test/scala/TaskSerial.scala
index f2a542e5d..db1564e54 100644
--- a/tasks/standard/src/test/scala/TaskSerial.scala
+++ b/tasks/standard/src/test/scala/TaskSerial.scala
@@ -33,7 +33,7 @@ object TaskTest
 	{
 		val (service, shutdown) = CompletionService[Task[_], Completed](maxWorkers)
 		
-		val x = new Execute[Task](checkCycles)(taskToNode)
+		val x = new Execute[Task](checkCycles, Execute.noTriggers)(taskToNode)
 		try { x.run(root)(service) } finally { shutdown() }
 	}
 	def tryRun[T](root: Task[T], checkCycles: Boolean, maxWorkers: Int): T =
diff --git a/util/complete/src/test/scala/ParserTest.scala b/util/complete/src/test/scala/ParserTest.scala
index 111f2cbb6..931c01f01 100644
--- a/util/complete/src/test/scala/ParserTest.scala
+++ b/util/complete/src/test/scala/ParserTest.scala
@@ -110,7 +110,7 @@ object ParserExample
 		val ann = aqn ~ an
 
 		def r = apply(ann)("a"*(n*2)).resultEmpty
-		println(r.isDefined)
+		println(r.isValid)
 	}
 	def run2(n: Int)
 	{