Use Tester\Environment::THREAD instead of PID

mrtnzlml-archive · Oct 9, 2016 · e42fefb · e42fefb
1 parent 7a546e1
commit e42fefb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/src/Mocks/DoctrineConnectionMock.php b/src/Mocks/DoctrineConnectionMock.php
@@ -47,13 +47,12 @@ public function __construct(
 	/** @internal */
 	public function __testbench_database_setup($connection, \Nette\DI\Container $container)
 	{
-		$this->__testbench_databaseName = 'db_tests_' . getmypid();
+		$config = $container->parameters['testbench'];
+		$this->__testbench_databaseName = $config['dbprefix'] . getenv(\Tester\Environment::THREAD);
 
 		$this->__testbench_database_drop($connection, $container);
 		$this->__testbench_database_create($connection, $container);
 
-		$config = $container->parameters['testbench'];
-
 		foreach ($config['sqls'] as $file) {
 			\Kdyby\Doctrine\Dbal\BatchImport\Helpers::loadFromFile($connection, $file);
 		}

diff --git a/src/Mocks/NetteDatabaseConnectionMock.php b/src/Mocks/NetteDatabaseConnectionMock.php
@@ -32,12 +32,13 @@ public function __construct($dsn, $user = NULL, $password = NULL, array $options
 	/** @internal */
 	public function __testbench_database_setup($connection, \Nette\DI\Container $container)
 	{
-		$this->__testbench_databaseName = 'db_tests_' . getmypid();
+		$config = $container->parameters['testbench'];
+		$this->__testbench_databaseName = $config['dbprefix'] . getenv(\Tester\Environment::THREAD);
 
 		$this->__testbench_database_drop($connection, $container);
 		$this->__testbench_database_create($connection, $container);
 
-		foreach ($container->parameters['testbench']['sqls'] as $file) {
+		foreach ($config['sqls'] as $file) {
 			\Nette\Database\Helpers::loadFromFile($connection, $file);
 		}
 

diff --git a/src/TestbenchExtension.php b/src/TestbenchExtension.php
@@ -7,6 +7,7 @@ class TestbenchExtension extends \Nette\DI\CompilerExtension
 
 	private $defaults = [
 		'dbname' => NULL,               // custom test database name
+		'dbprefix' => '_testbench_',    // database prefix for created tests databases
 		'migrations' => FALSE,          // set TRUE if you want to use Doctrine migrations
 		'sqls' => [],                   // sqls you want to import during new test database creation
 		'url' => 'http://test.bench/',  // fake URL for HTTP request mock

diff --git a/tests/Traits/TDoctrineTest.phpt b/tests/Traits/TDoctrineTest.phpt
@@ -37,9 +37,9 @@ class TDoctrineTest extends \Tester\TestCase
 		$connection = $this->getEntityManager()->getConnection();
 		if ($connection->getDatabasePlatform() instanceof MySqlPlatform) {
 			Assert::match('testbench_initial', $connection->getDatabase());
-			Assert::match('db_tests_' . getmypid(), $connection->query('SELECT DATABASE();')->fetchColumn());
+			Assert::match('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->query('SELECT DATABASE();')->fetchColumn());
 		} else {
-			Assert::same('db_tests_' . getmypid(), $connection->getDatabase());
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->getDatabase());
 		}
 	}
 
@@ -66,7 +66,7 @@ class TDoctrineTest extends \Tester\TestCase
 				['id' => 2, 'column_1' => 'value_1', 'column_2' => 'value_2'],
 				['id' => 3, 'column_1' => 'value_1', 'column_2' => 'value_2'],
 			], $result);
-			Assert::same('db_tests_' . getmypid(), $connection->getDatabase());
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->getDatabase());
 		}
 	}
 

diff --git a/tests/Traits/TNetteDatabaseTest.phpt b/tests/Traits/TNetteDatabaseTest.phpt
@@ -41,9 +41,9 @@ class TNetteDatabaseTest extends \Tester\TestCase
 		};
 		if ($connection->getSupplementalDriver() instanceof MySqlDriver) {
 			Assert::match('testbench_initial', $returnActualDatabaseName());
-			Assert::match('db_tests_' . getmypid(), $connection->query('SELECT DATABASE();')->fetchPairs()[0]);
+			Assert::match('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->query('SELECT DATABASE();')->fetchPairs()[0]);
 		} else {
-			Assert::same('db_tests_' . getmypid(), $returnActualDatabaseName());
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $returnActualDatabaseName());
 		}
 	}
 
@@ -63,7 +63,7 @@ class TNetteDatabaseTest extends \Tester\TestCase
 		if ($connection->getSupplementalDriver() instanceof MySqlDriver) {
 			Assert::match('testbench_initial', $matches[1]);
 		} else {
-			Assert::same('db_tests_' . getmypid(), $matches[1]);
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $matches[1]);
 		}
 	}
 

diff --git a/tests/_helpers/components/DoctrineComponentWithDatabaseAccess.php b/tests/_helpers/components/DoctrineComponentWithDatabaseAccess.php
@@ -15,9 +15,9 @@ public function __construct(\Kdyby\Doctrine\EntityManager $entityManager)
 		Assert::count(1, $connection->onConnect);
 		if ($connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			Assert::match('testbench_initial', $connection->getDatabase());
-			Assert::match('db_tests_' . getmypid(), $connection->query('SELECT DATABASE();')->fetchColumn());
+			Assert::match('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->query('SELECT DATABASE();')->fetchColumn());
 		} else {
-			Assert::same('db_tests_' . getmypid(), $connection->getDatabase());
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->getDatabase());
 		}
 	}
 

diff --git a/tests/_helpers/components/NdbComponentWithDatabaseAccess.php b/tests/_helpers/components/NdbComponentWithDatabaseAccess.php
@@ -16,9 +16,9 @@ public function __construct(\Nette\Database\Context $context)
 		};
 		if ($connection->getSupplementalDriver() instanceof \Nette\Database\Drivers\MySqlDriver) {
 			Assert::match('testbench_initial', $returnActualDatabaseName());
-			Assert::match('db_tests_' . getmypid(), $connection->query('SELECT DATABASE();')->fetchPairs()[0]);
+			Assert::match('_testbench_' . getenv(\Tester\Environment::THREAD), $connection->query('SELECT DATABASE();')->fetchPairs()[0]);
 		} else {
-			Assert::same('db_tests_' . getmypid(), $returnActualDatabaseName());
+			Assert::same('_testbench_' . getenv(\Tester\Environment::THREAD), $returnActualDatabaseName());
 		}
 	}