From c8057f414b4197d80ec1e816e02d2bb7b60d5198 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 20 Jan 2010 23:19:51 -0500
Subject: [PATCH] Add normal 'test' action to test arguments test case

---
 .../project/build/ArgumentTest.scala          | 10 ++++++
 src/sbt-test/tests/arguments/test             | 36 ++++++++++---------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
index 3ba7d55d1..3e2d610db 100644
--- a/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
+++ b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
@@ -4,4 +4,14 @@ class ArgumentTest(info: ProjectInfo) extends DefaultProject(info)
 {
 	val snap = ScalaToolsSnapshots
 	val st = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT"
+
+	override def testOptions =
+		super.testOptions ++
+		args("success1", "-n", "test2 test3") ++
+		args("success2", "-n", "test2") ++
+		args("success3", "-n", "test3") ++
+		args("failure1", "-n", "test1") ++
+		args("failure2", "-n", "test1 test4") ++
+		args("failure3", "-n", "test1 test3")
+	def args(path: Path, args: String*): Seq[TestOption] = if(path.exists) TestArgument(args : _*) :: Nil else Nil
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/arguments/test b/src/sbt-test/tests/arguments/test
index 15262a804..5939e290e 100644
--- a/src/sbt-test/tests/arguments/test
+++ b/src/sbt-test/tests/arguments/test
@@ -2,26 +2,28 @@
 > update
 
 # should fail because it should run all tests, some of which are expected to fail (1 and 4)
--> test-only ArgumentTest
+-> test
 
-# should fail because it should run the test tagged 'test1', which should fail
--> test-only ArgumentTest -- -n test1
+$ touch success1
+> test
+$ delete success1
 
-# should succeed because it should only run the test tagged 'test2', which should succeed
-> test-only ArgumentTest -- -n test2
+$ touch failure1
+-> test
+$ delete failure1
 
-# should succeed because it should only run the test tagged 'test3', which should succeed
-> test-only ArgumentTest -- -n test3
+$ touch success2
+> test
+$ delete success2
 
-# should fail because it should run the test tagged 'test4', which should fail
--> test-only ArgumentTest -- -n test4
+$ touch failure2
+-> test
+$ delete failure2
 
-# should succeed because it should only run the tests tagged 'test2' or 'test3', both of which should succeed
-> test-only ArgumentTest -- -n "test2 test3"
+$ touch success3
+> test
+$ delete success3
 
-# these should fail because they run at least one failed test
--> test-only ArgumentTest -- -n "test2 test4"
--> test-only ArgumentTest -- -n "test1 test2 test3"
--> test-only ArgumentTest -- -n "test2 test3 test4"
--> test-only ArgumentTest -- -n "test1 test2 test3 test4"
--> test-only ArgumentTest -- -n "test1 test3"
+$ touch failure3
+-> test
+$ delete failure3
\ No newline at end of file