alxarafe / alixar

dolibarr/test/phpunit/MarginsLibTest.php

Indentation +79 added lines, -79 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -47,74 +47,74 @@ 
  */
 class MarginsLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return DateLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$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()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return DateLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
+
+        //$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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -124,29 +124,29 @@ 
      */
     public function testGetMarginInfos()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
-		//var_dump($result);
-		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
-		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(25,$result[1]);
-		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(20,$result[2]);
-
-		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
-		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
-		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(12.5,$result[1]);
-		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(1/9*100,$result[2]);
-
-		return 0;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
+        //var_dump($result);
+        print __METHOD__." result[0]=".$result[0]."\n";
+        $this->assertEquals(8,$result[0]);
+        print __METHOD__." result[1]=".$result[1]."\n";
+        $this->assertEquals(25,$result[1]);
+        print __METHOD__." result[2]=".$result[2]."\n";
+        $this->assertEquals(20,$result[2]);
+
+        $result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
+        print __METHOD__." result[0]=".$result[0]."\n";
+        $this->assertEquals(8,$result[0]);
+        print __METHOD__." result[1]=".$result[1]."\n";
+        $this->assertEquals(12.5,$result[1]);
+        print __METHOD__." result[2]=".$result[2]."\n";
+        $this->assertEquals(1/9*100,$result[2]);
+
+        return 0;
     }
 }

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		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;
@@ -77,8 +77,8 @@ 
 	// 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.
+    	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";
     }
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -124,28 +124,28 @@ 
      */
     public function testGetMarginInfos()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
 		//var_dump($result);
 		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
+		$this->assertEquals(8, $result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(25,$result[1]);
+		$this->assertEquals(25, $result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(20,$result[2]);
+		$this->assertEquals(20, $result[2]);
 
-		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
 		print __METHOD__." result[0]=".$result[0]."\n";
-		$this->assertEquals(8,$result[0]);
+		$this->assertEquals(8, $result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
-		$this->assertEquals(12.5,$result[1]);
+		$this->assertEquals(12.5, $result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(1/9*100,$result[2]);
+		$this->assertEquals(1 / 9 * 100, $result[2]);
 
 		return 0;
     }

dolibarr/test/phpunit/ExpenseReportTest.php

Indentation +2 added lines, -2 removed lines

@@ -60,9 +60,9 @@
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

Spacing +68 added lines, -68 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 
@@ -63,11 +63,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        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;
@@ -77,7 +77,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -86,7 +86,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -99,11 +99,11 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
         //print $db->getVersion()."\n";
@@ -125,36 +125,36 @@ 
      */
     public function testExpenseReportCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         // Set supplier and product to use
-        $socid=1;
+        $socid = 1;
 
         // Create supplier order with a too low quantity
-        $localobject=new ExpenseReport($db);
-        $localobject->initAsSpecimen();         // Init a speciment with lines
+        $localobject = new ExpenseReport($db);
+        $localobject->initAsSpecimen(); // Init a speciment with lines
         $localobject->status = 0;
         $localobject->fk_statut = 0;
-        $localobject->date_fin = null;  // Force bad value
+        $localobject->date_fin = null; // Force bad value
 
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(-1, $result);       // must be -1 because of missing mandatory fields
+        $this->assertEquals(-1, $result); // must be -1 because of missing mandatory fields
 
-        $sql="DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."expensereport where ref=''";
         $db->query($sql);
 
         // Create supplier order
-        $localobject2=new ExpenseReport($db);
-        $localobject2->initAsSpecimen();        // Init a speciment with lines
+        $localobject2 = new ExpenseReport($db);
+        $localobject2->initAsSpecimen(); // Init a speciment with lines
         $localobject2->status = 0;
         $localobject2->fk_statut = 0;
 
-        $result=$localobject2->create($user);
+        $result = $localobject2->create($user);
         print __METHOD__." result=".$result."\n";
         $this->assertGreaterThanOrEqual(0, $result);
 
@@ -173,14 +173,14 @@ 
      */
     public function testExpenseReportFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new ExpenseReport($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new ExpenseReport($this->savdb);
+        $result = $localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -198,13 +198,13 @@ 
      */
     public function testExpenseReportValid($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->setValidate($user);
+        $result = $localobject->setValidate($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -222,13 +222,13 @@ 
      */
     public function testExpenseReportApprove($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->setApproved($user);
+        $result = $localobject->setApproved($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -246,13 +246,13 @@ 
      */
     public function testExpenseReportCancel($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->set_cancel($user, 'Because...');
+        $result = $localobject->set_cancel($user, 'Because...');
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -270,11 +270,11 @@ 
      */
     public function testExpenseReportOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -300,15 +300,15 @@ 
      */
     public function testExpenseReportDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new ExpenseReport($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($user);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new ExpenseReport($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($user);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/HolidayTest.php

Indentation +187 added lines, -187 removed lines

@@ -32,9 +32,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
@@ -49,75 +49,75 @@ 
  */
 class HolidayTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return HolidayTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$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()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return HolidayTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$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;
+        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";
+        print __METHOD__."\n";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -127,20 +127,20 @@ 
      */
     public function testHolidayCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Holiday($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Holiday($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -153,19 +153,19 @@ 
      */
     public function testHolidayFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Holiday($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Holiday($this->savdb);
+        $result=$localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $this->assertLessThan($result, 0);
 
-    	return $localobject;
+        return $localobject;
     }
 
     /**
@@ -179,55 +179,55 @@ 
      */
     public function testHolidayUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->oldcopy = clone $localobject;
-
-		$localobject->note_private='New private note after update';
-		$localobject->note_public='New public note after update';
-		$localobject->lastname='New name';
-		$localobject->firstname='New firstname';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-    	$localobject->country_id=2;
-    	//$localobject->status=0;
-		$localobject->phone_pro='New tel pro';
-		$localobject->phone_perso='New tel perso';
-		$localobject->phone_mobile='New tel mobile';
-		$localobject->fax='New fax';
-		$localobject->email='newemail@newemail.com';
-		$localobject->jabberid='New im id';
-		$localobject->default_lang='es_ES';
-
-		$result=$localobject->update($localobject->id,$user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Holiday::update error');
-
-    	$result=$localobject->update_note($localobject->note_private,'_private');
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
-
-		$result=$localobject->update_note($localobject->note_public, '_public');
-		print __METHOD__." id=".$localobject->id." result=".$result."\n";
-		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
-
-
-		$newobject=new Holiday($this->savdb);
-    	$result=$newobject->fetch($localobject->id);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->oldcopy = clone $localobject;
+
+        $localobject->note_private='New private note after update';
+        $localobject->note_public='New public note after update';
+        $localobject->lastname='New name';
+        $localobject->firstname='New firstname';
+        $localobject->address='New address';
+        $localobject->zip='New zip';
+        $localobject->town='New town';
+        $localobject->country_id=2;
+        //$localobject->status=0;
+        $localobject->phone_pro='New tel pro';
+        $localobject->phone_perso='New tel perso';
+        $localobject->phone_mobile='New tel mobile';
+        $localobject->fax='New fax';
+        $localobject->email='newemail@newemail.com';
+        $localobject->jabberid='New im id';
+        $localobject->default_lang='es_ES';
+
+        $result=$localobject->update($localobject->id,$user);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0, 'Holiday::fetch error');
+        $this->assertLessThan($result, 0, 'Holiday::update error');
 
-    	print __METHOD__." old=".$localobject->note." new=".$newobject->note."\n";
-    	$this->assertEquals($localobject->note, $newobject->note,'Holiday::update_note error compare note');
-    	//print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
-    	//$this->assertEquals($localobject->note_public, $newobject->note_public);
+        $result=$localobject->update_note($localobject->note_private,'_private');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
+
+        $result=$localobject->update_note($localobject->note_public, '_public');
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
-    	return $localobject;
+
+        $newobject=new Holiday($this->savdb);
+        $result=$newobject->fetch($localobject->id);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0, 'Holiday::fetch error');
+
+        print __METHOD__." old=".$localobject->note." new=".$newobject->note."\n";
+        $this->assertEquals($localobject->note, $newobject->note,'Holiday::update_note error compare note');
+        //print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
+        //$this->assertEquals($localobject->note_public, $newobject->note_public);
+
+        return $localobject;
     }
 
     /**
@@ -241,15 +241,15 @@ 
      */
     public function testHolidayOther($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		//$localobject->fetch($localobject->id);
+        //$localobject->fetch($localobject->id);
 
-		/*
+        /*
         $result=$localobject->getNomUrl(1);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertNotEquals($result, '');
@@ -277,20 +277,20 @@ 
      */
     public function testHolidayDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$localobject=new Holiday($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Holiday($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$result=$localobject->delete(0);
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->delete(0);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -300,55 +300,55 @@ 
      */
     public function testVerifDateHolidayCP()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	// Create a leave request the 1st morning only
-    	$localobjecta=new Holiday($this->savdb);
-    	$localobjecta->initAsSpecimen();
-    	$localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
-    	$localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
-    	$localobjecta->halfday = 1;
-    	$result=$localobjecta->create($user);
-
-    	// Create a leave request the 2 afternoon only
-    	$localobjectb=new Holiday($this->savdb);
-    	$localobjectb->initAsSpecimen();
-    	$localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
-    	$localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
-    	$localobjectb->halfday = -1;
-    	$result=$localobjectb->create($user);
-
-    	$date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
-    	$date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
-
-    	$localobjectc=new Holiday($this->savdb);
-
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
-    	$this->assertTrue($result, 'result should be true, there is no overlapping');
-
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
-    	$this->assertTrue($result, 'result should be true, there is no overlapping');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
-    	$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
-
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
-    	$this->assertTrue($result, 'result should be true, there is no overlapping');
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        // Create a leave request the 1st morning only
+        $localobjecta=new Holiday($this->savdb);
+        $localobjecta->initAsSpecimen();
+        $localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
+        $localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
+        $localobjecta->halfday = 1;
+        $result=$localobjecta->create($user);
+
+        // Create a leave request the 2 afternoon only
+        $localobjectb=new Holiday($this->savdb);
+        $localobjectb->initAsSpecimen();
+        $localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
+        $localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
+        $localobjectb->halfday = -1;
+        $result=$localobjectb->create($user);
+
+        $date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
+        $date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
+
+        $localobjectc=new Holiday($this->savdb);
+
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
+        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
+        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
+        $this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
+
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
+        $this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
+        $this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
+        $this->assertTrue($result, 'result should be true, there is no overlapping');
+
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
+        $this->assertTrue($result, 'result should be true, there is no overlapping');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
+        $this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
+        $this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
+
+        $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
+        $this->assertTrue($result, 'result should be true, there is no overlapping');
     }
 }

Spacing +89 added lines, -89 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->getrights();
 }
 
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -65,11 +65,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		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;
@@ -79,9 +79,9 @@ 
 	// Static methods
   	public static function setUpBeforeClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 
-        $db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        $db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
     	print __METHOD__."\n";
     }
@@ -89,7 +89,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -102,11 +102,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -127,15 +127,15 @@ 
      */
     public function testHolidayCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Holiday($this->savdb);
+		$localobject = new Holiday($this->savdb);
     	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+    	$result = $localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -153,14 +153,14 @@ 
      */
     public function testHolidayFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Holiday($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Holiday($this->savdb);
+    	$result = $localobject->fetch($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
@@ -179,51 +179,51 @@ 
      */
     public function testHolidayUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$localobject->oldcopy = clone $localobject;
 
-		$localobject->note_private='New private note after update';
-		$localobject->note_public='New public note after update';
-		$localobject->lastname='New name';
-		$localobject->firstname='New firstname';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-    	$localobject->country_id=2;
+		$localobject->note_private = 'New private note after update';
+		$localobject->note_public = 'New public note after update';
+		$localobject->lastname = 'New name';
+		$localobject->firstname = 'New firstname';
+		$localobject->address = 'New address';
+		$localobject->zip = 'New zip';
+		$localobject->town = 'New town';
+    	$localobject->country_id = 2;
     	//$localobject->status=0;
-		$localobject->phone_pro='New tel pro';
-		$localobject->phone_perso='New tel perso';
-		$localobject->phone_mobile='New tel mobile';
-		$localobject->fax='New fax';
-		$localobject->email='newemail@newemail.com';
-		$localobject->jabberid='New im id';
-		$localobject->default_lang='es_ES';
-
-		$result=$localobject->update($localobject->id,$user);
+		$localobject->phone_pro = 'New tel pro';
+		$localobject->phone_perso = 'New tel perso';
+		$localobject->phone_mobile = 'New tel mobile';
+		$localobject->fax = 'New fax';
+		$localobject->email = 'newemail@newemail.com';
+		$localobject->jabberid = 'New im id';
+		$localobject->default_lang = 'es_ES';
+
+		$result = $localobject->update($localobject->id, $user);
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Holiday::update error');
 
-    	$result=$localobject->update_note($localobject->note_private,'_private');
+    	$result = $localobject->update_note($localobject->note_private, '_private');
     	print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
 
-		$result=$localobject->update_note($localobject->note_public, '_public');
+		$result = $localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
 
-		$newobject=new Holiday($this->savdb);
-    	$result=$newobject->fetch($localobject->id);
+		$newobject = new Holiday($this->savdb);
+    	$result = $newobject->fetch($localobject->id);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	$this->assertLessThan($result, 0, 'Holiday::fetch error');
 
     	print __METHOD__." old=".$localobject->note." new=".$newobject->note."\n";
-    	$this->assertEquals($localobject->note, $newobject->note,'Holiday::update_note error compare note');
+    	$this->assertEquals($localobject->note, $newobject->note, 'Holiday::update_note error compare note');
     	//print __METHOD__." old=".$localobject->note_public." new=".$newobject->note_public."\n";
     	//$this->assertEquals($localobject->note_public, $newobject->note_public);
 
@@ -241,11 +241,11 @@ 
      */
     public function testHolidayOther($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		//$localobject->fetch($localobject->id);
 
@@ -277,16 +277,16 @@ 
      */
     public function testHolidayDelete($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Holiday($this->savdb);
-    	$result=$localobject->fetch($id);
+		$localobject = new Holiday($this->savdb);
+    	$result = $localobject->fetch($id);
 
-    	$result=$localobject->delete(0);
+    	$result = $localobject->delete(0);
 		print __METHOD__." id=".$id." result=".$result."\n";
     	$this->assertLessThan($result, 0);
 
@@ -300,55 +300,55 @@ 
      */
     public function testVerifDateHolidayCP()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	// Create a leave request the 1st morning only
-    	$localobjecta=new Holiday($this->savdb);
+    	$localobjecta = new Holiday($this->savdb);
     	$localobjecta->initAsSpecimen();
     	$localobjecta->date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
     	$localobjecta->date_fin = dol_mktime(0, 0, 0, 1, 1, 2020);
     	$localobjecta->halfday = 1;
-    	$result=$localobjecta->create($user);
+    	$result = $localobjecta->create($user);
 
     	// Create a leave request the 2 afternoon only
-    	$localobjectb=new Holiday($this->savdb);
+    	$localobjectb = new Holiday($this->savdb);
     	$localobjectb->initAsSpecimen();
     	$localobjectb->date_debut = dol_mktime(0, 0, 0, 1, 2, 2020);
     	$localobjectb->date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
     	$localobjectb->halfday = -1;
-    	$result=$localobjectb->create($user);
+    	$result = $localobjectb->create($user);
 
     	$date_debut = dol_mktime(0, 0, 0, 1, 1, 2020);
     	$date_fin = dol_mktime(0, 0, 0, 1, 2, 2020);
 
-    	$localobjectc=new Holiday($this->savdb);
+    	$localobjectc = new Holiday($this->savdb);
 
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 0);
     	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 0);
     	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 0);
     	$this->assertFalse($result, 'result should be false, there is overlapping, full day is not available.');
 
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, 1);
     	$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 1);
     	$this->assertFalse($result, 'result should be false, there is overlapping, morning of first day is not available.');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, 1);
     	$this->assertTrue($result, 'result should be true, there is no overlapping');
 
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_debut, -1);
     	$this->assertTrue($result, 'result should be true, there is no overlapping');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, -1);
     	$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_fin, $date_fin, -1);
     	$this->assertFalse($result, 'result should be false, there is overlapping, afternoon of second day is not available');
 
-    	$result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2);	// start afternoon and end morning
+    	$result = $localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2); // start afternoon and end morning
     	$this->assertTrue($result, 'result should be true, there is no overlapping');
     }
 }

dolibarr/test/phpunit/FilesLibTest.php

Indentation +175 added lines, -175 removed lines

@@ -32,9 +32,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -48,160 +48,160 @@ 
  */
 class FilesLibTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return FilesLibTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$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()
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return FilesLibTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+        parent::__construct();
 
-    	print __METHOD__."\n";
+        //$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";
     }
 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
 
