From 8092a127a9e8e9aaada796374421cd133029144a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 13 Feb 2011 17:49:41 +0000
Subject: [PATCH] Enhance phpunits

---
 test/{phpunit => }/README    |  4 +-
 test/phpunit/phpunittest.xml | 73 ++++++++++++++++++++++++------------
 2 files changed, 52 insertions(+), 25 deletions(-)
 rename test/{phpunit => }/README (91%)

diff --git a/test/phpunit/README b/test/README
similarity index 91%
rename from test/phpunit/README
rename to test/README
index 5e3c648334b..f290ab0ea5a 100644
--- a/test/phpunit/README
+++ b/test/README
@@ -26,7 +26,7 @@ If using Eclipse, select the test and click on menu "Run external tools and choo
 
 * Generate a report of Unit tests code coverage among tested classes only:
 > cd test
-> phpunit -d memory_limit=-1 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml MyClassTest.php
+> phpunit -d memory_limit=-1 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml phpunit/MyClassTest.php
 Note that xdebug must be installed for this feature to work.
 
 * Generate a report of Unit tests code coverage among all Dolibarr classes:
@@ -34,7 +34,7 @@ Increase your PHP memory (memory_limit in php.ini) to 512MB.
 Check that you use the "mysqli" driver in your conf.php file (otherwise
 edit the file phpunittest.xml).
 > cd test
-> phpunit -d memory_limit=-1 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml AllTests.php
+> phpunit -d memory_limit=-1 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml phpunit/AllTests.php
 
 
 
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index d45b89c8494..27dd6a47bae 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -3,29 +3,28 @@
 <phpunit>
 <filter>
   <blacklist>
-    <directory>/home/ldestail/workspace/dolibarr/htdocs/includes/smarty/libs/</directory>
-    <directory>../CVS/</directory>
-    <directory>../../test/</directory>
-    <directory>../../htdocs/includes/adodbtime/</directory>
-    <directory>../../htdocs/includes/artichow/</directory>
-    <directory>../../htdocs/includes/barcode/php-barcode/</directory>
-    <directory>../../htdocs/includes/efc_xfss/</directory>
-    <directory>../../htdocs/includes/fckeditor/</directory>
-    <directory>../../htdocs/includes/fpdf/</directory>
-    <directory>../../htdocs/includes/geoip/</directory>
-    <directory>../../htdocs/includes/jcrop/</directory>
-    <directory>../../htdocs/includes/jquery/</directory>
-    <directory>../../htdocs/includes/jsgantt/</directory>
-    <directory>../../htdocs/includes/magpierss/</directory>
-    <directory>../../htdocs/includes/nusoap/</directory>
-    <directory>../../htdocs/includes/odtphp/</directory>
-    <directory>../../htdocs/includes/php_excelreader/</directory>
-    <directory>../../htdocs/includes/php_writeexcel/</directory>
-    <directory>../../htdocs/includes/smarty/</directory>
-    <directory>../../htdocs/includes/smtps/</directory>
-    <directory>../../htdocs/includes/tcpdf/</directory>
-    <directory>../../htdocs/includes/vcard/</directory>
-    <directory>../../htdocs/includes/menus/smartphone/</directory>
+    <directory suffix=".php">../CVS/</directory>
+    <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
+    <directory suffix=".php">../../htdocs/includes/artichow/</directory>
+    <directory suffix=".php">../../htdocs/includes/barcode/php-barcode/</directory>
+    <directory suffix=".php">../../htdocs/includes/efc_xfss/</directory>
+    <directory suffix=".php">../../htdocs/includes/fckeditor/</directory>
+    <directory suffix=".php">../../htdocs/includes/fpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/geoip/</directory>
+    <directory suffix=".php">../../htdocs/includes/jcrop/</directory>
+    <directory suffix=".php">../../htdocs/includes/jquery/</directory>
+    <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
+    <directory suffix=".php">../../htdocs/includes/magpierss/</directory>
+    <directory suffix=".php">../../htdocs/includes/menus/smartphone/</directory>
+    <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
+    <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
+    <directory suffix=".php">../../htdocs/includes/php_excelreader/</directory>
+    <directory suffix=".php">../../htdocs/includes/php_writeexcel/</directory>
+    <directory suffix=".php">../../htdocs/includes/smarty/</directory>
+    <directory suffix=".php">../../htdocs/includes/smtps/</directory>
+    <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/vcard/</directory>
     <file>../../htdocs/lib/databases/mssql.lib.php</file>
     <file>../../htdocs/lib/databases/pgsql.lib.php</file>
     <file>../../htdocs/lib/databases/mysql.lib.php</file>
@@ -40,6 +39,34 @@
     <file>../../htdocs/includes/modules/propale/modules_propale.php</file>
     <file>../../htdocs/includes/modules/project/modules_project.php</file>
     <file>../../htdocs/includes/modules/fichinter/modules_fichinter.php</file>
+    <exclude>
+    <directory suffix=".php">../CVS/</directory>
+    <directory suffix=".php">../../test/</directory>
+    <directory suffix=".php">../../htdocs/includes/adodbtime/</directory>
+    <directory suffix=".php">../../htdocs/includes/artichow/</directory>
+    <directory suffix=".php">../../htdocs/includes/barcode/php-barcode/</directory>
+    <directory suffix=".php">../../htdocs/includes/efc_xfss/</directory>
+    <directory suffix=".php">../../htdocs/includes/fckeditor/</directory>
+    <directory suffix=".php">../../htdocs/includes/fpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/geoip/</directory>
+    <directory suffix=".php">../../htdocs/includes/jcrop/</directory>
+    <directory suffix=".php">../../htdocs/includes/jquery/</directory>
+    <directory suffix=".php">../../htdocs/includes/jsgantt/</directory>
+    <directory suffix=".php">../../htdocs/includes/magpierss/</directory>
+    <directory suffix=".php">../../htdocs/includes/menus/smartphone</directory>
+    <directory suffix=".php">../../htdocs/includes/nusoap/</directory>
+    <directory suffix=".php">../../htdocs/includes/odtphp/</directory>
+    <directory suffix=".php">../../htdocs/includes/php_excelreader/</directory>
+    <directory suffix=".php">../../htdocs/includes/php_writeexcel/</directory>
+    <directory suffix=".php">../../htdocs/includes/smarty/</directory>
+    <directory suffix=".php">../../htdocs/includes/smtps/</directory>
+    <directory suffix=".php">../../htdocs/includes/tcpdf/</directory>
+    <directory suffix=".php">../../htdocs/includes/vcard/</directory>
+    <file>../../htdocs/lib/databases/mssql.lib.php</file>
+    <file>../../htdocs/lib/databases/pgsql.lib.php</file>
+    <file>../../htdocs/lib/databases/mysql.lib.php</file>
+    <!--  <file>../../htdocs/lib/databases/mysqli.lib.php</file> -->
+    </exclude>
   </whitelist>
 </filter>
 </phpunit>
\ No newline at end of file