git-svn-id: http://mongodb-morph.googlecode.com/svn/trunk@123 406649b…

…4-5d4b-11de-8abc-d1c337b90d21

mongodb-morph/build.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Mongo Object" default="api-docs" basedir=".">
+<project name="Mongo Object" default="api-docs">
 
 	<fileset dir="unit-tests" id="unit-tests">
 		<include name="**/Test*.php" />
 	</fileset>
 
 	<fileset dir="integration-tests" id="integration-tests">
 	       <include name="**/Test*.php" />
-	       <exclude name="MongoTestCase.php" />
+	       <exclude name="MongoUnit/*" />
 		   <exclude name="IntegrationsTests.php" />
 	</fileset>
 
@@ -17,9 +17,7 @@
 
 	<target name="api-docs" description="Creates Morph documentation">
 		<echo msg="Starting Creation of API Documentation" />
-		<delete dir="doc/api" quiet="true" includeemptydirs="true" verbose="false"
-			failonerror="false" />
-
+		<delete dir="doc/api" quiet="true" includeemptydirs="true" verbose="false" failonerror="false" />
 		<mkdir dir="doc" />
 		<phpdoc title="Morph Documentation" destdir="doc/api" sourcecode="yes"
 			output="HTML:frames:DOM/default" quiet="true" defaultpackagename="Morph">
@@ -33,7 +31,7 @@
 		<echo msg="API Documentation Complete" />
 	</target>
 
-	<target name="test-report" description="Runs Morph unit tests">
+	<target name="unit-report" description="Runs Morph unit tests">
         <echo msg="Starting Unit Test Suite" />
 
         <phpunit haltonfailure="false" haltonerror="false" printsummary="true">
@@ -43,8 +41,7 @@
             </batchtest>
         </phpunit>
 
-        <delete dir="doc/test_report" quiet="true" includeemptydirs="true"
-            verbose="false" failonerror="false" />
+        <delete dir="doc/test_report" quiet="true" includeemptydirs="true" verbose="false" failonerror="false" />
         <mkdir dir="doc/test_report" />
         <phpunitreport infile="test-report.xml" format="frames"
             todir="doc/test_report" />
@@ -56,16 +53,20 @@
         <exec command="phpunit --coverage-html doc/coverage/ unit-tests/AllTests.php" checkreturn="false" /> 
     </target>
 
-	<target name="test-integration" description="Runs Morph integration tests">
+	<target name="integration-report" description="Runs Morph integration tests">
 	        <echo msg="Starting Integration Test Suite" />
 
-	        <phpunit haltonfailure="false" haltonerror="false" printsummary="false">
+	        <phpunit haltonfailure="false" haltonerror="false" printsummary="true">
+	        	<formatter type="xml" outfile="integration-tests.xml" />
 	        	<formatter type="plain" usefile="false" />
 	            <batchtest>
 	                <fileset refid="integration-tests" />
 	            </batchtest>
 	        </phpunit>
-
+	        <delete dir="doc/integration_report" quiet="true" includeemptydirs="true" verbose="false" failonerror="false" />
+	        <mkdir dir="doc/integration_report" />
+	        <phpunitreport infile="integration-tests.xml" format="frames" todir="doc/integration_report" />
+	        <delete file="integration-tests.xml"/>
 	        <echo msg="Integration Test Suite Complete" />
 	    </target>