-	/**
+    /**
      * testDolBasename
      *
      * @return	int
      */
     public function testDolBasename()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
         $result=dol_basename('adir/afile');
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile',$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('afile',$result);
 
-		$result=dol_basename('adir/afile/');
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile',$result);
+        $result=dol_basename('adir/afile/');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('afile',$result);
 
-		$result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('νεο',$result);
+        $result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('νεο',$result);
 
-		$result=dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('νεο',$result);
+        $result=dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('νεο',$result);
     }
 
 
-   /**
-    * testDolCountNbOfLine
-    *
-    * @return	int
-    */
+    /**
+     * testDolCountNbOfLine
+     *
+     * @return	int
+     */
     public function testDolCountNbOfLine()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
-		$result=dol_count_nb_of_line($file);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3,$result);
-
-		return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $file=dirname(__FILE__).'/Example_import_company_1.csv';
+        $result=dol_count_nb_of_line($file);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(3,$result);
+
+        return $result;
     }
 
-   /**
-    * testDolIsFileDir
-    *
-    * @return	int
-    */
+    /**
+     * testDolIsFileDir
+     *
+     * @return	int
+     */
     public function testDolIsFileDir()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+        $file=dirname(__FILE__).'/Example_import_company_1.csv';
 
-		$result=dol_is_file($file);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertTrue($result);
+        $result=dol_is_file($file);
+        print __METHOD__." result=".$result."\n";
+        $this->assertTrue($result);
 
-		$result=dol_is_dir($file);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertFalse($result);
+        $result=dol_is_dir($file);
+        print __METHOD__." result=".$result."\n";
+        $this->assertFalse($result);
 
-		return $result;
+        return $result;
     }
 
     /**
      * testDolOther
      *
      * @return boolean
-    */
+     */
     public function testDolOther()
     {
         global $conf,$user,$langs,$db;
@@ -211,12 +211,12 @@ 
         $db=$this->savdb;
 
         $url='http://www.dolibarr.org';
-  		$result=dol_is_url($url);
+            $result=dol_is_url($url);
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result);
 
         $url='https://www.dolibarr.org';
-  		$result=dol_is_url($url);
+            $result=dol_is_url($url);
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result);
 
