simplied QpidTestCase's interface for running non vm brokers and set up build system to run cpp tests easily

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619888 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 0 deletions

diff --git a/java/module.xml b/java/module.xml
index d723aef0e2..d80a2c0f56 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -110,6 +110,7 @@
     <mkdir dir="${build.etc}"/>
     <mkdir dir="${build.lib}"/>
     <mkdir dir="${build.results}"/>
+    <mkdir dir="${build.data}"/>
     <mkdir dir="${module.classes}"/>
     <mkdir dir="${module.precompiled}"/>
     <mkdir dir="${module.api}"/>
@@ -156,20 +157,40 @@
   </target>
 
   <property name="test" value="*Test"/>
+
   <property name="log" value="info"/>
   <property name="amqj.logging.level" value="${log}"/>
   <property name="root.logging.level" value="${log}"/>
   <property name="log4j.configuration" value="file://${project.root}/log4j-test.xml"/>
 
+  <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/>
+  <property name="java.naming.provider.url" value="${project.root}/test-provider.properties"/>
+
+  <condition property="broker" value="${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t" else="vm">
+    <isset property="cpp"/>
+  </condition>
+
+  <condition property="broker.version" value="0-10" else="0-8">
+    <isset property="cpp"/>
+  </condition>
+
   <target name="test" depends="compile-tests" if="module.test.src.exists"
           description="execute unit tests">
     <junit fork="yes" haltonfailure="no" printsummary="on" timeout="90000">
+
       <sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
       <sysproperty key="root.logging.level" value="${root.logging.level}"/>
       <sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
+      <sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>
+      <sysproperty key="java.naming.provider.url" value="${java.naming.provider.url}"/>
+      <sysproperty key="broker" value="${broker}"/>
+      <sysproperty key="broker.version" value="${broker.version}"/>
+
       <formatter type="plain"/>
       <formatter type="xml"/>
+
       <classpath refid="module.test.path"/>
+
       <batchtest fork="yes" todir="${build.results}">
         <fileset dir="${module.test.src}">
           <include name="**/${test}.java"/>