mbunit2.test.step in uppercutbuild-1.4.0.0

- old
+ new

@@ -18,13 +18,10 @@
   <property name="dirs.build.code" value="${dirs.build}${path.separator}${folder.app.drop}" overwrite="false" />
   <property name="folder.build_artifacts" value="build_artifacts" overwrite="false" />
   <property name="dirs.build_artifacts" value="${path::get-full-path(dirs.build)}${path.separator}${folder.build_artifacts}" />
   <property name="dirs.test_results" value="${dirs.build_artifacts}${path.separator}mbunit2" overwrite="false" />
   <property name="file.test_results" value="mbunit-results" overwrite="false" />
-  <property name="file.custom.step.before" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.pre.step" />
-  <property name="file.custom.step.after" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.post.step" />
-  <property name="file.custom.step.replace" value="${dirs.build_scripts_custom}${path.separator}${file.current.no_extension}.replace.step" />
   <property name="is.replaced" value="false" />
   <property name="fail.build.on.error" value="true" />
 
   <assemblyfileset id="assemblies.assemblyfileset.testing" basedir="${dirs.build.code}${path.separator}" >
     <exclude name="lib${path.separator}**" />
@@ -42,56 +39,34 @@
     <include name="**${path.separator}*.Spec*dll" />
   </assemblyfileset>
 
   <target name="go" depends="run_tasks" />
 
-  <target name="run_tasks">
-    <echo message="Running ${project::get-name()} tasks." />
+  <target name="run_tasks">
+    <echo level="Warning" message="" />
+    <echo level="Warning" message="====================" />
+    <echo level="Warning" message="${project::get-name()}" />
+    <echo level="Warning" message="====================" />
     <call target="prepare" if="${target::exists('prepare')}" />
-    <call target="custom_tasks_before" if="${target::exists('custom_tasks_before')}"  />
-    <call target="custom_tasks_replace" if="${target::exists('custom_tasks_replace')}"  />
+    <customExtension extends="${project::get-buildfile-path()}" type="pre" failonerror="${fail.build.on.error}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="replace" failonerror="${fail.build.on.error}" />
     <call target="run_normal_tasks" if="${not is.replaced}" />
-    <call target="custom_tasks_after" if="${target::exists('custom_tasks_after')}" />
+    <customExtension extends="${project::get-buildfile-path()}" type="post" failonerror="${fail.build.on.error}" />
   </target>
 
   <target name="run_normal_tasks"
           depends="run_tests"
           description="Testing with MbUnit v2." />
 
-  <target name="custom_tasks_before">
-    <echo message="Running custom tasks if ${file.custom.step.before} exists." />
-    <nant buildfile="${file.custom.step.before}" inheritall="true" if="${file::exists(file.custom.step.before)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.before + '.ps1')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.before + '.rb')}" failonerror="${fail.build.on.error}">
-      <arg value="${path::get-full-path(file.custom.step.before + '.rb')}" />
-    </exec>
-  </target>
-
-  <target name="custom_tasks_replace">
-    <echo message="Running custom tasks instead of normal tasks if ${file.custom.step.replace} exists." />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace)}" />
-    <nant buildfile="${file.custom.step.replace}" inheritall="true" if="${file::exists(file.custom.step.replace)}" failonerror="${fail.build.on.error}" />
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.ps1')}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.replace + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.ps1')}" />
-    </exec>
-    <property name="is.replaced" value="true" if="${file::exists(file.custom.step.replace + '.rb')}" />
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.replace + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.replace + '.rb')}" />
-    </exec>
-  </target>
-
   <target name="prepare">
-    <echo message="Removing and adding ${dirs.test_results}."/>
+    <echo level="Warning" message="Removing and adding ${dirs.test_results}."/>
     <delete dir="${dirs.test_results}" failonerror="false" />
     <mkdir dir="${dirs.test_results}" />
   </target>
 
   <target name="run_tests" depends="prepare" description="Running Unit Tests">
-    <echo message="Running tests using MbUnit and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running tests using MbUnit and putting results in ${dirs.test_results}."/>
     <mbunit
         report-types="Html;Xml;Text"
         report-filename-format="${file.test_results}"
         report-output-directory="${dirs.test_results}"
         halt-on-failure="true"
@@ -112,11 +87,11 @@
       </categories>
     </mbunit>
   </target>
 
   <target name="run_all_tests" depends="prepare" description="Running All Unit Tests">
-    <echo message="Running all tests (including integration tests) using MbUnit and putting results in ${dirs.test_results}."/>
+    <echo level="Warning" message="Running all tests (including integration tests) using MbUnit and putting results in ${dirs.test_results}."/>
     <mbunit
         report-types="Html;Xml;Text"
         report-filename-format="${file.test_results}"
         report-output-directory="${dirs.test_results}"
         halt-on-failure="true"
@@ -125,21 +100,10 @@
       <assemblies refid="assemblies.assemblyfileset.testing.all" />
     </mbunit>
   </target>
 
   <target name="open_results">
-    <echo message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
+    <echo level="Warning" message="Opening results - ${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" />
     <results display="${path::get-full-path(dirs.test_results) + path.separator + file.test_results + '.html'}" /> 
-  </target>
-
-  <target name="custom_tasks_after">
-    <echo message="Running custom tasks if ${file.custom.step.after} exists." />
-    <nant buildfile="${file.custom.step.after}" inheritall="true" if="${file::exists(file.custom.step.after)}" failonerror="${fail.build.on.error}" />
-    <exec program="powershell.exe" if="${file::exists(file.custom.step.after + '.ps1')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.ps1')}" />
-    </exec>
-    <exec program="ruby.exe" if="${file::exists(file.custom.step.after + '.rb')}" failonerror="${fail.build.on.error}" >
-      <arg value="${path::get-full-path(file.custom.step.after + '.rb')}" />
-    </exec>
   </target>
 
 </project>
\ No newline at end of file