@@ -235,42 +235,42 @@ 
      */
     public function testDolMimeType()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	// file.png
-    	$result=dol_mimetype('file.png','',0);
-    	$this->assertEquals('image/png',$result);
-    	$result=dol_mimetype('file.png','',1);
-    	$this->assertEquals('png',$result);
-    	$result=dol_mimetype('file.png','',2);
-    	$this->assertEquals('image.png',$result);
-    	$result=dol_mimetype('file.png','',3);
-    	$this->assertEquals('',$result);
-    	// file.odt
-    	$result=dol_mimetype('file.odt','',0);
-    	$this->assertEquals('application/vnd.oasis.opendocument.text',$result);
-    	$result=dol_mimetype('file.odt','',1);
-    	$this->assertEquals('vnd.oasis.opendocument.text',$result);
-    	$result=dol_mimetype('file.odt','',2);
-    	$this->assertEquals('ooffice.png',$result);
-    	$result=dol_mimetype('file.odt','',3);
-    	$this->assertEquals('',$result);
-    	// file.php
-    	$result=dol_mimetype('file.php','',0);
-    	$this->assertEquals('text/plain',$result);
-    	$result=dol_mimetype('file.php','',1);
-    	$this->assertEquals('plain',$result);
-    	$result=dol_mimetype('file.php','',2);
-    	$this->assertEquals('php.png',$result);
-    	$result=dol_mimetype('file.php','',3);
-    	$this->assertEquals('php',$result);
-    	// file.php.noexe
-    	$result=dol_mimetype('file.php.noexe','',0);
-    	$this->assertEquals('text/plain',$result);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        // file.png
+        $result=dol_mimetype('file.png','',0);
+        $this->assertEquals('image/png',$result);
+        $result=dol_mimetype('file.png','',1);
+        $this->assertEquals('png',$result);
+        $result=dol_mimetype('file.png','',2);
+        $this->assertEquals('image.png',$result);
+        $result=dol_mimetype('file.png','',3);
+        $this->assertEquals('',$result);
+        // file.odt
+        $result=dol_mimetype('file.odt','',0);
+        $this->assertEquals('application/vnd.oasis.opendocument.text',$result);
+        $result=dol_mimetype('file.odt','',1);
+        $this->assertEquals('vnd.oasis.opendocument.text',$result);
+        $result=dol_mimetype('file.odt','',2);
+        $this->assertEquals('ooffice.png',$result);
+        $result=dol_mimetype('file.odt','',3);
+        $this->assertEquals('',$result);
+        // file.php
+        $result=dol_mimetype('file.php','',0);
+        $this->assertEquals('text/plain',$result);
+        $result=dol_mimetype('file.php','',1);
+        $this->assertEquals('plain',$result);
+        $result=dol_mimetype('file.php','',2);
+        $this->assertEquals('php.png',$result);
+        $result=dol_mimetype('file.php','',3);
+        $this->assertEquals('php',$result);
+        // file.php.noexe
+        $result=dol_mimetype('file.php.noexe','',0);
+        $this->assertEquals('text/plain',$result);
     }
 
 
@@ -281,34 +281,34 @@ 
      */
     public function testDolDeleteDir()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$dirout=$conf->admin->dir_temp.'/test';
-    	$dirout2=$conf->admin->dir_temp.'/test2';
-
-    	$count=0;
-    	$result=dol_delete_dir_recursive($dirout,$count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0,$result);
-
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0,$result);
-    	$this->assertGreaterThanOrEqual(0,$countdeleted);
-
-    	dol_mkdir($dirout2);
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout2,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1,$result);
-    	$this->assertGreaterThanOrEqual(1,$countdeleted);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $dirout=$conf->admin->dir_temp.'/test';
+        $dirout2=$conf->admin->dir_temp.'/test2';
+
+        $count=0;
+        $result=dol_delete_dir_recursive($dirout,$count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0,$result);
+
+        $count=0;
+        $countdeleted=0;
+        $result=dol_delete_dir_recursive($dirout,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(0,$result);
+        $this->assertGreaterThanOrEqual(0,$countdeleted);
+
+        dol_mkdir($dirout2);
+        $count=0;
+        $countdeleted=0;
+        $result=dol_delete_dir_recursive($dirout2,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+        print __METHOD__." result=".$result."\n";
+        $this->assertGreaterThanOrEqual(1,$result);
+        $this->assertGreaterThanOrEqual(1,$countdeleted);
     }
 
 
@@ -459,7 +459,7 @@ 
         $savpermcreer = $user->rights->facture->creer;
 
 
-		// Check access to SPECIMEN
+        // Check access to SPECIMEN
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
         $filename='SPECIMEN.pdf';             // Filename relative to module part

Spacing +178 added lines, -178 removed lines

@@ -24,7 +24,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -64,11 +64,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		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;
@@ -78,8 +78,8 @@ 
 	// 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.
+    	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";
     }
@@ -87,7 +87,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -100,11 +100,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -126,27 +126,27 @@ 
      */
     public function testDolBasename()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-        $result=dol_basename('adir/afile');
+        $result = dol_basename('adir/afile');
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile',$result);
+		$this->assertEquals('afile', $result);
 
-		$result=dol_basename('adir/afile/');
+		$result = dol_basename('adir/afile/');
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('afile',$result);
+		$this->assertEquals('afile', $result);
 
-		$result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('νεο',$result);
+		$this->assertEquals('νεο', $result);
 
-		$result=dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο/'); // With cyrillic data. Here basename fails to return correct value
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('νεο',$result);
+		$this->assertEquals('νεο', $result);
     }
 
 
@@ -157,16 +157,16 @@ 
     */
     public function testDolCountNbOfLine()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
-		$result=dol_count_nb_of_line($file);
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
+		$result = dol_count_nb_of_line($file);
     	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3,$result);
+		$this->assertEquals(3, $result);
 
 		return $result;
     }
@@ -178,19 +178,19 @@ 
     */
     public function testDolIsFileDir()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
 
-		$result=dol_is_file($file);
+		$result = dol_is_file($file);
     	print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
-		$result=dol_is_dir($file);
+		$result = dol_is_dir($file);
     	print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result);
 
@@ -204,24 +204,24 @@ 
     */
     public function testDolOther()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $url='http://www.dolibarr.org';
-  		$result=dol_is_url($url);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $url = 'http://www.dolibarr.org';
+  		$result = dol_is_url($url);
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result);
 
-        $url='https://www.dolibarr.org';
-  		$result=dol_is_url($url);
+        $url = 'https://www.dolibarr.org';
+  		$result = dol_is_url($url);
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result);
 
-        $url='file://www.dolibarr.org/download/file.zip';
-        $result=dol_is_url($url);
+        $url = 'file://www.dolibarr.org/download/file.zip';
+        $result = dol_is_url($url);
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result);
 
@@ -235,42 +235,42 @@ 
      */
     public function testDolMimeType()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
     	// file.png
-    	$result=dol_mimetype('file.png','',0);
-    	$this->assertEquals('image/png',$result);
-    	$result=dol_mimetype('file.png','',1);
-    	$this->assertEquals('png',$result);
-    	$result=dol_mimetype('file.png','',2);
-    	$this->assertEquals('image.png',$result);
-    	$result=dol_mimetype('file.png','',3);
-    	$this->assertEquals('',$result);
+    	$result = dol_mimetype('file.png', '', 0);
+    	$this->assertEquals('image/png', $result);
+    	$result = dol_mimetype('file.png', '', 1);
+    	$this->assertEquals('png', $result);
+    	$result = dol_mimetype('file.png', '', 2);
+    	$this->assertEquals('image.png', $result);
+    	$result = dol_mimetype('file.png', '', 3);
+    	$this->assertEquals('', $result);
     	// file.odt
-    	$result=dol_mimetype('file.odt','',0);
-    	$this->assertEquals('application/vnd.oasis.opendocument.text',$result);
-    	$result=dol_mimetype('file.odt','',1);
-    	$this->assertEquals('vnd.oasis.opendocument.text',$result);
-    	$result=dol_mimetype('file.odt','',2);
-    	$this->assertEquals('ooffice.png',$result);
-    	$result=dol_mimetype('file.odt','',3);
-    	$this->assertEquals('',$result);
+    	$result = dol_mimetype('file.odt', '', 0);
+    	$this->assertEquals('application/vnd.oasis.opendocument.text', $result);
+    	$result = dol_mimetype('file.odt', '', 1);
+    	$this->assertEquals('vnd.oasis.opendocument.text', $result);
+    	$result = dol_mimetype('file.odt', '', 2);
+    	$this->assertEquals('ooffice.png', $result);
+    	$result = dol_mimetype('file.odt', '', 3);
+    	$this->assertEquals('', $result);
     	// file.php
-    	$result=dol_mimetype('file.php','',0);
-    	$this->assertEquals('text/plain',$result);
-    	$result=dol_mimetype('file.php','',1);
-    	$this->assertEquals('plain',$result);
-    	$result=dol_mimetype('file.php','',2);
-    	$this->assertEquals('php.png',$result);
-    	$result=dol_mimetype('file.php','',3);
-    	$this->assertEquals('php',$result);
+    	$result = dol_mimetype('file.php', '', 0);
+    	$this->assertEquals('text/plain', $result);
+    	$result = dol_mimetype('file.php', '', 1);
+    	$this->assertEquals('plain', $result);
+    	$result = dol_mimetype('file.php', '', 2);
+    	$this->assertEquals('php.png', $result);
+    	$result = dol_mimetype('file.php', '', 3);
+    	$this->assertEquals('php', $result);
     	// file.php.noexe
