alxarafe / alixar

dolibarr/test/phpunit/PricesTest.php

Indentation +105 added lines, -105 removed lines

@@ -67,9 +67,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -100,9 +100,9 @@ 
     }
 
     /**
-	 * Init phpunit tests
-	 *
-	 * @return	void
+     * Init phpunit tests
+     *
+     * @return	void
      */
     protected function setUp()
     {
@@ -116,9 +116,9 @@ 
     }
 
     /**
-	 * End phpunit tests
-	 *
-	 * @return	void
+     * End phpunit tests
+     *
+     * @return	void
      */
     protected function tearDown()
     {
@@ -134,44 +134,44 @@ 
      */
     public function testCalculPriceTotal()
     {
-		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;
 
-		global $mysoc;
-		$mysoc=new Societe($db);
+        global $mysoc;
+        $mysoc=new Societe($db);
 
-		// To force status that say module multicompany is on
-		//$conf->multicurrency=new stdClass();
-		//$conf->multicurrency->enabled = 0;
+        // To force status that say module multicompany is on
+        //$conf->multicurrency=new stdClass();
+        //$conf->multicurrency->enabled = 0;
 
 
-		/*
+        /*
 		 *  Country France
 		 */
 
-		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
+        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value)
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0, 1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0),$result1,'Test1 FR');
 
-		// qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
+        // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value)
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(2, 8.56, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(17.12, 1.71, 18.83, 8.56, 0.856, 9.416, 17.12, 1.71, 18.83, 0, 0, 0, 0, 0, 0, 0, 18.7, 1.87, 20.57, 9.34795, 0.93479, 10.28274, 18.7, 1.87, 20.57, 0, 0),$result1,'Test1b FR');
 
-		// qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
-		$mysoc->country_code='FR';
-		$mysoc->country_id=1;
-		$result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
+        // qty=2, unit_price=0, discount_line=0, vat_rate=10, price_base_type='HT', multicurrency_tx=1.09205 (method we provide value), pu_ht_devise=100
+        $mysoc->country_code='FR';
+        $mysoc->country_id=1;
+        $result1=calcul_price_total(2, 0, 0, 10, 0, 0, 0, 'HT', 0, 0, '', '', 100, 1.09205, 20);
         print __METHOD__." result1=".join(', ',$result1)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(36.63, 3.66, 40.29, 18.31418, 1.83142, 20.1456, 36.63, 3.66, 40.29, 0, 0, 0, 0, 0, 0, 0, 40, 4, 44, 20, 2, 22, 40, 4, 44, 0, 0),$result1,'Test1c FR');
@@ -181,21 +181,21 @@ 
 		 */
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=0;
+        $result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test1 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=0;
-		$result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=0;
+        $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2
         print __METHOD__." result2=".join(', ',$result2)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test2 ES');
@@ -203,76 +203,76 @@ 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test3 ES');
 
         // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect)
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0, 100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0),$result2,'Test4 ES');
 
         // --------------------------------------------------------
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1);
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test5 ES for service');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test6 ES for product');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0, 100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0),$result2,'Test6 ES for product');
 
         // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test6 ES for service');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19, 100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19),$result2,'Test6 ES for service');
 
-		// --------------------------------------------------------
+        // --------------------------------------------------------
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		// result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
-		$this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0),$result2,'Test7 ES for product');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
+        $this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0, -100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0),$result2,'Test7 ES for product');
 
         // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product
-		$mysoc->country_code='ES';
-		$mysoc->country_id=4;
-		$mysoc->localtax1_assuj=0;
-		$mysoc->localtax2_assuj=1;
+        $mysoc->country_code='ES';
+        $mysoc->country_id=4;
+        $mysoc->localtax1_assuj=0;
+        $mysoc->localtax2_assuj=1;
         $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1);
-		print __METHOD__." result2=".join(', ',$result2)."\n";
-		$this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19),$result2,'Test8 ES for service');
+        print __METHOD__." result2=".join(', ',$result2)."\n";
+        $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19, -100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19),$result2,'Test8 ES for service');
 
 
         /*
@@ -280,23 +280,23 @@ 
          */
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
+        $mysoc->country_code='CI';
+        $mysoc->country_id=21;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
         //$localtaxes=getLocalTaxesFromRate(18, 0, null, $mysoc);
         //var_dump($locataxes);
-		$result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        $result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test9 CI');
 
         // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect)
