Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts:
	test/phpunit/CoreTest.php
This commit is contained in:
Laurent Destailleur 2018-09-02 15:21:21 +02:00
commit a7dfc88b59
64 changed files with 192 additions and 58 deletions

View File

@ -64,6 +64,14 @@ matrix:
- php: nightly
# We exclude some combinations not usefull to save Travis CPU
exclude:
- php: '5.4'
env: DB=mysql
- php: '5.5'
env: DB=mysql
- php: '5.6'
env: DB=mysql
- php: '7.0'
env: DB=mysql
- php: '5.4'
env: DB=postgresql
- php: '5.5'

View File

@ -61,7 +61,9 @@ class AdherentTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

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

View File

@ -61,7 +61,9 @@ class BankAccountTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -62,6 +62,8 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -89,7 +89,9 @@ class BuildDocTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -59,7 +59,9 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;
@ -103,7 +105,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase
$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.
print __METHOD__."\n";
}
/**

View File

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

View File

@ -60,6 +60,8 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@ -117,7 +119,7 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesCreate
*
*
* @return void
*/
public function testChargeSocialesCreate()
@ -139,10 +141,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesFetch
*
*
* @param int $id Id of social contribution
* @return void
*
*
* @depends testChargeSocialesCreate
* The depends says test is run only if previous is ok
*/
@ -164,10 +166,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesValid
*
*
* @param Object $localobject Social contribution
* @return void
*
*
* @depends testChargeSocialesFetch
* The depends says test is run only if previous is ok
*/
@ -188,10 +190,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesOther
*
*
* @param Object $localobject Social contribution
* @return void
*
*
* @depends testChargeSocialesValid
* The depends says test is run only if previous is ok
*/
@ -216,10 +218,10 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase
/**
* testChargeSocialesDelete
*
*
* @param int $id Social contribution
* @return void
*
*
* @depends testChargeSocialesOther
* The depends says test is run only if previous is ok
*/

View File

@ -72,7 +72,9 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -72,7 +72,9 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -61,7 +61,9 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

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

View File

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

View File

@ -60,6 +60,8 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

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

View File

@ -68,6 +68,8 @@ class ContactTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@ -207,7 +209,7 @@ class ContactTest extends PHPUnit_Framework_TestCase
$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, 'Contact::update error');

View File

@ -60,6 +60,8 @@ class ContratTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,7 +62,9 @@ class CoreTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -60,6 +60,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class DiscountTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class EntrepotTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,7 +60,9 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;
@ -151,7 +153,7 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase
$localobject2->initAsSpecimen(); // Init a speciment with lines
$localobject2->status = 0;
$localobject2->fk_statut = 0;
$result=$localobject2->create($user);
print __METHOD__." result=".$result."\n";
$this->assertGreaterThanOrEqual(0, $result);

View File

@ -64,6 +64,8 @@ class ExportTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -61,6 +61,8 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -61,6 +61,8 @@ class FactureRecTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

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

View File

@ -60,6 +60,8 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class FichinterTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -61,6 +61,8 @@ class FilesLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class FormAdminTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -63,7 +63,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -63,7 +63,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -62,6 +62,8 @@ class HolidayTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -61,6 +61,8 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,6 +62,8 @@ class ImportTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,7 +62,9 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -72,6 +72,8 @@ class LangTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

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;
}

View File

@ -59,6 +59,8 @@ class ModulesTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,6 +62,8 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -59,6 +59,8 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@ -137,9 +139,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$conf->global->FACTURE_ADDON='mercure';
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
$localobject=new Facture($this->savdb);
$localobject=new Facture($this->savdb);
$localobject->initAsSpecimen();
$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year
$numbering=new mod_facture_mercure();

View File

@ -61,6 +61,8 @@ class PaypalTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@ -135,9 +137,9 @@ class PaypalTest extends PHPUnit_Framework_TestCase
$urltotest=getPaypalPaymentUrl(1,'free');
print "urltotest=".$urltotest."\n";
$result=getURLContent($urltotest, 'GET');
print __METHOD__." result=".$result."\n";
$this->assertLessThanOrEqual($result, 0);

View File

@ -63,6 +63,8 @@ class PdfDocTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,6 +62,8 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
@ -167,13 +169,13 @@ class PgsqlTest extends PHPUnit_Framework_TestCase
$result=DoliDBPgsql::convertSQLFromMysql($sql);
print __METHOD__." result=".$result."\n";
$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (without SEPARATOR)');
// Test GROUP_CONCAT (with SEPARATOR)
$sql="SELECT a.b, GROUP_CONCAT(a.c SEPARATOR ',') FROM table GROUP BY a.b";
$result=DoliDBPgsql::convertSQLFromMysql($sql);
print __METHOD__." result=".$result."\n";
$this->assertEquals($result, "SELECT a.b, STRING_AGG(a.c, ',') FROM table GROUP BY a.b", 'Test GROUP_CONCAT (with SEPARATOR)');
return $result;
}
}

View File

@ -67,7 +67,9 @@ class PricesTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

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

View File

@ -61,6 +61,8 @@ class ProjectTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -60,6 +60,8 @@ class PropalTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -62,7 +62,9 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
*/
public function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf = $conf;
$this->savuser = $user;

View File

@ -64,7 +64,9 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -72,6 +72,8 @@ class ScriptsTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -72,6 +72,8 @@ class SecurityTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

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

View File

@ -59,7 +59,9 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;
@ -117,7 +119,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupCreate
*
*
* @return void
*/
public function testUserGroupCreate()
@ -139,7 +141,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupFetch
*
*
* @param int $id Id of group
* @return void
* @depends testUserGroupCreate
@ -163,7 +165,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupUpdate
*
*
* @param Object $localobject Group
* @return void
* @depends testUserGroupFetch
@ -187,7 +189,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupAddRight
*
*
* @param Object $localobject Object to show
* @return void
* @depends testUserGroupUpdate
@ -210,7 +212,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupDelRight
*
*
* @param Object $localobject Object
* @return void
* @depends testUserGroupAddRight
@ -233,7 +235,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupOther
*
*
* @param Object $localobject Object
* @return void
* @depends testUserGroupDelRight
@ -261,7 +263,7 @@ class UserGroupTest extends PHPUnit_Framework_TestCase
/**
* testUserGroupDelete
*
*
* @param int $id Id of object
* @return void
* @depends testUserGroupOther

View File

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

View File

@ -69,6 +69,8 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;

View File

@ -63,7 +63,9 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -63,7 +63,9 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -70,7 +70,9 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -70,7 +70,9 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

@ -63,7 +63,9 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase
*/
function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf=$conf;
$this->savuser=$user;

View File

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