-    	$result=dol_mimetype('file.php.noexe','',0);
-    	$this->assertEquals('text/plain',$result);
+    	$result = dol_mimetype('file.php.noexe', '', 0);
+    	$this->assertEquals('text/plain', $result);
     }
 
 
@@ -281,34 +281,34 @@ 
      */
     public function testDolDeleteDir()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+    	$conf = $this->savconf;
+    	$user = $this->savuser;
+    	$langs = $this->savlangs;
+    	$db = $this->savdb;
 
-    	$dirout=$conf->admin->dir_temp.'/test';
-    	$dirout2=$conf->admin->dir_temp.'/test2';
+    	$dirout = $conf->admin->dir_temp.'/test';
+    	$dirout2 = $conf->admin->dir_temp.'/test2';
 
-    	$count=0;
-    	$result=dol_delete_dir_recursive($dirout,$count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+    	$count = 0;
+    	$result = dol_delete_dir_recursive($dirout, $count); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
     	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0,$result);
+    	$this->assertGreaterThanOrEqual(0, $result);
 
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+    	$count = 0;
+    	$countdeleted = 0;
+    	$result = dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
     	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(0,$result);
-    	$this->assertGreaterThanOrEqual(0,$countdeleted);
+    	$this->assertGreaterThanOrEqual(0, $result);
+    	$this->assertGreaterThanOrEqual(0, $countdeleted);
 
     	dol_mkdir($dirout2);
-    	$count=0;
-    	$countdeleted=0;
-    	$result=dol_delete_dir_recursive($dirout2,$count,1,0,$countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+    	$count = 0;
+    	$countdeleted = 0;
+    	$result = dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
     	print __METHOD__." result=".$result."\n";
-    	$this->assertGreaterThanOrEqual(1,$result);
-    	$this->assertGreaterThanOrEqual(1,$countdeleted);
+    	$this->assertGreaterThanOrEqual(1, $result);
+    	$this->assertGreaterThanOrEqual(1, $countdeleted);
     }
 
 
@@ -322,66 +322,66 @@ 
      */
     public function testDolCopyMoveDelete()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $file=dirname(__FILE__).'/Example_import_company_1.csv';
+        $file = dirname(__FILE__).'/Example_import_company_1.csv';
 
-        $result=dol_copy($file, '/adir/that/does/not/exists/file.csv');
+        $result = dol_copy($file, '/adir/that/does/not/exists/file.csv');
         print __METHOD__." result=".$result."\n";
-        $this->assertLessThan(0,$result,'copy dir that does not exists');    // We should have error
+        $this->assertLessThan(0, $result, 'copy dir that does not exists'); // We should have error
 
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv',0,1);
+        $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1,$result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv'.')');    // Should be 1
+        $this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv'.')'); // Should be 1
 
         // Again to test with overwriting=0
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv',0,0);
+        $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0,$result, 'copy destination already exists, no overwrite');    // Should be 0
+        $this->assertEquals(0, $result, 'copy destination already exists, no overwrite'); // Should be 0
 
         // Again to test with overwriting=1
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file.csv',0,1);
+        $result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1,$result,'copy destination already exists, overwrite');    // Should be 1
+        $this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite'); // Should be 1
 
         // To test a move that should work
-        $result=dol_move($conf->admin->dir_temp.'/file.csv',$conf->admin->dir_temp.'/file2.csv',0,1);
+        $result = dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result,'move with default mask');
+        $this->assertTrue($result, 'move with default mask');
 
         // To test a move that should work with forced mask
-        $result=dol_move($conf->admin->dir_temp.'/file2.csv',$conf->admin->dir_temp.'/file3.csv','0754',1); // file shoutld be rwxr-wr--
+        $result = dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file shoutld be rwxr-wr--
         print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result,'move with forced mask');
+        $this->assertTrue($result, 'move with forced mask');
 
         // To test a delete that should success
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
+        $result = dol_delete_file($conf->admin->dir_temp.'/file3.csv');
         print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result,'delete file');
+        $this->assertTrue($result, 'delete file');
 
         // Again to test there is error when deleting a non existing file with option disableglob
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3.csv',1,1);
+        $result = dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertFalse($result,'delete file that does not exists with disableglo must return ko');
+        $this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
 
         // Again to test there is no error when deleting a non existing file without option disableglob
-        $result=dol_delete_file($conf->admin->dir_temp.'/file3csv',0,1);
+        $result = dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result,'delete file that does not exists without disabling glob must return ok');
+        $this->assertTrue($result, 'delete file that does not exists without disabling glob must return ok');
 
         // Test copy with special char / delete with blob
-        $result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv',0,1);
+        $result = dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1,$result,'copy file with special chars, overwrite');    // Should be 1
+        $this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite'); // Should be 1
 
         // Try to delete using a glob criteria
-        $result=dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
+        $result = dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
         print __METHOD__." result=".$result."\n";
-        $this->assertTrue($result,'delete file using glob');
+        $this->assertTrue($result, 'delete file using glob');
     }
 
     /**
@@ -394,28 +394,28 @@ 
      */
     public function testDolCompressUnCompress()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $format='zip';
-        $filein=dirname(__FILE__).'/Example_import_company_1.csv';
-        $fileout=$conf->admin->dir_temp.'/test.'.$format;
-        $dirout=$conf->admin->dir_temp.'/test';
+        $format = 'zip';
+        $filein = dirname(__FILE__).'/Example_import_company_1.csv';
+        $fileout = $conf->admin->dir_temp.'/test.'.$format;
+        $dirout = $conf->admin->dir_temp.'/test';
 
         dol_delete_file($fileout);
-        $count=0;
-        dol_delete_dir_recursive($dirout,$count,1);
+        $count = 0;
+        dol_delete_dir_recursive($dirout, $count, 1);
 
-        $result=dol_compress_file($filein, $fileout, $format);
+        $result = dol_compress_file($filein, $fileout, $format);
         print __METHOD__." result=".$result."\n";
-        $this->assertGreaterThanOrEqual(1,$result);
+        $this->assertGreaterThanOrEqual(1, $result);
 
-        $result=dol_uncompress($fileout, $dirout);
-        print __METHOD__." result=".join(',',$result)."\n";
-        $this->assertEquals(0,count($result));
+        $result = dol_uncompress($fileout, $dirout);
+        print __METHOD__." result=".join(',', $result)."\n";
+        $this->assertEquals(0, count($result));
     }
 
     /**
@@ -428,12 +428,12 @@ 
      */
     public function testDolDirList()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
 
         // Scan dir to guaruante we on't have library jquery twice (we accept exception of duplicte into ckeditor because all dir is removed for debian package, so there is no duplicate).
-        $founddirs=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
+        $founddirs = dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
         print __METHOD__." count(founddirs)=".count($founddirs)."\n";
-        $this->assertEquals(1,count($founddirs));
+        $this->assertEquals(1, count($founddirs));
     }
 
 
@@ -444,11 +444,11 @@ 
      */
     public function testDolCheckSecureAccessDocument()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
 
         //$dummyuser=new User($db);
@@ -462,42 +462,42 @@ 
 		// Check access to SPECIMEN
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
-        $filename='SPECIMEN.pdf';             // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(1,$result['accessallowed']);
+        $filename = 'SPECIMEN.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1, $result['accessallowed']);
 
 
         // Check read permission
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 1;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(1,$result['accessallowed']);
+        $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(1, $result['accessallowed']);
 
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
-        $this->assertEquals(0,$result['accessallowed']);
+        $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+        $this->assertEquals(0, $result['accessallowed']);
 
         // Check write permission
         $user->rights->facture->lire = 0;
         $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(0,$result['accessallowed']);
+        $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        $this->assertEquals(0, $result['accessallowed']);
 
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 1;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(1,$result['accessallowed']);
+        $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        $this->assertEquals(1, $result['accessallowed']);
 
         $user->rights->facture->lire = 1;
         $user->rights->facture->creer = 0;
-        $filename='FA010101/FA010101.pdf';    // Filename relative to module part
-        $result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
-        $this->assertEquals(0,$result['accessallowed']);
+        $filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+        $result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+        $this->assertEquals(0, $result['accessallowed']);
 
 
         // We restore user properties

dolibarr/test/phpunit/BonPrelevementTest.php

Indentation +69 added lines, -69 removed lines

@@ -31,9 +31,9 @@ 
 
 if (empty($user->id))
 {
-	print "Load permissions for admin user nb 1\n";
-	$user->fetch(1);
-	$user->getrights();
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
@@ -49,32 +49,32 @@ 
  */
 class BonPrelevementTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return BankAccountTest
-	 */
-	function __construct()
-	{
-		parent::__construct();
-
-		//$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";
-	}
+    protected $savconf;
+    protected $savuser;
+    protected $savlangs;
+    protected $savdb;
+
+    /**
+     * Constructor
+     * We save global variables into local variables
+     *
+     * @return BankAccountTest
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        //$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";
+    }
 
     /**
      * setUpBeforeClass
@@ -83,10 +83,10 @@ 
      */
     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.
+        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";
+        print __METHOD__."\n";
     }
 
     /**
@@ -96,35 +96,35 @@ 
      */
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
-		$db->rollback();
+        global $conf,$user,$langs,$db;
+        $db->rollback();
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
-	/**
-	 * Init phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * Init phpunit tests
+     *
+     * @return	void
+     */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		print __METHOD__."\n";
+        print __METHOD__."\n";
     }
-	/**
-	 * End phpunit tests
-	 *
-	 * @return	void
-	 */
+    /**
+     * End phpunit tests
+     *
+     * @return	void
+     */
     protected function tearDown()
     {
-    	print __METHOD__."\n";
+        print __METHOD__."\n";
     }
 
     /**
@@ -134,34 +134,34 @@ 
      */
     public function testBonPrelevementCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
 
