--- a/buildframework/helium/sf/java/diamonds/tests/scenarii/invalid-address/build.xml	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/java/diamonds/tests/scenarii/invalid-address/build.xml	Fri Aug 13 14:59:05 2010 +0300
@@ -23,12 +23,12 @@
 <project name="test-diamonds-invalid-address" xmlns:au="antlib:org.apache.ant.antunit" xmlns:hlm="http://www.nokia.com/helium">
     <description>Helium Antlib diamonds unittests.</description>
     <property environment="env" />
-    
+    <taskdef resource="com/nokia/helium/core/ant/antlib.xml" uri="http://www.nokia.com/helium"/>
+    <property name="diamonds.enabled" value="true" />
     <property name="diamonds.host" value="invalid.server.local" />
     <property name="diamonds.port" value="80" />
     <property name="diamonds.path" value="/diamonds/builds/" />
     <property name="diamonds.mail" value="diamonds@invalid.server.local" />
-    
     <property name="diamonds.unitest.dir" location="${ant.file.test-diamonds-invalid-address}/../../../" />
     <property name="diamonds.output.dir" location="${temp.dir}/output" />
     <property name="diamonds.template.dir" location="${diamonds.unitest.dir}/data/templates" />
@@ -36,12 +36,12 @@
     <property name="id" value="123"/>
     <property name="name" value="${build.family}_${id}"/>
     <property name="build.system" value="ec-helium"/>
-    <property name="diamonds.listener.configuration.file" location="${diamonds.unitest.dir}/config/diamonds_config.xml.ftl" />
     <property name="compile.log.input" location="${diamonds.unitest.dir}/data/compile.log.xml" />
     <property name="codescanner.log.input" location="${diamonds.unitest.dir}/data/problemIndex.xml" />
     <property name="policy.log.input" location="${diamonds.unitest.dir}/data/policy.log.xml" />
     <property name="invalid.target.input.file" location="${diamonds.unitest.dir}/data/invalid.target.input.log.xml" />
     <property name="symsee.version" value="9.1.0" />
+    <import file="../../config/diamonds_config_default.ant.xml" />
 
     <target name="unittest" depends="unittest-diamonds" />
     
@@ -82,9 +82,6 @@
         <echo message="target with invalid template-file" />
     </target>
 
-    <target name="invalid-ant-properties-input">
-        <echo message="target with invalid ant properties input" />
-    </target>
 
     <target name="non-existing-ant-properties">
         <echo message="target with non-existing-ant-properties" />
@@ -98,18 +95,6 @@
         <echo message="version target for diamonds to verify sending data to diamonds" />
     </target>
 
-    <target name="test-defer-type">
-        <antcall target="defer-type" />
-    </target>
-
-    <target name="test-create-bom-log">
-        <antcall target="create-bom-log" />
-    </target>
-
-    <target name="test-codescanner">
-        <antcall target="codescanner" />
-    </target>
-
     <target name="test-invalid-target-input-file">
         <antcall target="invalid-target-input-file" />
     </target>
@@ -123,22 +108,10 @@
         <antcall target="invalid-template-file" />
     </target>
 
-    <target name="test-invalid-ant-properties-input">
-        <antcall target="invalid-ant-properties-input" />
-    </target>
-
     <target name="test-non-existing-ant-properties">
         <antcall target="non-existing-ant-properties" />
     </target>
 
-    <target name="test-invalid-diamonds-server-properties">
-        <antcall target="invalid-diamonds-server-properties" />
-        <echo message="target with invalid-diamonds-server-properties" />
-    </target>
-
-    <target name="test-compile-target">
-        <antcall target="compile-target" />
-    </target>
 
     <target name="test-version">
         <antcall target="version" />
@@ -146,9 +119,9 @@
 
     <target name="test-buildid-set">
         <echo>${diamonds.build.id}</echo>
-        <au:assertTrue>
+        <au:assertFalse>
             <isset property="diamonds.build.id"/>
-        </au:assertTrue>
+        </au:assertFalse>
     </target>
 
     <target name="test-buildid-notset">
@@ -157,8 +130,18 @@
         </au:assertFalse>
     </target>
 
-    <target name="test-all" depends="test-buildid-notset, diamonds, test-buildid-set, test-defer-type, test-version,
-        test-create-bom-log,test-codescanner,test-compile-target,test-invalid-diamonds-server-properties,
-        test-non-existing-ant-properties,test-invalid-ant-properties-input,test-invalid-template-file,
-        test-invalid-target-input-file,test-invalid-stage-input-file " />
+    <target name="test-verify-targets">
+        <au:assertFalse>
+            <isset property="diamonds.build.id"/>
+        </au:assertFalse>
+    </target>        
+
+    <target name="test-verify-stages">
+        <au:assertFalse>
+            <isset property="diamonds.build.id"/>
+        </au:assertFalse>
+    </target>        
+
+    <target name="test-all" depends="test-buildid-notset, diamonds, test-buildid-set, test-version,
+        test-verify-stages, test-verify-targets" />
 </project>
\ No newline at end of file