You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/09/21 09:04:59 UTC

svn commit: r999241 - in /shindig/trunk/php: phpunit.xml.dist pom.xml test/config/phpunit_to_surefire.xslt

Author: lindner
Date: Tue Sep 21 07:04:58 2010
New Revision: 999241

URL: http://svn.apache.org/viewvc?rev=999241&view=rev
Log:
Use better surefire report naming scheme
Move all options to phpunit.xml.dist for ease of use and faster code coverage runs

Added:
    shindig/trunk/php/phpunit.xml.dist
Modified:
    shindig/trunk/php/pom.xml
    shindig/trunk/php/test/config/phpunit_to_surefire.xslt

Added: shindig/trunk/php/phpunit.xml.dist
URL: http://svn.apache.org/viewvc/shindig/trunk/php/phpunit.xml.dist?rev=999241&view=auto
==============================================================================
--- shindig/trunk/php/phpunit.xml.dist (added)
+++ shindig/trunk/php/phpunit.xml.dist Tue Sep 21 07:04:58 2010
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         stopOnFailure="false">
+  <testsuites>
+    <testsuite name="shindig-php">
+      <file>test/ShindigAllTests.php</file>
+    </testsuite>
+  </testsuites>
+
+
+  <logging>
+    <log type="coverage-html" target="target/site/coverage-report/" 
+         title="Shindig PHP Coverage"
+         charset="UTF-8" yui="true" highlight="true"
+         lowUpperBound="34" highLowerBound="70"/>
+    <log type="coverage-clover" target="target/clover.xml"/>
+    <log type="junit" target="target/surefire-reports/phpunit-testresults.xml"/>
+  </logging>
+  <filter>
+    <blacklist>
+      <directory suffix=".php">./external/jsmin-php</directory>
+      <directory suffix=".php">./external/OAuth</directory>
+      <directory suffix=".php">./external/Zend</directory>
+      <directory suffix=".php">./test/social</directory>
+      <directory suffix=".php">./test</directory>
+    </blacklist>
+  </filter>
+</phpunit>

Modified: shindig/trunk/php/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/php/pom.xml?rev=999241&r1=999240&r2=999241&view=diff
==============================================================================
--- shindig/trunk/php/pom.xml (original)
+++ shindig/trunk/php/pom.xml Tue Sep 21 07:04:58 2010
@@ -118,10 +118,7 @@
                 <mkdir dir="${coverage.report}" />
 		<mkdir dir="target/tmp" />
                 <exec executable="phpunit" dir=".">
-                  <arg line=" --verbose" />
-                  <arg line=" --log-junit ${surefire.reports}/phpunit-testresults.xml" />
-                  <arg line=" --coverage-html ${coverage.report}" />
-                  <arg line=" test/ShindigAllTests.php" />
+                  <arg value="--verbose"/>
 		  <env key="TMPDIR" value="${basedir}/target/tmp"/>
                 </exec>
                 <xslt in="${surefire.reports}/phpunit-testresults.xml" out="${surefire.reports}/xslt.info"

Modified: shindig/trunk/php/test/config/phpunit_to_surefire.xslt
URL: http://svn.apache.org/viewvc/shindig/trunk/php/test/config/phpunit_to_surefire.xslt?rev=999241&r1=999240&r2=999241&view=diff
==============================================================================
--- shindig/trunk/php/test/config/phpunit_to_surefire.xslt (original)
+++ shindig/trunk/php/test/config/phpunit_to_surefire.xslt Tue Sep 21 07:04:58 2010
@@ -32,7 +32,7 @@
 	<xsl:template match="testsuite">
 		<xsl:if test="testcase">
 			<xsl:variable name="outputName" select="./@name" />
-			<xsl:result-document href="{$outputDir}/{$outputName}.xml" method="xml">
+			<xsl:result-document href="{$outputDir}/TEST-{$outputName}.xml" method="xml">
 				<xsl:copy-of select="." />
 			</xsl:result-document>
 		</xsl:if>