diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 57378b016a74e3bcd26205093ce877a09b1e697c..031e4e920c03c17e8a3355cd7497f056bfe7eff2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -249,7 +249,7 @@ class Adherent extends CommonObject
* Fonction qui cree l'adherent
* @param user Objet user qui demande la creation
* @param notrigger 1 ne declenche pas les triggers, 0 sinon
- * @return int <0 si ko, >0 si ok
+ * @return int <0 if KO, >0 if OK
*/
function create($user,$notrigger=0)
{
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
new file mode 100755
index 0000000000000000000000000000000000000000..0fd8dd129aead91f3b46d06ed13d9576af9f057b
--- /dev/null
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -0,0 +1,260 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * \file test/phpunit/ChargeSociales.php
+ * \ingroup test
+ * \brief PHPUnit test
+ * \version $Id$
+ * \remarks To run this script as CLI: phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
+require_once 'PHPUnit/Framework.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/compta/sociales/class/chargesociales.class.php';
+
+if (empty($user->id))
+{
+ print "Load permissions for admin user nb 1\n";
+ $user->fetch(1);
+ $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @covers DoliDb
+ * @covers Translate
+ * @covers Conf
+ * @covers Interfaces
+ * @covers CommonObject
+ * @covers ChargeSociales
+ * @remarks backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class ChargeSocialesTest extends PHPUnit_Framework_TestCase
+{
+ protected $savconf;
+ protected $savuser;
+ protected $savlangs;
+ protected $savdb;
+
+ /**
+ * Constructor
+ * We save global variables into local variables
+ *
+ * @return ChargeSocialesTest
+ */
+ function ChargeSocialesTest()
+ {
+ //$this->sharedFixture
+ global $conf,$user,$langs,$db;
+ $this->savconf=$conf;
+ $this->savuser=$user;
+ $this->savlangs=$langs;
+ $this->savdb=$db;
+
+ print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+ //print " - db ".$db->db;
+ print "\n";
+ }
+
+ // Static methods
+ public static function setUpBeforeClass()
+ {
+ global $conf,$user,$langs,$db;
+ $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+ print __METHOD__."\n";
+ }
+ public static function tearDownAfterClass()
+ {
+ global $conf,$user,$langs,$db;
+ $db->rollback();
+
+ print __METHOD__."\n";
+ }
+
+ /**
+ */
+ protected function setUp()
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ print __METHOD__."\n";
+ }
+ /**
+ */
+ protected function tearDown()
+ {
+ print __METHOD__."\n";
+ }
+
+ /**
+ */
+ public function testChargeSocialesCreate()
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobject=new ChargeSociales($this->savdb);
+ $localobject->initAsSpecimen();
+ $result=$localobject->create($user,$langs,$conf);
+ print __METHOD__." result=".$result."\n";
+
+ $this->assertLessThan($result, 0);
+ return $result;
+ }
+
+ /**
+ * @depends testChargeSocialesCreate
+ * The depends says test is run only if previous is ok
+ */
+ public function testChargeSocialesFetch($id)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobject=new ChargeSociales($this->savdb);
+ $result=$localobject->fetch($id);
+ print __METHOD__." id=".$id." result=".$result."\n";
+
+ $this->assertLessThan($result, 0);
+ return $localobject;
+ }
+
+ /**
+ * @depends testChargeSocialesFetch
+ * The depends says test is run only if previous is ok
+ */
+/* public function testChargeSocialesUpdate($localobject)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobject->note='New note after update';
+ $result=$localobject->update($user);
+
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThan($result, 0);
+ return $localobject;
+ }
+*/
+
+ /**
+ * @depends testChargeSocialesFetch
+ * The depends says test is run only if previous is ok
+ */
+ public function testChargeSocialesValid($localobject)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $result=$localobject->set_paid($user);
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+ $this->assertLessThan($result, 0);
+ return $localobject;
+ }
+
+ /**
+ * @depends testChargeSocialesValid
+ * The depends says test is run only if previous is ok
+ */
+ public function testChargeSocialesOther($localobject)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $result=$localobject->getNomUrl(1);
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertNotEquals($result, '');
+
+ $result=$localobject->getSommePaiement();
+ print __METHOD__." id=".$localobject->id." result=".$result."\n";
+ $this->assertLessThanOrEqual($result, 0);
+
+ return $localobject->id;
+ }
+
+ /**
+ * @depends testChargeSocialesOther
+ * The depends says test is run only if previous is ok
+ */
+ public function testChargeSocialesDelete($id)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobject=new ChargeSociales($this->savdb);
+ $result=$localobject->fetch($id);
+ $result=$localobject->delete($id);
+
+ print __METHOD__." id=".$id." result=".$result."\n";
+ $this->assertLessThan($result, 0);
+ return $result;
+ }
+
+
+ /**
+ *
+ */
+ /*public function testVerifyNumRef()
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobject=new ChargeSociales($this->savdb);
+ $result=$localobject->ref='refthatdoesnotexists';
+ $result=$localobject->VerifyNumRef();
+
+ print __METHOD__." result=".$result."\n";
+ $this->assertEquals($result, 0);
+ return $result;
+ }*/
+
+}
+?>
\ No newline at end of file
diff --git a/test/phpunit/MyTestSuite.php b/test/phpunit/MyTestSuite.php
index c1415d12ca8e48066f76eef6054c28456b2a1a65..aab4bba0da6c336373d5679a04da0954d7a12f78 100644
--- a/test/phpunit/MyTestSuite.php
+++ b/test/phpunit/MyTestSuite.php
@@ -78,6 +78,8 @@ class MyTestSuite
$suite->addTestSuite('UserGroupTest');
require_once dirname(__FILE__).'/CompanyBankAccountTest.php';
$suite->addTestSuite('CompanyBankAccountTest');
+ require_once dirname(__FILE__).'/ChargeSocialesTest.php';
+ $suite->addTestSuite('ChargeSocialesTest');
return $suite;
}
diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml
index 8a07af54a92970a5c917d0377cf609cb3234c2da..e0dde6ebececbe51621aab40fd73ca4cf9ffbe5f 100644
--- a/test/phpunit/phpunittest.xml
+++ b/test/phpunit/phpunittest.xml
@@ -6,16 +6,23 @@
<directory>../htdocs/includes/adodbtime/</directory>
<directory>../htdocs/includes/artichow/</directory>
<directory>../htdocs/includes/barcode/php-barcode/</directory>
- <directory>../htdocs/includes/fpdf/</directory>
<directory>../htdocs/includes/efc_xfss/</directory>
<directory>../htdocs/includes/fckeditor/</directory>
- <directory>../htdocs/includes/iphone/</directory>
+ <directory>../htdocs/includes/fpdf/</directory>
+ <directory>../htdocs/includes/geoip/</directory>
+ <directory>../htdocs/includes/iui/</directory>
+ <directory>../htdocs/includes/iwebkit/</directory>
<directory>../htdocs/includes/jcrop/</directory>
<directory>../htdocs/includes/jquery/</directory>
- <directory>../htdocs/includes/odtphp/</directory>
+ <directory>../htdocs/includes/jsgantt/</directory>
+ <directory>../htdocs/includes/magpierss/</directory>
<directory>../htdocs/includes/nusoap/</directory>
- <directory>../htdocs/includes/pwc/</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>
<file>../htdocs/lib/databases/mssql.lib.php</file>
<file>../htdocs/lib/databases/pgsql.lib.php</file>