Fixed test. (#56)

terabytesoftw · web-flow · commit cf72bcadd2a4 · 2020-12-02T00:18:01.000-03:00
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -445,7 +445,7 @@ protected function prepareMasterSlave($masterCount, $slaveCount): Connection
         $db = $this->getConnection(true);
 
         for ($i = 0; $i < $masterCount; ++$i) {
-            $this->prepareDatabase(null, 'sqlite:' . __DIR__ . "/Data/yii_test_master{$i}.sq3");
+            $this->prepareDatabase('sqlite:' . __DIR__ . "/Data/yii_test_master{$i}.sq3");
 
             $db->setMasters(
                 "$i",
@@ -459,7 +459,7 @@ protected function prepareMasterSlave($masterCount, $slaveCount): Connection
         }
 
         for ($i = 0; $i < $slaveCount; ++$i) {
-            $this->prepareDatabase(null, 'sqlite:' . __DIR__ . "/Data/yii_test_slave{$i}.sq3");
+            $this->prepareDatabase('sqlite:' . __DIR__ . "/Data/yii_test_slave{$i}.sq3");
 
             $db->setSlaves(
                 "$i",
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -172,11 +172,9 @@ protected function getConnection($reset = false): Connection
         return $this->connection;
     }
 
-    protected function prepareDatabase(?string $fixture = null, ?string $dsn = null): void
+    protected function prepareDatabase(string $dsn = null): void
     {
-        if ($fixture === null) {
-            $fixture = $this->params()['yiisoft/db-sqlite']['fixture'];
-        }
+        $fixture = $this->params()['yiisoft/db-sqlite']['fixture'];
 
         if ($dsn !== null) {
             $this->connection = $this->createConnection($dsn);
@@ -299,7 +297,7 @@ private function config(): array
         ];
     }
 
-    protected function createConnection(?string $dsn = null): ?Connection
+    protected function createConnection(string $dsn = null): ?Connection
     {
         $db = null;
 
@@ -310,7 +308,7 @@ protected function createConnection(?string $dsn = null): ?Connection
                 [
                     '__class' => Connection::class,
                     '__construct()' => [
-                        'dsn' => $this->params()['yiisoft/db-sqlite']['dsn'],
+                        'dsn' => $dsn,
                     ],
                 ]
             );

Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,9 @@ protected function getConnection($reset = false): Connection`
`172`	`172`	`return $this->connection;`
`173`	`173`	`}`
`174`	`174`
`175`		`- protected function prepareDatabase(?string $fixture = null, ?string $dsn = null): void`
	`175`	`+ protected function prepareDatabase(string $dsn = null): void`
`176`	`176`	`{`
`177`		`- if ($fixture === null) {`
`178`		`- $fixture = $this->params()['yiisoft/db-sqlite']['fixture'];`
`179`		`- }`
	`177`	`+ $fixture = $this->params()['yiisoft/db-sqlite']['fixture'];`
`180`	`178`
`181`	`179`	`if ($dsn !== null) {`
`182`	`180`	`$this->connection = $this->createConnection($dsn);`
`@@ -299,7 +297,7 @@ private function config(): array`
`299`	`297`	`];`
`300`	`298`	`}`
`301`	`299`
`302`		`- protected function createConnection(?string $dsn = null): ?Connection`
	`300`	`+ protected function createConnection(string $dsn = null): ?Connection`
`303`	`301`	`{`
`304`	`302`	`$db = null;`
`305`	`303`
`@@ -310,7 +308,7 @@ protected function createConnection(?string $dsn = null): ?Connection`
`310`	`308`	`[`
`311`	`309`	`'__class' => Connection::class,`
`312`	`310`	`'__construct()' => [`
`313`		`- 'dsn' => $this->params()['yiisoft/db-sqlite']['dsn'],`
	`311`	`+ 'dsn' => $dsn,`
`314`	`312`	`],`
`315`	`313`	`]`
`316`	`314`	`);`