SF #3518429: Improved logging for Ant tasks

4 files changed, 33 insertions, 17 deletions

diff --git a/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskTest.xml b/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskTest.xml
index 166c4305..da2ded29 100644
--- a/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskTest.xml
+++ b/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskTest.xml
@@ -26,15 +26,9 @@
 	</target>

 	

 	

-	<target name="testDumpNoServer">

-		<au:expectfailure expectedMessage="Unable to dump coverage data">

-			<jacoco:dump dump="true" destfile="${exec.file}"/>

-		</au:expectfailure>

-	</target>

-		

 	<target name="testNoServer">

 		<au:expectfailure expectedMessage="Unable to dump coverage data">

-			<jacoco:dump dump="false"/>

+			<jacoco:dump dump="true" destfile="${exec.file}"/>

 		</au:expectfailure>

 		<au:assertFileDoesntExist file="${exec.file}"/>

 	</target>

diff --git a/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskWithServerTest.xml b/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskWithServerTest.xml
index 9932e386..1c5bb30c 100644
--- a/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskWithServerTest.xml
+++ b/org.jacoco.ant.test/src/org/jacoco/ant/DumpTaskWithServerTest.xml
@@ -47,19 +47,28 @@
 	

 	<target name="testDump">

 		<jacoco:dump dump="true" destfile="${exec.file}"/>

+		

 		<au:assertFileExists file="${exec.file}"/>

+		<au:assertLogContains text="Dumping execution data to ${exec.file}"/>

 	</target>

 	

 	<target name="testNoDumpOrReset">

 		<jacoco:dump dump="false" reset="false"/>

+

+		<au:assertLogDoesntContain text="Dumping execution data to"/>

 	</target>

 

 	<target name="testResetOnly">

 		<jacoco:dump dump="false" reset="true"/>

+		

+		<au:assertLogDoesntContain text="Dumping execution data to"/>

 	</target>

 	

 	<target name="testNoDumpWithFileSet">

 		<jacoco:dump dump="false" destfile="${exec.file}"/>

+		

+		<au:assertLogDoesntContain text="Dumping execution data to"/>

 		<au:assertFileDoesntExist file="${exec.file}"/>

 	</target>

+	

 </project>
\ No newline at end of file
diff --git a/org.jacoco.ant.test/src/org/jacoco/ant/MergeTaskTest.xml b/org.jacoco.ant.test/src/org/jacoco/ant/MergeTaskTest.xml
index a9082f0b..dcaecc9b 100644
--- a/org.jacoco.ant.test/src/org/jacoco/ant/MergeTaskTest.xml
+++ b/org.jacoco.ant.test/src/org/jacoco/ant/MergeTaskTest.xml
@@ -32,7 +32,7 @@
 	</target>

 	

 	<target name="testMergeToDirectory">

-		<au:expectfailure expectedMessage="Unable to write to destination file">

+		<au:expectfailure expectedMessage="Unable to write merged file ${temp.dir}">

 			<jacoco:merge destfile="${temp.dir}"/>

 		</au:expectfailure>

 	</target>

@@ -40,7 +40,6 @@
 	<target name="testMergeEmptySet">

 		<jacoco:merge destfile="${exec.file}"/>

 		

-		<au:assertLogContains text="0 files merged"/>

 		<au:assertFileExists file="${exec.file}"/>

 	</target>

 	

@@ -49,19 +48,23 @@
 			<fileset dir="${basedir}/data" includes="*.exec"/>

 		</jacoco:merge>

 		

-		<au:assertLogContains text="2 files merged"/>

+		<property name="sample1.file" location="${basedir}/data/sample1.exec"/>

+		<property name="sample2.file" location="${basedir}/data/sample2.exec"/>

+		<au:assertLogContains text="Loading execution data file ${sample1.file}"/>

+		<au:assertLogContains text="Loading execution data file ${sample2.file}"/>

 		<au:assertFileExists file="${exec.file}"/>

 	</target>

 	

 	<target name="testMergeBadFiles">

-		<au:expectfailure expectedMessage="Unable to read sample.bad">

+		<property name="bad.file" location="${basedir}/data/sample.bad"/>

+		<au:expectfailure expectedMessage="Unable to read ${bad.file}">

 		<jacoco:merge destfile="${exec.file}">

-			<fileset dir="${basedir}/data" includes="sample.bad"/>

+			<file file="${basedir}/data/sample.bad"/>

 		</jacoco:merge>

 		</au:expectfailure>

 	</target>

 	

-	<target name="testMergeDirecotry">

+	<target name="testMergeDirectory">

 		<jacoco:merge destfile="${exec.file}">

 			<dirset dir="${basedir}/data"/>

 		</jacoco:merge>

diff --git a/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml b/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
index f34101aa..faebf346 100644
--- a/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
+++ b/org.jacoco.ant.test/src/org/jacoco/ant/ReportTaskTest.xml
@@ -59,8 +59,9 @@
 		</jacoco:report>

 	</target>

 	

-	<target name="testReportInvalidExecutiondataFile">

-		<au:expectfailure expectedMessage="Unable to read execution data file doesnotexist.exec">

+	<target name="testReportInvalidExecutionDataFile">

+		<property name="doesnotexist.file" location="doesnotexist.exec"/>

+		<au:expectfailure expectedMessage="Unable to read execution data file ${doesnotexist.file}">

 			<jacoco:report>

 				<executiondata>

 					<file file="doesnotexist.exec"/>
@@ -85,7 +86,7 @@
 				</sourcefiles>

 			</structure>

 		</jacoco:report>

-		<au:assertLogContains level="warn" text="To enable source code annotation class files for bundle 'root' have to be compiled with debug information."/>

+		<au:assertLogContains level="warn" text="To enable source code annotation class files for bundle 'root' have to be compiled with debug information"/>

 	</target>

 	

 	<target name="testReportWithSourceDirButNoDebug">

@@ -103,7 +104,7 @@
 				</sourcefiles>

 			</structure>

 		</jacoco:report>

-		<au:assertLogContains level="warn" text="To enable source code annotation class files for bundle 'root' have to be compiled with debug information."/>

+		<au:assertLogContains level="warn" text="To enable source code annotation class files for bundle 'root' have to be compiled with debug information"/>

 	</target>

 

 	<!-- HTML Output -->

@@ -337,6 +338,15 @@
 		</au:expectfailure>

 	</target>

 

+	<target name="testReportXmlInvalidDestfile">

+		<au:expectfailure expectedMessage="Error while creating report">

+			<jacoco:report>

+				<structure name="root"/>

+				<xml destfile="${temp.dir}"/>

+			</jacoco:report>

+		</au:expectfailure>

+	</target>

+	

 	<target name="testReportXmlEncoding">

 		<property name="testReportXmlEncoding.destfile" location="${temp.dir}/report.xml"/>

 		<jacoco:report>