Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Browse Source 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
This commit is contained in:
Laurent Destailleur
2018-09-02 14:15:17 +02:00
parent 97b1589fb5 e41b55af13
commit 02bedc49d3
60 changed files with 245 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/phpunit/MarginsLibTest.php
View File

@@ -60,6 +60,8 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@@ -136,7 +138,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
$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]);
@@ -144,7 +146,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase
$this->assertEquals(12.5,$result[1]);
print __METHOD__." result[2]=".$result[2]."\n";
$this->assertEquals(1/9*100,$result[2]);
return 0;
}