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

72
test/phpunit/NumberingModulesTest.php
View File

@@ -150,7 +150,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT='{yyyy}-{0000}';
$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -168,7 +168,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." is_erasable=".$result."\n";
$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
$localobject2=new Facture($this->savdb);
$localobject2=new Facture($db);
$localobject2->initAsSpecimen();
$localobject2->fetch_thirdparty();
@@ -196,7 +196,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -208,7 +208,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice'); // counter must start to 1
$localobject2=new Facture($this->savdb);
$localobject2=new Facture($db);
$localobject2->initAsSpecimen();
$localobject2->fetch_thirdparty();
@@ -218,7 +218,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day'); // counter must be now 2
$localobject3=new Facture($this->savdb);
$localobject3=new Facture($db);
$localobject3->initAsSpecimen();
$localobject3->fetch_thirdparty();
@@ -232,7 +232,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@1}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -247,7 +247,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." is_erasable=".$result."\n";
$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
$localobject2=new Facture($this->savdb);
$localobject2=new Facture($db);
$localobject2->initAsSpecimen();
$localobject2->fetch_thirdparty();
@@ -268,7 +268,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
// Same but we add month before year and use a year on 2 digits
$conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{mm}{yy}-{0000@1}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1925); // we use year 1925 to be sure to not have existing invoice for this year
@@ -282,7 +282,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." is_erasable=".$result."\n";
$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
$localobject2=new Facture($this->savdb);
$localobject2=new Facture($db);
$localobject2->initAsSpecimen();
$localobject2->fetch_thirdparty();
$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1925); // we use same year 1925 for second invoice (and there is a reset required)
@@ -299,7 +299,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." is_erasable=".$result."\n";
$this->assertLessThanOrEqual(0, $result); // Case 1 can not be deleted (because there is an invoice 2)
$localobject3=new Facture($this->savdb);
$localobject3=new Facture($db);
$localobject3->initAsSpecimen();
$localobject3->fetch_thirdparty();
$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926); // we use following year for third invoice (and there is a reset required)
@@ -317,7 +317,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -335,7 +335,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result for last=".$result."\n";
$this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -350,7 +350,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('193012-0001', $result); // counter must be reset to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -362,7 +362,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('193101-0002', $result); // counter must be 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -378,7 +378,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -390,7 +390,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('194001-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -402,7 +402,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('194012-0001', $result); // counter must be reset to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -414,7 +414,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('194101-0002', $result); // counter must be 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -430,7 +430,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -442,7 +442,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('195001-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -454,7 +454,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('195012-0001', $result); // counter must be reset to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -466,7 +466,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('195101-0002', $result); // counter must be 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -482,7 +482,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -494,7 +494,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('195901-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -506,7 +506,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('196012-0001', $result); // counter must be reset to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -518,7 +518,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('196001-0002', $result); // counter must be 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -534,7 +534,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -546,7 +546,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('197001-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -558,7 +558,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('197112-0001', $result); // counter must be reset to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -570,7 +570,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('197101-0002', $result); // counter must be 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -585,7 +585,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -597,7 +597,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('198001-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -609,7 +609,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('198001-0002', $result); // counter must start to 2
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -621,7 +621,7 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertEquals('198002-0001', $result); // counter must start to 1
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();
@@ -638,11 +638,11 @@ class NumberingModulesTest extends PHPUnit\Framework\TestCase
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
$tmpthirdparty=new Societe($this->savdb);
$tmpthirdparty=new Societe($db);
$tmpthirdparty->initAsSpecimen();
$tmpthirdparty->typent_code = 'TE_ABC';
$localobject=new Facture($this->savdb);
$localobject=new Facture($db);
$localobject->initAsSpecimen();
$localobject->fetch_thirdparty();