Add capability to use default props in a test run

restsql · restsql · commit 6266b7962438 · 2014-08-17T10:03:56.000-04:00
diff --git a/build.properties b/build.properties
@@ -7,4 +7,5 @@ test-exec.classpath=${test-compile.classpath};${restsql-lib.dir}/mysql-connector
 test.list=src/resources/xml/service/testcase/_tests.txt
 org.restsql.baseUri=http://localhost:8080/restsql/
 org.restsql.properties=/resources/properties/restsql-mysql.properties
+org.restsql.default-properties=../restsql/src/resources/properties/default-restsql.properties
 org.restsql.testDatabase=sakila
diff --git a/build.xml b/build.xml
@@ -124,6 +124,15 @@
 		</antcall>
 	</target>
 
+	<target name="test-service-java-default-properties" description="executes all test cases for the service's java interface, excluding security">
+		<antcall target="-test-service">
+			<param name="style" value="java" />
+			<param name="scope" value="all" />
+			<param name="exclude" value="Security" />
+			<param name="propertiesFile" value="${org.restsql.default-properties}" />
+		</antcall>
+	</target>
+
 	<target name="test-service-java-subset" description="executes some test cases for the service's java interface">
 		<antcall target="-test-service">
 			<param name="style" value="java" />
@@ -133,12 +142,13 @@
 	</target>
 
 	<target name="-test-service" depends="compile-tests">
+		<property name="propertiesFile" value="${org.restsql.properties}" />
 		<java fork="true" classpath="${test-exec.classpath}" classname="org.restsql.service.ServiceTestRunner" dir="${basedir}">
 			<arg value="${style}" />
 			<arg value="${scope}" />
 			<arg value="${exclude}" />
 			<jvmarg value="-Dorg.restsql.baseUri=${org.restsql.baseUri}" />
-			<jvmarg value="-Dorg.restsql.properties=${org.restsql.properties}" />
+			<jvmarg value="-Dorg.restsql.properties=${propertiesFile}" />
 			<jvmarg value="-Dorg.restsql.testDatabase=${org.restsql.testDatabase}" />
 		</java>
 	</target>
