From a2595050b4ffc111890a648c13dcb6df8c733ee4 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 3 Jun 2010 19:01:27 +0000
Subject: [PATCH] NIHVIVO-239 Set up to run acceptance tests from Vivo.

---
 build.xml | 54 ++++++++++--------------------------------------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/build.xml b/build.xml
index e81c301f..f4677b2d 100644
--- a/build.xml
+++ b/build.xml
@@ -42,10 +42,10 @@
 	<property name="skip.core.themes" value="true" />
 
 	<!--
-		Tell the licesner where to find its properties for this product.
+		Tell the licenser where to find its properties for this product.
 	-->
-	<property name="licenser.product.properties.file" location="config/licenser/licenser.properties" />
-
+	<property name="licenser.product.properties.file"
+	          location="config/licenser/licenser.properties" />
 
 	<!--
 		Now get the standard product-build file.
@@ -53,47 +53,13 @@
 	<import file="${vitro.core.dir}/webapp/product-build.xml" />
 
 	<!-- ================================= 
-          target: acceptance             
-          
-          Hudson (continuous integration) 
-          uses this to run the acceptance 
-          tests. 
+          target: acceptance              
          ================================= -->
-	<target name="acceptance" description="--> Run the acceptance tests">
-		<property name="acceptance.properties.file"
-		          location="utilities/acceptance-tests/script/acceptance_test.properties" />
-		<fail message="You must create a &quot;${acceptance.properties.file}&quot; file.">
-			<condition>
-				<not>
-					<available file="${acceptance.properties.file}" />
-				</not>
-			</condition>
-		</fail>
-
-		<property name="acceptance.script.directory" location="utilities/acceptance-tests/script" />
-
-		<exec executable="ruby" dir="${acceptance.script.directory}" failonerror="true">
-			<arg value="run_acceptance_tests.rb" />
-			<arg value="${acceptance.properties.file}" />
-			<redirector outputproperty="acceptance.test.output" alwayslog="true" />
-		</exec>
-
-		<fail message="Errors were detected in the console output from the acceptance tests.">
-			<condition>
-				<or>
-					<contains string="${acceptance.test.output}"
-					          substring="error"
-					          casesensitive="false" />
-					<contains string="${acceptance.test.output}"
-					          substring="exception"
-					          casesensitive="false" />
-				</or>
-			</condition>
-		</fail>
-
-		<exec executable="ruby" dir="${acceptance.script.directory}" failonerror="true">
-			<arg value="output_manager.rb" />
-			<arg value="${acceptance.properties.file}" />
-		</exec>
+	<target name="acceptance" description="--> Run the Selenium acceptance tests.">
+		<ant dir="${vitro.core.dir}/utilities/testrunner" target="run" inheritall="false">
+			<property name="acceptance.dir" location="${basedir}/utilities/acceptance-tests" />
+			<property name="acceptance.batch" value="${acceptance.batch}" />
+		</ant>
 	</target>
+
 </project>