synchronise netbeans debug specific slick with latest build.xml

ide/nbproject/ide-file-targets.xml

@@ -9,44 +9,55 @@
     <import file="../build.xml"/>
 
     <target name="debug-selected-file-in-test"
-            depends="init,version,prepare-single-test,prepare-all-tests"
+            depends="prepare-all-tests,-deploy-os-specific-bundles"
             description="Starts felix and debugs the selected Service Impl Compatibility Kit" >
         <!-- This target runs felix under the debugger, but it can only work with
              unit test classes that extend TestSuite and implements BundleActivator
              e.g. GibberishProtocolProviderServiceLick -->
-        <fail unless="test.name"
+        <fail unless="test.name.known"
               message="debug impossible when 'test.name' property not defined!" />
 
-        <ant antfile="build.xml" inheritall="false" target="-deploy-os-specific-bundles"/>
+        <!-- we allow users to pass command line args using the "args" system
+             property. However we need to manually set tha prop to an empty
+             string here or otherwise the application would get an argument with
+             the value ${args}-->
+        <property name="args" value=""/>
 
-        <nbjpdastart name="${test.name}"
+        <nbjpdastart name="${short.test.name}"
                      addressproperty="jpda.address"
                      transport="dt_socket" >
             <classpath refid="debug.class.path" />
             <sourcepath refid="project.source.path" />
         </nbjpdastart>
 
-        <!-- warning! fork=true prevents debug break points latching... -->
+        <!-- fork=true no longer prevents debug break points latching... -->
         <java fork="true"
               classname="org.apache.felix.main.Main"
+              resultproperty="test.result.code"
               failonerror="true" >
+
             <classpath refid="debug.class.path"/>
             <jvmarg value="-Xdebug"/>
             <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-            <arg value="${test.name}"/>
 
-            <!-- The following two configure felix telling it that it's running
-                 as a test environment-->
+            <!-- Tell felix to run as a test environment-->
             <sysproperty key="felix.config.properties"
-                value="file:${lib}/felix.unit.test.properties"/>
+                         value="file:${lib}/felix.unit.test.properties"/>
 
             <!-- Tell the slick runner where to store test results. -->
             <sysproperty key="net.java.sip.communicator.slick.runner.OUTPUT_DIR"
-                value="${test.reports.dir}"/>
+                         value="${test.reports.dir}"/>
 
-            <!-- Tell the slick runner which Test class to run. -->
+            <!-- Tell the slick runner which Test classes to run. -->
             <sysproperty key="net.java.sip.communicator.slick.runner.TEST_LIST"
-                value="${simple.test.names}"/>
+                         value="${net.java.sip.communicator.slick.runner.TEST_LIST}"/>
+
+            <!-- use a meta contact list file different to normal client. -->
+            <sysproperty key="net.java.sip.communicator.CONTACTLIST_FILE_NAME"
+                         value="net.java.sip.communicator.CONTACTLIST_FILE_NAME"/>
+            <!-- use a configuration file different to normal client. -->
+            <sysproperty key="net.java.sip.communicator.CONFIGURATION_FILE_NAME"
+                         value="net.java.sip.communicator.CONFIGURATION_FILE_NAME"/>
 
             <!-- Tell java.util.logging about our logging preferences -->
             <sysproperty key="java.util.logging.config.file"
@@ -57,8 +68,37 @@
               <propertyref prefix="accounts"/>
               <propertyref prefix="net"/>
             </syspropertyset>
+
+            <sysproperty key="java.net.preferIPv6Addresses"
+                value="false"/>
+        </java>
+
+        <!-- Generate the html junit report.
+             Run it quietly (i.e. redirect the output) because we don't won't to
+             see its "Build Successful" output line as users might confuse it
+             for a general build success while this might not be the case.-->
+        <echo message="Generating single test report ..."/>
+        <java fork="true"
+              classname="org.apache.tools.ant.launch.Launcher"
+              classpath="${java.class.path}:${lib.noinst}/xalan-2.6.0.jar.ant"
+              failonerror="true"
+              output="${test.html.reports.dir}/output.txt">
+            <arg value="htmlreport"/>
         </java>
+        <echo message="Done."/>
+        <echo/><echo/>
+        <echo message="Test results available in ./test-reports/html/index.html "/>
+        <echo/>
 
+        <!-- Check whether testing went alright and fail if not.-->
+        <condition property="testing.failed">
+          <not>
+            <equals arg1="0"
+            arg2="${test.result.code}"
+            casesensitive="false" trim="true"/>
+          </not>
+        </condition>
+        <fail if="testing.failed"/>
     </target>
 
 </project>