-		$mysoc->country_code='CI';
-		$mysoc->country_id=21;
-		$mysoc->localtax1_assuj=1;
-		$mysoc->localtax2_assuj=0;
-		$result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
+        $mysoc->country_code='CI';
+        $mysoc->country_id=21;
+        $mysoc->localtax1_assuj=1;
+        $mysoc->localtax2_assuj=0;
+        $result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0);	// 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2
         print __METHOD__." result3=".join(', ',$result3)."\n";
         // result[0,1,2,3,4,5,6,7,8]	(total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount)
         $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0, 100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0),$result3,'Test10 CI');
@@ -313,17 +313,17 @@ 
      */
     public function testUpdatePrice()
     {
-		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+        //$this->sharedFixture
+        global $conf,$user,$langs,$db;
+        $this->savconf=$conf;
+        $this->savuser=$user;
+        $this->savlangs=$langs;
+        $this->savdb=$db;
 
-		$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
+        $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND=0;
 
-		// Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
-		$localobject=new Facture($this->savdb);
+        // Two lines of 1.24 give 2.48 HT and 2.72 TTC with standard vat rounding mode
+        $localobject=new Facture($this->savdb);
         $localobject->initAsSpecimen('nolines');
         $invoiceid=$localobject->create($user);
 

dolibarr/test/phpunit/XCalLibTest.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;
@@ -110,7 +110,7 @@ 
      * End phpunit tests
      *
      * @return	void
-    */
+     */
     protected function tearDown()
     {
         print __METHOD__."\n";

dolibarr/test/phpunit/DateLibTzFranceTest.php

Indentation +116 added lines, -116 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,79 +47,79 @@ 
  */
 class DateLibTzFranceTest 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;
+        parent::__construct();
 
-    	if (getServerTimeZoneString() != 'Europe/Paris') {
-    		print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
-    	}
+        //$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";
+    }
 
-    	$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+    // Static methods
+        public static function setUpBeforeClass()
+    {
+        global $conf,$user,$langs,$db;
+
+        if (getServerTimeZoneString() != 'Europe/Paris') {
+            print "\n".__METHOD__." This PHPUnit test can be launched manually only onto a server with PHP timezone set to TZ+1 Europe/Paris, not a TZ=".getServerTimeZoneString().".\n"; die();
+        }
 
-    	print __METHOD__."\n";
+        $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";
     }
 
     /**
@@ -139,66 +139,66 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 01:00:00',$result);
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 01:00:00',$result);
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',false);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 01:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 01:00:00',$result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
-
-    	// Specific cas during war
-
-    	// 1940, no timezone
-    	$result=dol_print_date(-946771200,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1940-01-01 01:00:00',$result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
-
-    	// 1941, timezone is added by germany to +2 (same for 1942)
-    	$result=dol_print_date(-915148800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1941-01-01 01:00:00',$result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
-
-    	// 1943, timezone is +1
-    	$result=dol_print_date(-852076800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1943-01-01 01:00:00',$result);
-
-    	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:59:59',$result);
-
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'dayhour',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 01:00',$result);
-
-    	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'day',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
-
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b',false,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan',$result);
-
-    	return $result;
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('2500-01-01 01:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1912-01-01 01:00:00',$result);		// dol_print_date use a timezone, not epoch converter as it did not exists this year
+
+        // Specific cas during war
+
+        // 1940, no timezone
+        $result=dol_print_date(-946771200,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1940-01-01 01:00:00',$result);		//  dol_print_date use a modern timezone, not epoch converter as it did not exists this year
+
+        // 1941, timezone is added by germany to +2 (same for 1942)
+        $result=dol_print_date(-915148800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1941-01-01 01:00:00',$result);		// dol_print_date use a modern timezone, epoch converter use historic timezone
+
+        // 1943, timezone is +1
+        $result=dol_print_date(-852076800,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1943-01-01 01:00:00',$result);
+
+        // test with negative timezone
+        $result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',false);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 00:59:59',$result);
+
+        // Check dayhour format for fr_FR
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'dayhour',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/01/1970 01:00',$result);
+
+        // Check day format for en_US
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('en_US');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'day',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('01/02/1970',$result);
+
+        // Check %a and %b format for en_US
+        $result=dol_print_date(0,'%a %b',false,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Thu Jan',$result);
+
+        return $result;
     }
 }

dolibarr/test/phpunit/DateLibTest.php

Indentation +189 added lines, -189 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 DateLibTest 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();
 
-    	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";
     }
 
     /**
@@ -124,49 +124,49 @@ 
      */
     public function testNumBetweenDay()
     {
-    	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;
 
-		// With same hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(0, 0, 0, 1, 2, 2012);
+        // With same hours
+        $date1=dol_mktime(0, 0, 0, 1, 1, 2012);
+        $date2=dol_mktime(0, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(2,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(1,$result);
 
-		// With different hours
-		$date1=dol_mktime(0, 0, 0, 1, 1, 2012);
-		$date2=dol_mktime(12, 0, 0, 1, 2, 2012);
+        // With different hours
+        $date1=dol_mktime(0, 0, 0, 1, 1, 2012);
+        $date2=dol_mktime(12, 0, 0, 1, 2, 2012);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(2,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(1,$result);
 
-		// With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
-		$date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
-		$date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
+        // With different date before and after sunlight hour (day to change sunlight hour is 2014-03-30)
+        $date1=dol_mktime(0, 0, 0, 3, 28, 2014, true);
+        $date2=dol_mktime(0, 0, 0, 3, 31, 2014, true);
 
-		$result=num_between_day($date1,$date2,1);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(4,$result);
+        $result=num_between_day($date1,$date2,1);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(4,$result);
 
-		$result=num_between_day($date1,$date2,0);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3,$result);
+        $result=num_between_day($date1,$date2,0);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(3,$result);
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -272,17 +272,17 @@ 
      */
     public function testConvertTime2Seconds()
     {
-    	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=convertTime2Seconds(1,1,2);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3662,$result);
+        $result=convertTime2Seconds(1,1,2);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(3662,$result);
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -292,22 +292,22 @@ 
      */
     public function testConvertSecondToTime()
     {
-    	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=convertSecondToTime(0,'all',86400);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0',$result);
+        $result=convertSecondToTime(0,'all',86400);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('0',$result);
 
-		$result=convertSecondToTime(86400,'all',86400);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertSame('1 '.$langs->trans("Day"),$result);
+        $result=convertSecondToTime(86400,'all',86400);
+        print __METHOD__." result=".$result."\n";
+        $this->assertSame('1 '.$langs->trans("Day"),$result);
 
 
-		return $result;
+        return $result;
     }
 
     /**
@@ -323,60 +323,60 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-    	// Check %Y-%m-%d %H:%M:%S format
+        // Check %Y-%m-%d %H:%M:%S format
         $result=dol_print_date(0,'%Y-%m-%d %H:%M:%S',true);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1970-01-01 00:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('2500-01-01 00:00:00',$result);
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1912-01-01 00:00:00',$result);	// dol_print_date use TZ (good) but epoch converter does not use it.
-
-    	// Check %Y-%m-%d %H:%M:%S format
-    	$result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1600-01-01 00:00:00',$result);
-
-    	// test with negative timezone
-    	$result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('1969-12-31 23:59:59',$result);
-
-    	// Check dayhour format for fr_FR
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('fr_FR');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'dayhour',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/01/1970 00:00',$result);
-
-    	// Check %a and %b format for fr_FR
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Jeu Jan. Janvier',$result);
-
-    	// Check day format for en_US
-    	$outputlangs=new Translate('',$conf);
-    	$outputlangs->setDefaultLang('en_US');
-    	$outputlangs->load("main");
-
-    	$result=dol_print_date(0+24*3600,'day',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('01/02/1970',$result);
-
-    	// Check %a and %b format for en_US
-    	$result=dol_print_date(0,'%a %b %B',true,$outputlangs);
-    	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('Thu Jan January',$result);
-
-    	return $result;
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1970-01-01 00:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(16725225600,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('2500-01-01 00:00:00',$result);
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-1830384000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1912-01-01 00:00:00',$result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+
+        // Check %Y-%m-%d %H:%M:%S format
+        $result=dol_print_date(-11676096000,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1600-01-01 00:00:00',$result);
+
+        // test with negative timezone
+        $result=dol_print_date(-1,'%Y-%m-%d %H:%M:%S',true);	// http://www.epochconverter.com/
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('1969-12-31 23:59:59',$result);
+
+        // Check dayhour format for fr_FR
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('fr_FR');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'dayhour',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/01/1970 00:00',$result);
+
+        // Check %a and %b format for fr_FR
+        $result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Jeu Jan. Janvier',$result);
+
+        // Check day format for en_US
+        $outputlangs=new Translate('',$conf);
+        $outputlangs->setDefaultLang('en_US');
+        $outputlangs->load("main");
+
+        $result=dol_print_date(0+24*3600,'day',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('01/02/1970',$result);
+
+        // Check %a and %b format for en_US
+        $result=dol_print_date(0,'%a %b %B',true,$outputlangs);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('Thu Jan January',$result);
+
+        return $result;
     }
 
     /**
@@ -398,10 +398,10 @@ 
         $outputlangs->load("main");
 
         $result=dol_print_date(dol_time_plus_duree(dol_time_plus_duree(dol_time_plus_duree(0,1,'m'),1,'y'),1,'d'),'dayhour',true,$outputlangs);
-       	print __METHOD__." result=".$result."\n";
-    	$this->assertEquals('02/02/1971 00:00',$result);
+            print __METHOD__." result=".$result."\n";
+        $this->assertEquals('02/02/1971 00:00',$result);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -417,30 +417,30 @@ 
         $langs=$this->savlangs;
         $db=$this->savdb;
 
-		$stime='19700102';
-		$result=dol_stringtotime($stime);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(86400,$result);
+        $stime='19700102';
+        $result=dol_stringtotime($stime);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(86400,$result);
 
-		$stime='1970-01-01T02:00:00Z';
+        $stime='1970-01-01T02:00:00Z';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         $stime='1970-01-01 02:00:00';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         $stime='19700101T020000Z';
         $result=dol_stringtotime($stime);
-    	print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
-		$stime='19700101020000';
-		$result=dol_stringtotime($stime);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(7200,$result);
+        $stime='19700101020000';
+        $result=dol_stringtotime($stime);
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals(7200,$result);
 
         return $result;
     }
@@ -452,16 +452,16 @@ 
      */
     public function testDolGetFirstDayWeek()
     {
-    	global $conf;
+        global $conf;
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 1;	// start on monday
-   		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+        $day=3; $month=2; $year=2015;
+        $conf->global->MAIN_START_WEEK = 1;	// start on monday
+            $prev = dol_get_first_day_week($day, $month, $year);
+        $this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
 
-    	$day=3; $month=2; $year=2015;
-    	$conf->global->MAIN_START_WEEK = 0;	// start on sunday
-   		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+        $day=3; $month=2; $year=2015;
+        $conf->global->MAIN_START_WEEK = 0;	// start on sunday
+            $prev = dol_get_first_day_week($day, $month, $year);
+        $this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
     }
 }

dolibarr/test/phpunit/EntrepotTest.php

Indentation +103 added lines, -103 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,78 +47,78 @@ 
  */
 class EntrepotTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return EntrepotTest
-	 */
-	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 EntrepotTest
+     */
+    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;
 
-    	if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
+        if (empty($conf->stock->enabled)) { print __METHOD__." Module Stock must be enabled.\n"; die(); }
 
         $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";
     }
 
     /**
@@ -128,20 +128,20 @@ 
      */
     public function testEntrepotCreate()
     {
-    	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 Entrepot($this->savdb);
-    	$localobject->initAsSpecimen();
-    	$result=$localobject->create($user);
+        $localobject=new Entrepot($this->savdb);
+        $localobject->initAsSpecimen();
+        $result=$localobject->create($user);
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**
@@ -155,18 +155,18 @@ 
      */
     public function testEntrepotFetch($id)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject=new Entrepot($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;
     }
 
     /**
@@ -180,18 +180,18 @@ 
      */
     public function testEntrepotUpdate($localobject)
     {
-    	global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->note='New note after update';
-    	$result=$localobject->update($localobject->id,$user);
-    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
-
-    	return $localobject;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $localobject->note='New note after update';
+        $result=$localobject->update($localobject->id,$user);
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
+
+        return $localobject;
     }
 
     /**
@@ -205,11 +205,11 @@ 
      */
     public function testEntrepotOther($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;
 
 
         return $localobject->id;
@@ -226,20 +226,20 @@ 
      */
     public function testEntrepotDelete($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 Entrepot($this->savdb);
-    	$result=$localobject->fetch($id);
+        $localobject=new Entrepot($this->savdb);
+        $result=$localobject->fetch($id);
 
-    	$result=$localobject->delete($user);
-		print __METHOD__." id=".$id." result=".$result."\n";
-    	$this->assertLessThan($result, 0);
+        $result=$localobject->delete($user);
+        print __METHOD__." id=".$id." result=".$result."\n";
+        $this->assertLessThan($result, 0);
 
-    	return $result;
+        return $result;
     }
 
     /**

dolibarr/test/phpunit/SocieteTest.php

Indentation +9 added lines, -9 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;
@@ -180,7 +180,7 @@ 
      *
      * @param   Societe $localobject    Company
      * @return  Societe $localobject    Company
-    *
+     *
      * @depends testSocieteFetch
      * The depends says test is run only if previous is ok
      */
@@ -213,13 +213,13 @@ 
         print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
-		$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_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');
+        $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 Societe($this->savdb);
         $result=$newobject->fetch($localobject->id);

dolibarr/test/phpunit/WebservicesThirdpartyTest.php

Indentation +174 added lines, -174 removed lines

@@ -70,9 +70,9 @@ 
      */
     function __construct()
     {
-    	parent::__construct();
+        parent::__construct();
 
-    	//$this->sharedFixture
+        //$this->sharedFixture
         global $conf,$user,$langs,$db;
         $this->savconf=$conf;
         $this->savuser=$user;
@@ -85,8 +85,8 @@ 
         print __METHOD__." create nusoap_client for URL=".$this->_WS_DOL_URL."\n";
         $this->soapclient = new nusoap_client($this->_WS_DOL_URL);
         if ($this->soapclient) {
-        	$this->soapclient->soap_defencoding='UTF-8';
-        	$this->soapclient->decodeUTF8(false);
+            $this->soapclient->soap_defencoding='UTF-8';
+            $this->soapclient->decodeUTF8(false);
         }
 
         print __METHOD__." db->type=".$db->type." user->id=".$user->id;
@@ -145,86 +145,86 @@ 
      */
     public function testWSThirdpartycreateThirdParty()
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-
-    	$WS_METHOD  = 'createThirdParty';
-
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	$body = array (
-    			"id" => null,
-    			"ref" => "name",
-    			"ref_ext" => "12",
-    			"fk_user_author" => null,
-    			"status" => null,
-    			"client" => 1,
-    			"supplier" => 0,
-    			"customer_code" => "CU0901-5678",
-    			"supplier_code" => "SU0901-5678",
-    			"customer_code_accountancy" => "",
-    			"supplier_code_accountancy" => "",
-    			"date_creation" => "", // dateTime
-    			"date_modification" => "", // dateTime
-    			"note_private" => "",
-    			"note_public" => "",
-    			"address" => "",
-    			"zip" => "",
-    			"town" => "",
-    			"province_id" => "",
-    			"country_id" => "",
-    			"country_code" => "",
-    			"country" => "",
-    			"phone" => "",
-    			"fax" => "",
-    			"email" => "",
-    			"url" => "",
-    			"profid1" => "",
-    			"profid2" => "",
-    			"profid3" => "",
-    			"profid4" => "",
-    			"profid5" => "",
-    			"profid6" => "",
-    			"capital" => "",
-    			"vat_used" => "",
-    			"vat_number" => ""
-    	);
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals('name',$result['ref']);
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+
+        $WS_METHOD  = 'createThirdParty';
+
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        $body = array (
+                "id" => null,
+                "ref" => "name",
+                "ref_ext" => "12",
+                "fk_user_author" => null,
+                "status" => null,
+                "client" => 1,
+                "supplier" => 0,
+                "customer_code" => "CU0901-5678",
+                "supplier_code" => "SU0901-5678",
+                "customer_code_accountancy" => "",
+                "supplier_code_accountancy" => "",
+                "date_creation" => "", // dateTime
+                "date_modification" => "", // dateTime
+                "note_private" => "",
+                "note_public" => "",
+                "address" => "",
+                "zip" => "",
+                "town" => "",
+                "province_id" => "",
+                "country_id" => "",
+                "country_code" => "",
+                "country" => "",
+                "phone" => "",
+                "fax" => "",
+                "email" => "",
+                "url" => "",
+                "profid1" => "",
+                "profid2" => "",
+                "profid3" => "",
+                "profid4" => "",
+                "profid5" => "",
+                "profid6" => "",
+                "capital" => "",
+                "vat_used" => "",
+                "vat_number" => ""
+        );
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'thirdparty'=>$body);
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals('name',$result['ref']);
+
+        return $result;
     }
 
     /**
@@ -292,62 +292,62 @@ 
      *
      * Use ref_ext to retrieve thirdparty
      *
-	 * @depends testWSThirdpartycreateThirdParty
-	 *
+     * @depends testWSThirdpartycreateThirdParty
+     *
      * @param	array	$result		thirdparty created by create method
      * @return	array				thirdparty
      */
     public function testWSThirdpartygetThirdPartyByRefExt($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
-
-    	$WS_METHOD  = 'getThirdParty';
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	// Test URL
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	print $this->soapclient->response;
-    	if (! $result || ! empty($result['faultstring'])) {
-    		//var_dump($soapclient);
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-    	$this->assertEquals($id, $result['thirdparty']['id']);
-    	$this->assertEquals('name', $result['thirdparty']['ref']);
-    	$this->assertEquals('12', $result['thirdparty']['ref_ext']);
-    	$this->assertEquals('0', $result['thirdparty']['status']);
-    	$this->assertEquals('1', $result['thirdparty']['client']);
-    	$this->assertEquals('0', $result['thirdparty']['supplier']);
-
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+        $id = $result['id'];
+
+        $WS_METHOD  = 'getThirdParty';
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        // Test URL
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>'', 'ref'=>'', 'ref_ext'=>'12');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        print $this->soapclient->response;
+        if (! $result || ! empty($result['faultstring'])) {
+            //var_dump($soapclient);
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+        $this->assertEquals($id, $result['thirdparty']['id']);
+        $this->assertEquals('name', $result['thirdparty']['ref']);
+        $this->assertEquals('12', $result['thirdparty']['ref_ext']);
+        $this->assertEquals('0', $result['thirdparty']['status']);
+        $this->assertEquals('1', $result['thirdparty']['client']);
+        $this->assertEquals('0', $result['thirdparty']['supplier']);
+
+
+        return $result;
     }
 
     /**
@@ -360,44 +360,44 @@ 
      */
     public function testWSThirdpartydeleteThirdPartyById($result)
     {
-    	global $conf,$user,$langs,$db;
-    	$conf=$this->savconf;
-    	$user=$this->savuser;
-    	$langs=$this->savlangs;
-    	$db=$this->savdb;
-    	$id = $result['id'];
-
-    	$WS_METHOD  = 'deleteThirdParty';
-
-    	// Call the WebService method and store its result in $result.
-    	$authentication=array(
-    			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
-    			'sourceapplication'=>'DEMO',
-    			'login'=>'admin',
-    			'password'=>'admin',
-    			'entity'=>'');
-
-    	$result='';
-    	$parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
-    	print __METHOD__." call method ".$WS_METHOD."\n";
-    	try {
-    		$result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
-    	} catch(SoapFault $exception) {
-    		echo $exception;
-    		$result=0;
-    	}
-    	if (! $result || ! empty($result['faultstring'])) {
-    		print $this->soapclient->error_str;
-    		print "\n<br>\n";
-    		print $this->soapclient->request;
-    		print "\n<br>\n";
-    		print $this->soapclient->response;
-    		print "\n";
-    	}
-
-    	print __METHOD__." result=".$result['result']['result_code']."\n";
-    	$this->assertEquals('OK',$result['result']['result_code']);
-
-    	return $result;
+        global $conf,$user,$langs,$db;
+        $conf=$this->savconf;
+        $user=$this->savuser;
+        $langs=$this->savlangs;
+        $db=$this->savdb;
+        $id = $result['id'];
+
+        $WS_METHOD  = 'deleteThirdParty';
+
+        // Call the WebService method and store its result in $result.
+        $authentication=array(
+                'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+                'sourceapplication'=>'DEMO',
+                'login'=>'admin',
+                'password'=>'admin',
+                'entity'=>'');
+
+        $result='';
+        $parameters = array('authentication'=>$authentication, 'id'=>$id, 'ref'=>'', 'ref_ext'=>'');
+        print __METHOD__." call method ".$WS_METHOD."\n";
+        try {
+            $result = $this->soapclient->call($WS_METHOD,$parameters,$this->_ns,'');
+        } catch(SoapFault $exception) {
+            echo $exception;
+            $result=0;
+        }
+        if (! $result || ! empty($result['faultstring'])) {
+            print $this->soapclient->error_str;
+            print "\n<br>\n";
+            print $this->soapclient->request;
+            print "\n<br>\n";
+            print $this->soapclient->response;
+            print "\n";
+        }
+
+        print __METHOD__." result=".$result['result']['result_code']."\n";
+        $this->assertEquals('OK',$result['result']['result_code']);
+
+        return $result;
     }
 }

dolibarr/test/phpunit/LangTest.php

Indentation +86 added lines, -86 removed lines

@@ -59,75 +59,75 @@ 
  */
 class LangTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return SecurityTest
-	 */
-	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 SecurityTest
+     */
+    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;
-		$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";
     }
 
     // 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";
     }
 
     /**
@@ -137,43 +137,43 @@ 
      */
     public function testLang()
     {
-    	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;
 
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
-		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
-		{
-			if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
-
-			print 'Check language file for lang code='.$code."\n";
-			$tmplangs=new Translate('',$conf);
-    		$langcode=$code;
-        	$tmplangs->setDefaultLang($langcode);
-			$tmplangs->load("main");
-
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
-			print __METHOD__." SeparatorDecimal=".$result."\n";
-			$this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
-
-			$result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
-			print __METHOD__." SeparatorThousand=".$result."\n";
-			$this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
-
-			// Test java string contains only d,M,y,/,-,. and not m,...
-			$result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
-			print __METHOD__." FormatDateShortJava=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
-			$result=$tmplangs->trans("FormatDateShortJavaInput");
-			print __METHOD__." FormatDateShortJavaInput=".$result."\n";
-			$this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
-
-			unset($tmplangs);
-		}
+        $filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
+        foreach($filesarray as $key => $code)
+        {
+            if (! preg_match('/^[a-z]+_[A-Z]+$/',$code)) continue;
+
+            print 'Check language file for lang code='.$code."\n";
+            $tmplangs=new Translate('',$conf);
+            $langcode=$code;
+            $tmplangs->setDefaultLang($langcode);
+            $tmplangs->load("main");
+
+            $result=$tmplangs->transnoentitiesnoconv("SeparatorDecimal");
+            print __METHOD__." SeparatorDecimal=".$result."\n";
+            $this->assertContains($result,array('.',',','/',' ','','None'), 'Error for decimal separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+
+            $result=$tmplangs->transnoentitiesnoconv("SeparatorThousand");
+            print __METHOD__." SeparatorThousand=".$result."\n";
+            $this->assertContains($result, array('.',',','/',' ','','\'','None','Space'), 'Error for thousand separator for lang code '.$code);	// Note that ، that is coma for RTL languages is not supported
+
+            // Test java string contains only d,M,y,/,-,. and not m,...
+            $result=$tmplangs->transnoentitiesnoconv("FormatDateShortJava");
+            print __METHOD__." FormatDateShortJava=".$result."\n";
+            $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJava KO for lang code '.$code);
+            $result=$tmplangs->trans("FormatDateShortJavaInput");
+            print __METHOD__." FormatDateShortJavaInput=".$result."\n";
+            $this->assertRegExp('/^[dMy\/\-\.]+$/',$result,'FormatDateShortJavaInput KO for lang code '.$code);
+
+            unset($tmplangs);
+        }
 
         return;
     }

dolibarr/test/phpunit/PaypalTest.php

Indentation +65 added lines, -65 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,78 +48,78 @@ 
  */
 class PaypalTest extends PHPUnit_Framework_TestCase
 {
-	protected $savconf;
-	protected $savuser;
-	protected $savlangs;
-	protected $savdb;
-
-	/**
-	 * Constructor
-	 * We save global variables into local variables
-	 *
-	 * @return ProductTest
-	 */
-	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 ProductTest
+     */
+    function __construct()
     {
-    	global $conf,$user,$langs,$db;
+        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;
 
-    	if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
+        if (empty($conf->paypal->enabled)) { print __METHOD__." Module Paypal must be enabled.\n"; die(); }
 
         $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";
     }
 
     /**
@@ -129,20 +129,20 @@ 
      */
     public function testPaypalOk()
     {
-    	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;
 
-		$urltotest=getPaypalPaymentUrl(1,'free');
-		print "urltotest=".$urltotest."\n";
+        $urltotest=getPaypalPaymentUrl(1,'free');
+        print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET');
+        $result=getURLContent($urltotest, 'GET');
 
         print __METHOD__." result=".$result."\n";
-    	$this->assertLessThanOrEqual($result, 0);
+        $this->assertLessThanOrEqual($result, 0);
 
-    	return $result;
+        return $result;
     }
 }