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

phpunit: use $db instead of $this->savdb

Browse Source 
The global variables are stored in $this, and in particular $db is used
through this mean. But $this->savdb is supposed to be the immutable
global state that is stored at the test class instantiation and restored
at the beginning of each test.

For $this->savdb, I don't think any consequences are created by this,
since the object is saved by each test anyway and the $db object is
mostly a query object within a transaction, but future change could use
this to inject a different stateful $db object to trace some behaviour
in the test for instance, so make sure the correct one is used.
This commit is contained in:
Alexandre Janniaux
2023-04-13 20:25:07 +02:00
parent 2635ec9c19
commit b6235c29d0
46 changed files with 198 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/phpunit/UserTest.php
View File

@@ -145,7 +145,7 @@ class UserTest extends PHPUnit\Framework\TestCase
print __METHOD__." USER_PASSWORD_GENERATED=".getDolGlobalString('USER_PASSWORD_GENERATED')."\n";
$localobject=new User($this->savdb);
$localobject=new User($db);
$localobject->initAsSpecimen();
$result=$localobject->create($user);
@@ -170,7 +170,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
$localobject=new User($this->savdb);
$localobject=new User($db);
$result=$localobject->fetch($id);
$this->assertLessThan($result, 0);
@@ -201,7 +201,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$this->assertLessThan($result, 0);
// Test everything are still same than specimen
$newlocalobject=new User($this->savdb);
$newlocalobject=new User($db);
$newlocalobject->initAsSpecimen();
$this->changeProperties($newlocalobject);
$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','flagdelsessionsbefore','iplastlogin','ippreviouslogin','trackid')), array()); // Actual, Expected
@@ -418,7 +418,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
$localobject=new User($this->savdb);
$localobject=new User($db);
$result=$localobject->fetch($id);
$result=$localobject->delete($user);
@@ -443,7 +443,7 @@ class UserTest extends PHPUnit\Framework\TestCase
$langs=$this->savlangs;
$db=$this->savdb;
$localobject=new User($this->savdb);
$localobject=new User($db);
$result=$localobject->fetch(1); // Other tests use the user id 1
$result=$localobject->addrights(0, 'supplier_proposal');