-		// TODO
-		// Create invoice
+        // TODO
+        // Create invoice
 
 
-		// Create payment with mode withdraw
+        // Create payment with mode withdraw
 
 
-		// Ask withdraw request
+        // Ask withdraw request
 
 
-		// Create withdraw record and generate SEPA file
-		$localobject=new BonPrelevement($this->savdb);
-    	//$localobject->date_solde=dol_now();
-    	$result=$localobject->Create(0,0,'simu');
+        // Create withdraw record and generate SEPA file
+        $localobject=new BonPrelevement($this->savdb);
+        //$localobject->date_solde=dol_now();
+        $result=$localobject->Create(0,0,'simu');
 
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, 0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals($result, 0);
 
-    	// Test SEPA file
+        // Test SEPA file
 
 
-    	return $result;
+        return $result;
     }
 
     /**

Spacing +22 added lines, -22 removed lines

@@ -23,7 +23,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -35,7 +35,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 $langs->load("main");
 
@@ -65,11 +65,11 @@ 
 		parent::__construct();
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		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;
@@ -83,8 +83,8 @@ 
      */
     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.
+    	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";
     }
@@ -96,7 +96,7 @@ 
      */
     public static function tearDownAfterClass()
     {
-    	global $conf,$user,$langs,$db;
+    	global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -109,11 +109,11 @@ 
 	 */
     protected function setUp()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		print __METHOD__."\n";
     }
@@ -134,11 +134,11 @@ 
      */
     public function testBonPrelevementCreate()
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+    	global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// TODO
 		// Create invoice
@@ -151,9 +151,9 @@ 
 
 
 		// Create withdraw record and generate SEPA file
-		$localobject=new BonPrelevement($this->savdb);
+		$localobject = new BonPrelevement($this->savdb);
     	//$localobject->date_solde=dol_now();
-    	$result=$localobject->Create(0,0,'simu');
+    	$result = $localobject->Create(0, 0, 'simu');
 
     	print __METHOD__." result=".$result."\n";
     	$this->assertEquals($result, 0);

dolibarr/test/phpunit/UserGroupTest.php

Indentation +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -95,7 +95,7 @@ 
      * Init phpunit tests
      *
      * @return  void
-    */
+     */
     protected function setUp()
     {
         global $conf,$user,$langs,$db;

Spacing +61 added lines, -61 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql'); // This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        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;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,11 +98,11 @@ 
     */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         print __METHOD__."\n";
     }
@@ -124,15 +124,15 @@ 
      */
     public function testUserGroupCreate()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new UserGroup($this->savdb);
+        $localobject = new UserGroup($this->savdb);
         $localobject->initAsSpecimen();
-        $result=$localobject->create($user);
+        $result = $localobject->create($user);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." result=".$result."\n";
@@ -149,14 +149,14 @@ 
      */
     public function testUserGroupFetch($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new UserGroup($this->savdb);
-        $result=$localobject->fetch($id);
+        $localobject = new UserGroup($this->savdb);
+        $result = $localobject->fetch($id);
 
         $this->assertLessThan($result, 0);
         print __METHOD__." id=".$id." result=".$result."\n";
@@ -173,14 +173,14 @@ 
      */
     public function testUserGroupUpdate($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        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);
+        $localobject->note = 'New note after update';
+        $result = $localobject->update($user);
 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
@@ -197,13 +197,13 @@ 
      */
     public function testUserGroupAddRight($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->addrights(1,'bookmarks');
+        $result = $localobject->addrights(1, 'bookmarks');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         $this->assertLessThan($result, 0);
@@ -220,13 +220,13 @@ 
      */
     public function testUserGroupDelRight($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $result=$localobject->delrights(1,'bookmarks');
+        $result = $localobject->delrights(1, 'bookmarks');
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
         $this->assertLessThan($result, 0);
@@ -243,11 +243,11 @@ 
      */
     public function testUserGroupOther($localobject)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
         /*$result=$localobject->setstatus(0);
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
@@ -271,15 +271,15 @@ 
      */
     public function testUserGroupDelete($id)
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
-
-        $localobject=new UserGroup($this->savdb);
-        $result=$localobject->fetch($id);
-        $result=$localobject->delete($id);
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
+
+        $localobject = new UserGroup($this->savdb);
+        $result = $localobject->fetch($id);
+        $result = $localobject->delete($id);
 
         print __METHOD__." id=".$id." result=".$result."\n";
         $this->assertLessThan($result, 0);

dolibarr/test/phpunit/functional/InstallTest.php

Indentation +153 added lines, -153 removed lines

@@ -23,263 +23,263 @@
  */
 class InstallTest extends PHPUnit_Extensions_Selenium2TestCase
 {
-	protected static $url = 'https://dev.dolibarr.org';
-	protected static $db_name = 'dolibarr_test';
-	protected static $db_host = 'localhost';
-	protected static $db_admin_user = 'root';
-	protected static $db_admin_pass = '';
-	protected static $db_user = 'dolibarr';
-	protected static $db_pass = 'dolibarr';
-	protected static $dol_admin_user = 'admin';
-	protected static $dol_admin_pass = 'admin';
-
-	public static $browsers = array(
-		array(
-			'browser' => 'chrome',
-			'browserName' => 'chrome',
-			'sessionStrategy' => 'shared',
-			'desiredCapabilities' => array()
-		)
-	);
+    protected static $url = 'https://dev.dolibarr.org';
+    protected static $db_name = 'dolibarr_test';
+    protected static $db_host = 'localhost';
+    protected static $db_admin_user = 'root';
+    protected static $db_admin_pass = '';
+    protected static $db_user = 'dolibarr';
+    protected static $db_pass = 'dolibarr';
+    protected static $dol_admin_user = 'admin';
+    protected static $dol_admin_pass = 'admin';
+
+    public static $browsers = array(
+        array(
+            'browser' => 'chrome',
+            'browserName' => 'chrome',
+            'sessionStrategy' => 'shared',
+            'desiredCapabilities' => array()
+        )
+    );
 
     /**
      * setUpBeforeClass
      *
      * @return	void
      */
-	public static function setUpBeforeClass()
-	{
-		// Make sure we backup and remove the configuration file to force new install.
-		@rename('htdocs/conf/conf.php', sys_get_temp_dir() . '/conf.php');
+    public static function setUpBeforeClass()
+    {
+        // Make sure we backup and remove the configuration file to force new install.
+        @rename('htdocs/conf/conf.php', sys_get_temp_dir() . '/conf.php');
 
-		// Start without a database
-		self::dropTestDatabase();
+        // Start without a database
+        self::dropTestDatabase();
 
-		// Run the tests in the same window
-		self::shareSession(true);
-	}
+        // Run the tests in the same window
+        self::shareSession(true);
+    }
 
     /**
      * dropTestDatabase
      *
      * @return	void
      */
-	protected static function dropTestDatabase()
-	{
-		$mysqli = new mysqli(self::$db_host, self::$db_admin_user, self::$db_admin_pass);
-		$mysqli->query("DROP DATABASE " . self::$db_name);
-	}
+    protected static function dropTestDatabase()
+    {
+        $mysqli = new mysqli(self::$db_host, self::$db_admin_user, self::$db_admin_pass);
+        $mysqli->query("DROP DATABASE " . self::$db_name);
+    }
 
     /**
      * tearDownAfterClass
      *
      * @return	void
      */
-	public static function tearDownAfterClass()
-	{
-		// Remove the generated configuration and restore the backed up file.
-		@unlink('htdocs/conf/conf.php');
-		@rename(sys_get_temp_dir() . '/conf.php', 'htdocs/conf/conf.php');
+    public static function tearDownAfterClass()
+    {
+        // Remove the generated configuration and restore the backed up file.
+        @unlink('htdocs/conf/conf.php');
+        @rename(sys_get_temp_dir() . '/conf.php', 'htdocs/conf/conf.php');
 
-		// Cleanup test database
-		self::dropTestDatabase();
-	}
+        // Cleanup test database
+        self::dropTestDatabase();
+    }
 
     /**
      * setUp
      *
      * @return  void
      */
-	public function setUp()
-	{
-		// Populating the database can take quite long.
-		$this->setSeleniumServerRequestsTimeout(120000);
-		$this->setBrowserUrl(self::$url);
-	}
+    public function setUp()
+    {
+        // Populating the database can take quite long.
+        $this->setSeleniumServerRequestsTimeout(120000);
+        $this->setBrowserUrl(self::$url);
+    }
 
     /**
      * testInstallRedirect
      *
      * @return  void
      */
-	public function testInstallRedirect()
-	{
-		$this->url('/');
-		$this->assertContains('/install/index.php', $this->url());
-	}
+    public function testInstallRedirect()
+    {
+        $this->url('/');
+        $this->assertContains('/install/index.php', $this->url());
+    }
 
     /**
      * testInstallPageTitle
      *
      * @return  void
      */
-	public function testInstallPageTitle()
-	{
-		$this->assertContains('Dolibarr', $this->title());
-	}
+    public function testInstallPageTitle()
+    {
+        $this->assertContains('Dolibarr', $this->title());
+    }
 
     /**
      * testInstallProcess
      *
      * @return  void
      */
-	public function testInstallProcess()
-	{
-		// FIXME: the button itself should have an ID
-		$this->byId('nextbutton')->byTag('input')->click();
-		$this->assertContains('/install/check.php', $this->url());
-	}
+    public function testInstallProcess()
+    {
+        // FIXME: the button itself should have an ID
+        $this->byId('nextbutton')->byTag('input')->click();
+        $this->assertContains('/install/check.php', $this->url());
+    }
 
     /**
      * testCheckPage
      *
      * @return  void
      */
-	public function testCheckPage()
-	{
-		$unavailable_choices = $this->byId('navail_choices');
-		$show_hide_choices = $this->byId('AShowChoices')->byTag('a');
-		$this->assertFalse($unavailable_choices->displayed());
-		// FIXME: the link itself should have an ID
-		$show_hide_choices->click();
-		$this->assertTrue($unavailable_choices->displayed());
-		$show_hide_choices->click();
-		$this->assertFalse($unavailable_choices->displayed());
-		$this->byClassName('button')->click();
-		$this->assertContains('/install/fileconf.php', $this->url());
-	}
+    public function testCheckPage()
+    {
+        $unavailable_choices = $this->byId('navail_choices');
+        $show_hide_choices = $this->byId('AShowChoices')->byTag('a');
+        $this->assertFalse($unavailable_choices->displayed());
+        // FIXME: the link itself should have an ID
+        $show_hide_choices->click();
+        $this->assertTrue($unavailable_choices->displayed());
+        $show_hide_choices->click();
+        $this->assertFalse($unavailable_choices->displayed());
+        $this->byClassName('button')->click();
+        $this->assertContains('/install/fileconf.php', $this->url());
+    }
 
     /**
      * testForm
      *
      * @return  void
      */
-	public function testForm()
-	{
-		$this->assertFalse($this->byClassName('hideroot')->displayed());
-		$this->assertTrue($this->byClassName('hidesqlite')->displayed());
+    public function testForm()
+    {
+        $this->assertFalse($this->byClassName('hideroot')->displayed());
+        $this->assertTrue($this->byClassName('hidesqlite')->displayed());
 
-		// FIXME: This element should have an ID
-		$this->assertFalse($this->byName('main_force_https')->selected());
-		$this->byName('main_force_https')->click();
+        // FIXME: This element should have an ID
+        $this->assertFalse($this->byName('main_force_https')->selected());
+        $this->byName('main_force_https')->click();
 
-		$this->assertEquals('dolibarr', $this->byId('db_name')->value());
-		$this->byId('db_name')->clear();
-		$this->byId('db_name')->value(self::$db_name);
+        $this->assertEquals('dolibarr', $this->byId('db_name')->value());
+        $this->byId('db_name')->clear();
+        $this->byId('db_name')->value(self::$db_name);
 
-		$this->assertEquals('mysqli', $this->byId('db_type')->value());
+        $this->assertEquals('mysqli', $this->byId('db_type')->value());
 
-		// FIXME: This element should have an ID
-		$this->assertEquals('localhost', $this->byName('db_host')->value());
+        // FIXME: This element should have an ID
+        $this->assertEquals('localhost', $this->byName('db_host')->value());
 
-		$this->assertEquals(3306, $this->byId('db_port')->value());
+        $this->assertEquals(3306, $this->byId('db_port')->value());
 
-		$this->assertEquals('llx_', $this->byId('db_prefix')->value());
+        $this->assertEquals('llx_', $this->byId('db_prefix')->value());
 
-		$this->byId('db_create_database')->click();
-		$this->assertTrue($this->byClassName('hideroot')->displayed());
-		$this->byId('db_create_database')->click();
-		$this->assertFalse($this->byClassName('hideroot')->displayed());
+        $this->byId('db_create_database')->click();
+        $this->assertTrue($this->byClassName('hideroot')->displayed());
+        $this->byId('db_create_database')->click();
+        $this->assertFalse($this->byClassName('hideroot')->displayed());
 
-		$this->byId('db_user')->value(self::$db_user);
+        $this->byId('db_user')->value(self::$db_user);
 
-		$this->byId('db_pass')->value(self::$db_pass);
+        $this->byId('db_pass')->value(self::$db_pass);
 
-		$this->byId('db_create_user')->click();
-		$this->assertTrue($this->byClassName('hideroot')->displayed());
-		$this->byId('db_create_user')->click();
-		$this->assertFalse($this->byClassName('hideroot')->displayed());
+        $this->byId('db_create_user')->click();
+        $this->assertTrue($this->byClassName('hideroot')->displayed());
+        $this->byId('db_create_user')->click();
+        $this->assertFalse($this->byClassName('hideroot')->displayed());
 
-		$this->byId('db_create_database')->click();
-		$this->byId('db_create_user')->click();
-		$this->assertTrue($this->byClassName('hideroot')->displayed());
+        $this->byId('db_create_database')->click();
+        $this->byId('db_create_user')->click();
+        $this->assertTrue($this->byClassName('hideroot')->displayed());
 
-		$this->byId('db_user_root')->value('root');
-		$this->byId('db_pass_root')->value('');
-	}
+        $this->byId('db_user_root')->value('root');
+        $this->byId('db_pass_root')->value('');
+    }
 
     /**
      * testFormSubmit
      *
      * @return  void
      */
-	public function testFormSubmit()
-	{
-		$this->byName('forminstall')->submit();
-		$this->assertContains('/install/step1.php', $this->url());
-	}
+    public function testFormSubmit()
+    {
+        $this->byName('forminstall')->submit();
+        $this->assertContains('/install/step1.php', $this->url());
+    }
 
     /**
      * testStep1
      *
      * @return  void
      */
-	public function testStep1()
-	{
-		$this->assertFalse($this->byId('pleasewait')->displayed());
-		$start = new DateTimeImmutable();
-		// FIXME: the button itself should have an ID
-		$this->byId('nextbutton')->byTag('input')->click();
-		$time = $start->diff(new DateTimeImmutable());
-		echo "\nPopulating the database took " . $time->format("%s seconds.\n");
-		$this->assertContains('/install/step2.php', $this->url());
-	}
+    public function testStep1()
+    {
+        $this->assertFalse($this->byId('pleasewait')->displayed());
+        $start = new DateTimeImmutable();
+        // FIXME: the button itself should have an ID
+        $this->byId('nextbutton')->byTag('input')->click();
+        $time = $start->diff(new DateTimeImmutable());
+        echo "\nPopulating the database took " . $time->format("%s seconds.\n");
+        $this->assertContains('/install/step2.php', $this->url());
+    }
 
     /**
      * testStep2
      *
      * @return  void
      */
-	public function testStep2()
-	{
-		$this->byName('forminstall')->submit();
-		$this->assertContains('/install/step4.php', $this->url());
-	}
+    public function testStep2()
+    {
+        $this->byName('forminstall')->submit();
+        $this->assertContains('/install/step4.php', $this->url());
+    }
 
-	// There is no step 3
+    // There is no step 3
 
     /**
      * testStep4
      *
      * @return  void
      */
-	public function testStep4()
-	{
-		// FIXME: should have an ID
-		$this->byName('login')->value(self::$dol_admin_user);
-		// FIXME: should have an ID
-		$this->byName('pass')->value('admin');
-		// FIXME: should have an ID
-		$this->byName('pass_verif')->value(self::$dol_admin_pass);
-		// FIXME: the button itself should have an ID
-		$this->byId('nextbutton')->byTag('input')->click();
-		$this->assertContains('/install/step5.php', $this->url());
-	}
+    public function testStep4()
+    {
+        // FIXME: should have an ID
+        $this->byName('login')->value(self::$dol_admin_user);
+        // FIXME: should have an ID
+        $this->byName('pass')->value('admin');
+        // FIXME: should have an ID
+        $this->byName('pass_verif')->value(self::$dol_admin_pass);
+        // FIXME: the button itself should have an ID
+        $this->byId('nextbutton')->byTag('input')->click();
+        $this->assertContains('/install/step5.php', $this->url());
+    }
 
     /**
      * testStep5
      *
      * @return  void
      */
-	public function testStep5()
-	{
-		// FIXME: this button should have an ID
-		$this->byTag('a')->click();
-		$this->assertContains('/admin/index.php', $this->url());
-	}
+    public function testStep5()
+    {
+        // FIXME: this button should have an ID
+        $this->byTag('a')->click();
+        $this->assertContains('/admin/index.php', $this->url());
+    }
 
     /**
      * testFirstLogin
      *
      * @return  void
      */
-	public function testFirstLogin()
-	{
-		$this->assertEquals('login', $this->byTag('form')->attribute('id'));
-		$this->assertEquals(self::$dol_admin_user, $this->byId('username')->value());
-		$this->byId('password')->value(self::$dol_admin_pass);
-		// FIXME: login button should have an ID
-		$this->byId('login')->submit();
-		$this->assertEquals('mainbody', $this->byTag('body')->attribute('id'));
-	}
+    public function testFirstLogin()
+    {
+        $this->assertEquals('login', $this->byTag('form')->attribute('id'));
+        $this->assertEquals(self::$dol_admin_user, $this->byId('username')->value());
+        $this->byId('password')->value(self::$dol_admin_pass);
+        // FIXME: login button should have an ID
+        $this->byId('login')->submit();
+        $this->assertEquals('mainbody', $this->byTag('body')->attribute('id'));
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
 	public static function setUpBeforeClass()
 	{
 		// Make sure we backup and remove the configuration file to force new install.
-		@rename('htdocs/conf/conf.php', sys_get_temp_dir() . '/conf.php');
+		@rename('htdocs/conf/conf.php', sys_get_temp_dir().'/conf.php');
 
 		// Start without a database
 		self::dropTestDatabase();
@@ -67,7 +67,7 @@ 
 	protected static function dropTestDatabase()
 	{
 		$mysqli = new mysqli(self::$db_host, self::$db_admin_user, self::$db_admin_pass);
-		$mysqli->query("DROP DATABASE " . self::$db_name);
+		$mysqli->query("DROP DATABASE ".self::$db_name);
 	}
 
     /**
@@ -79,7 +79,7 @@ 
 	{
 		// Remove the generated configuration and restore the backed up file.
 		@unlink('htdocs/conf/conf.php');
-		@rename(sys_get_temp_dir() . '/conf.php', 'htdocs/conf/conf.php');
+		@rename(sys_get_temp_dir().'/conf.php', 'htdocs/conf/conf.php');
 
 		// Cleanup test database
 		self::dropTestDatabase();
@@ -221,7 +221,7 @@ 
 		// FIXME: the button itself should have an ID
 		$this->byId('nextbutton')->byTag('input')->click();
 		$time = $start->diff(new DateTimeImmutable());
-		echo "\nPopulating the database took " . $time->format("%s seconds.\n");
+		echo "\nPopulating the database took ".$time->format("%s seconds.\n");
 		$this->assertContains('/install/step2.php', $this->url());
 	}
 

dolibarr/test/phpunit/functional/TakePosFunctionalTest.php

Indentation +248 added lines, -248 removed lines

@@ -41,32 +41,32 @@ 
  */
 class TakePosFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 {
-	// TODO: move to a global configuration file?
-	/** @var string Base URL of the webserver under test */
-	protected static $base_url = 'http://dev.zenfusion.fr';
-	/**
-	 * @var string Dolibarr admin username
-	 * @see authenticate
-	 */
-	protected static $dol_admin_user = 'admin';
-	/**
-	 * @var string Dolibarr admin password
-	 * @see authenticate
-	 */
-	protected static $dol_admin_pass = 'admin';
-	/** @var int Dolibarr module ID */
-	private static $module_id = 500000; // TODO: autodetect?
+    // TODO: move to a global configuration file?
+    /** @var string Base URL of the webserver under test */
+    protected static $base_url = 'http://dev.zenfusion.fr';
+    /**
+     * @var string Dolibarr admin username
+     * @see authenticate
+     */
+    protected static $dol_admin_user = 'admin';
+    /**
+     * @var string Dolibarr admin password
+     * @see authenticate
+     */
+    protected static $dol_admin_pass = 'admin';
+    /** @var int Dolibarr module ID */
+    private static $module_id = 500000; // TODO: autodetect?
 
-	/** @var array Browsers to test with */
-	public static $browsers = array(
-		array(
-			'browser' => 'Google Chrome on Linux',
-			'browserName' => 'chrome',
-			'sessionStrategy' => 'shared',
-			'desiredCapabilities' => array()
-		),
-		// Geckodriver does not keep the session at the moment?!
-		// XPath selectors also don't seem to work
+    /** @var array Browsers to test with */
+    public static $browsers = array(
+        array(
+            'browser' => 'Google Chrome on Linux',
+            'browserName' => 'chrome',
+            'sessionStrategy' => 'shared',
+            'desiredCapabilities' => array()
+        ),
+        // Geckodriver does not keep the session at the moment?!
+        // XPath selectors also don't seem to work
 //        array(
 //            'browser' => 'Mozilla Firefox on Linux',
 //            'browserName' => 'firefox',
@@ -75,243 +75,243 @@ 
 //                'marionette' => true
 //            )
 //        )
-	);
+    );
 
-	/**
-	 * Helper function to select links by href
-	 *
-	 * @param  string  $value      Href
-	 * @return mixed               Helper string
-	 */
-	protected function byHref($value)
-	{
-		$anchor = null;
-		$anchors = $this->elements($this->using('tag name')->value('a'));
-		foreach ($anchors as $anchor) {
-			if (strstr($anchor->attribute('href'), $value)) {
-				break;
-			}
-		}
-		return $anchor;
-	}
+    /**
+     * Helper function to select links by href
+     *
+     * @param  string  $value      Href
+     * @return mixed               Helper string
+     */
+    protected function byHref($value)
+    {
+        $anchor = null;
+        $anchors = $this->elements($this->using('tag name')->value('a'));
+        foreach ($anchors as $anchor) {
+            if (strstr($anchor->attribute('href'), $value)) {
+                break;
+            }
+        }
+        return $anchor;
+    }
 
-	/**
-	 * Global test setup
-	 *
-	 * @return	void
-	 */
-	public static function setUpBeforeClass()
-	{
-	}
+    /**
+     * Global test setup
+     *
+     * @return	void
+     */
+    public static function setUpBeforeClass()
+    {
+    }
 
-	/**
-	 * Unit test setup
-	 *
-	 * @return	void
-	 */
-	public function setUp()
-	{
-		$this->setSeleniumServerRequestsTimeout(3600);
-		$this->setBrowserUrl(self::$base_url);
-	}
+    /**
+     * Unit test setup
+     *
+     * @return	void
+     */
+    public function setUp()
+    {
+        $this->setSeleniumServerRequestsTimeout(3600);
+        $this->setBrowserUrl(self::$base_url);
+    }
 
-	/**
-	 * Verify pre conditions
-	 *
-	 * @return	void
-	 */
-	protected function assertPreConditions()
-	{
-	}
+    /**
+     * Verify pre conditions
+     *
+     * @return	void
+     */
+    protected function assertPreConditions()
+    {
+    }
 
-	/**
-	 * Handle Dolibarr authentication
-	 *
-	 * @return	void
-	 */
-	private function authenticate()
-	{
-		try {
-			if ($this->byId('login')) {
-				$login = $this->byId('username');
-				$login->clear();
-				$login->value('admin');
-				$password = $this->byId('password');
-				$password->clear();
-				$password->value('admin');
-				$this->byId('login')->submit();
-			}
-		} catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
-			// Login does not exist. Assume we are already authenticated
-		}
-	}
+    /**
+     * Handle Dolibarr authentication
+     *
+     * @return	void
+     */
+    private function authenticate()
+    {
+        try {
+            if ($this->byId('login')) {
+                $login = $this->byId('username');
+                $login->clear();
+                $login->value('admin');
+                $password = $this->byId('password');
+                $password->clear();
+                $password->value('admin');
+                $this->byId('login')->submit();
+            }
+        } catch (PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+            // Login does not exist. Assume we are already authenticated
+        }
+    }
 
-	/**
-	 * Test enabling developer mode
-	 *
-	 * @return	void
-	 */
-	public function testEnableDeveloperMode()
-	{
-		$this->url('/admin/const.php');
-		$this->authenticate();
-		$main_features_level_path='//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
-		$main_features_level = $this->byXPath($main_features_level_path);
-		$main_features_level->clear();
-		$main_features_level->value('2');
-		$this->byName('update')->click();
-		// Page reloaded, we need a new XPath
-		$main_features_level = $this->byXPath($main_features_level_path);
-		$this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
-	}
+    /**
+     * Test enabling developer mode
+     *
+     * @return	void
+     */
+    public function testEnableDeveloperMode()
+    {
+        $this->url('/admin/const.php');
+        $this->authenticate();
+        $main_features_level_path='//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
+        $main_features_level = $this->byXPath($main_features_level_path);
+        $main_features_level->clear();
+        $main_features_level->value('2');
+        $this->byName('update')->click();
+        // Page reloaded, we need a new XPath
+        $main_features_level = $this->byXPath($main_features_level_path);
+        $this->assertEquals('2', $main_features_level->value(), "MAIN_FEATURES_LEVEL value is 2");
+    }
 
-	/**
-	 * Test enabling the module
-	 *
-	 * @return	void
-	 *
-	 * @depends testEnableDeveloperMode
-	 */
-	public function testModuleEnabled()
-	{
-		$this->url('/admin/modules.php');
-		$this->authenticate();
-		$module_status_image_path='//a[contains(@href, "' . self::$module_id . '")]/img';
-		$module_status_image = $this->byXPath($module_status_image_path);
-		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
-			// Enable the module
-			$this->byHref('modTakePos')->click();
-		} else {
-			// Disable the module
-			$this->byHref('modTakePos')->click();
-			// Reenable the module
-			$this->byHref('modTakePos')->click();
-		}
-		// Page reloaded, we need a new Xpath
-		$module_status_image = $this->byXPath($module_status_image_path);
-		$this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
-	}
+    /**
+     * Test enabling the module
+     *
+     * @return	void
+     *
+     * @depends testEnableDeveloperMode
+     */
+    public function testModuleEnabled()
+    {
+        $this->url('/admin/modules.php');
+        $this->authenticate();
+        $module_status_image_path='//a[contains(@href, "' . self::$module_id . '")]/img';
+        $module_status_image = $this->byXPath($module_status_image_path);
+        if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
+            // Enable the module
+            $this->byHref('modTakePos')->click();
+        } else {
+            // Disable the module
+            $this->byHref('modTakePos')->click();
+            // Reenable the module
+            $this->byHref('modTakePos')->click();
+        }
+        // Page reloaded, we need a new Xpath
+        $module_status_image = $this->byXPath($module_status_image_path);
+        $this->assertContains('switch_on.png', $module_status_image->attribute('src'), "Module enabled");
+    }
 
-	/**
-	 * Test access to the configuration page
-	 *
-	 * @return	void
-	 *
-	 * @depends testModuleEnabled
-	 */
-	public function testConfigurationPage()
-	{
-		$this->url('/custom/takepos/admin/setup.php');
-		$this->authenticate();
-		$this->assertContains('takepos/admin/setup.php', $this->url(), 'Configuration page');
-	}
+    /**
+     * Test access to the configuration page
+     *
+     * @return	void
+     *
+     * @depends testModuleEnabled
+     */
+    public function testConfigurationPage()
+    {
+        $this->url('/custom/takepos/admin/setup.php');
+        $this->authenticate();
+        $this->assertContains('takepos/admin/setup.php', $this->url(), 'Configuration page');
+    }
 
-	/**
-	 * Test access to the about page
-	 *
-	 * @return	void
-	 *
-	 * @depends testConfigurationPage
-	 */
-	public function testAboutPage()
-	{
-		$this->url('/custom/takepos/admin/about.php');
-		$this->authenticate();
-		$this->assertContains('takepos/admin/about.php', $this->url(), 'About page');
-	}
+    /**
+     * Test access to the about page
+     *
+     * @return	void
+     *
+     * @depends testConfigurationPage
+     */
+    public function testAboutPage()
+    {
+        $this->url('/custom/takepos/admin/about.php');
+        $this->authenticate();
+        $this->assertContains('takepos/admin/about.php', $this->url(), 'About page');
+    }
 
-	/**
-	 * Test about page is rendering Markdown
-	 *
-	 * @return	void
-	 *
-	 * @depends testAboutPage
-	 */
-	public function testAboutPageRendersMarkdownReadme()
-	{
-		$this->url('/custom/takepos/admin/about.php');
-		$this->authenticate();
-		$this->assertEquals(
-			'Dolibarr Module Template (aka My Module)',
-			$this->byTag('h1')->text(),
-			"Readme title"
-		);
-	}
+    /**
+     * Test about page is rendering Markdown
+     *
+     * @return	void
+     *
+     * @depends testAboutPage
+     */
+    public function testAboutPageRendersMarkdownReadme()
+    {
+        $this->url('/custom/takepos/admin/about.php');
+        $this->authenticate();
+        $this->assertEquals(
+            'Dolibarr Module Template (aka My Module)',
+            $this->byTag('h1')->text(),
+            "Readme title"
+        );
+    }
 
-	/**
-	 * Test box is properly declared
-	 *
-	 * @return	void
-	 *
-	 * @depends testModuleEnabled
-	 */
-	public function testBoxDeclared()
-	{
-		$this->url('/admin/boxes.php');
-		$this->authenticate();
-		$this->assertContains('takeposwidget1', $this->source(), "Box enabled");
-	}
+    /**
+     * Test box is properly declared
+     *
+     * @return	void
+     *
+     * @depends testModuleEnabled
+     */
+    public function testBoxDeclared()
+    {
+        $this->url('/admin/boxes.php');
+        $this->authenticate();
+        $this->assertContains('takeposwidget1', $this->source(), "Box enabled");
+    }
 
-	/**
-	 * Test trigger is properly enabled
-	 *
-	 * @return	void
-	 *
-	 * @depends testModuleEnabled
-	 */
-	public function testTriggerDeclared()
-	{
-		$this->url('/admin/triggers.php');
-		$this->authenticate();
-		$this->assertContains(
-			'interface_99_modTakePos_TakePosTriggers.class.php',
-			$this->byTag('body')->text(),
-			"Trigger declared"
-		);
-	}
+    /**
+     * Test trigger is properly enabled
+     *
+     * @return	void
+     *
+     * @depends testModuleEnabled
+     */
+    public function testTriggerDeclared()
+    {
+        $this->url('/admin/triggers.php');
+        $this->authenticate();
+        $this->assertContains(
+            'interface_99_modTakePos_TakePosTriggers.class.php',
+            $this->byTag('body')->text(),
+            "Trigger declared"
+        );
+    }
 
-	/**
-	 * Test trigger is properly declared
-	 *
-	 * @return	void
-	 *
-	 * @depends testTriggerDeclared
-	 */
-	public function testTriggerEnabled()
-	{
-		$this->url('/admin/triggers.php');
-		$this->authenticate();
-		$this->assertContains(
-			'tick.png',
-			$this->byXPath('//td[text()="interface_99_modTakePos_MyTrigger.class.php"]/following::img')->attribute('src'),
-			"Trigger enabled"
-		);
-	}
+    /**
+     * Test trigger is properly declared
+     *
+     * @return	void
+     *
+     * @depends testTriggerDeclared
+     */
+    public function testTriggerEnabled()
+    {
+        $this->url('/admin/triggers.php');
+        $this->authenticate();
+        $this->assertContains(
+            'tick.png',
+            $this->byXPath('//td[text()="interface_99_modTakePos_MyTrigger.class.php"]/following::img')->attribute('src'),
+            "Trigger enabled"
+        );
+    }
 
-	/**
-	 * Verify post conditions
-	 *
-	 * @return	void
-	 */
-	protected function assertPostConditions()
-	{
-	}
+    /**
+     * Verify post conditions
+     *
+     * @return	void
+     */
+    protected function assertPostConditions()
+    {
+    }
 
-	/**
-	 * Unit test teardown
-	 *
-	 * @return	void
-	 */
-	public function tearDown()
-	{
-	}
+    /**
+     * Unit test teardown
+     *
+     * @return	void
+     */
+    public function tearDown()
+    {
+    }
 
-	/**
-	 * Global test teardown
-	 *
-	 * @return	void
-	 */
-	public static function tearDownAfterClass()
-	{
-	}
+    /**
+     * Global test teardown
+     *
+     * @return	void
+     */
+    public static function tearDownAfterClass()
+    {
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
 	{
 		$this->url('/admin/const.php');
 		$this->authenticate();
-		$main_features_level_path='//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
+		$main_features_level_path = '//input[@value="MAIN_FEATURES_LEVEL"]/following::input[@type="text"]';
 		$main_features_level = $this->byXPath($main_features_level_path);
 		$main_features_level->clear();
 		$main_features_level->value('2');
@@ -176,7 +176,7 @@ 
 	{
 		$this->url('/admin/modules.php');
 		$this->authenticate();
-		$module_status_image_path='//a[contains(@href, "' . self::$module_id . '")]/img';
+		$module_status_image_path = '//a[contains(@href, "'.self::$module_id.'")]/img';
 		$module_status_image = $this->byXPath($module_status_image_path);
 		if (strstr($module_status_image->attribute('src'), 'switch_off.png')) {
 			// Enable the module

dolibarr/test/phpunit/CMailFileTest.php

Indentation +2 added lines, -2 removed lines

@@ -59,9 +59,9 @@
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;

Spacing +53 added lines, -53 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -34,7 +34,7 @@ 
     $user->fetch(1);
     $user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -62,11 +62,11 @@ 
     	parent::__construct();
 
     	//$this->sharedFixture
-        global $conf,$user,$langs,$db;
-        $this->savconf=$conf;
-        $this->savuser=$user;
-        $this->savlangs=$langs;
-        $this->savdb=$db;
+        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;
@@ -76,7 +76,7 @@ 
     // Static methods
     public static function setUpBeforeClass()
     {
-        global $conf,$user,$langs,$db;
+        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";
@@ -85,7 +85,7 @@ 
     // tear down after class
     public static function tearDownAfterClass()
     {
-        global $conf,$user,$langs,$db;
+        global $conf, $user, $langs, $db;
         $db->rollback();
 
         print __METHOD__."\n";
@@ -98,13 +98,13 @@ 
      */
     protected function setUp()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
+        $conf->global->MAIN_DISABLE_ALL_MAILS = 1; // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
 
         print __METHOD__."\n";
     }
@@ -125,17 +125,17 @@ 
      */
     public function testCMailFileText()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new CMailFile('Test','test@test.com','from@from.com','Message txt',array(),array(),array(),'','',1,0);
+        $localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
-        $result=$localobject->sendfile();
+        $result = $localobject->sendfile();
         print __METHOD__." result=".$result."\n";
-        $this->assertFalse($result);   // False because mail send disabled
+        $this->assertFalse($result); // False because mail send disabled
 
         return $result;
     }
@@ -147,53 +147,53 @@ 
      */
     public function testCMailFileStatic()
     {
-        global $conf,$user,$langs,$db;
-        $conf=$this->savconf;
-        $user=$this->savuser;
-        $langs=$this->savlangs;
-        $db=$this->savdb;
+        global $conf, $user, $langs, $db;
+        $conf = $this->savconf;
+        $user = $this->savuser;
+        $langs = $this->savlangs;
+        $db = $this->savdb;
 
-        $localobject=new CMailFile('','','','');
+        $localobject = new CMailFile('', '', '', '');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,0);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 0);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'John Doe <john@doe.com>');
+        $this->assertEquals($result, 'John Doe <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,1);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'<john@doe.com>');
+        $this->assertEquals($result, '<john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,2);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 2);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'john@doe.com');
+        $this->assertEquals($result, 'john@doe.com');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,3,0);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 3, 0);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'"John Doe" <john@doe.com>');
+        $this->assertEquals($result, '"John Doe" <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,3,1);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 3, 1);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
+        $this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
-        $src='John Doe <john@doe.com>';
-        $result=$localobject->getValidAddress($src,4);
+        $src = 'John Doe <john@doe.com>';
+        $result = $localobject->getValidAddress($src, 4);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'John Doe');
+        $this->assertEquals($result, 'John Doe');
 
-        $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-        $result=$localobject->getValidAddress($src,4);
+        $src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+        $result = $localobject->getValidAddress($src, 4);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'John Doe,John Doe2,John Doe3');
+        $this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
-        $src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-        $result=$localobject->getValidAddress($src,4,0,2);
+        $src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+        $result = $localobject->getValidAddress($src, 4, 0, 2);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result,'John Doe,John Doe2...');
+        $this->assertEquals($result, 'John Doe,John Doe2...');
 
         return $result;
     }