Fix tests to run when database name is not cakephp_test

cakephp · Sep 9, 2018 · 4aa0df8 · 4aa0df8
1 parent 2bea29d
commit 4aa0df8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -1455,6 +1455,8 @@ public function testNoExtraRowsForAssociatedTranslations() {
 
 	public function testBeforeFindAllI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -1471,7 +1473,7 @@ public function testBeforeFindAllI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -1489,7 +1491,7 @@ public function testBeforeFindAllI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -1537,6 +1539,8 @@ public function testBeforeFindAllI18nConditions() {
 
 	public function testBeforeFindCountI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -1553,7 +1557,7 @@ public function testBeforeFindCountI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'`TranslatedArticle`.`id`' => (object)array(
@@ -1570,7 +1574,7 @@ public function testBeforeFindCountI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(

diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -6486,6 +6486,8 @@ public function testBuildQuery() {
 
 	public function testBuildQueryAllI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -6502,7 +6504,7 @@ public function testBuildQueryAllI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -6520,7 +6522,7 @@ public function testBuildQueryAllI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -6556,6 +6558,8 @@ public function testBuildQueryAllI18nConditions() {
 
 	public function testBuildQueryCountI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+		j
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -6572,7 +6576,7 @@ public function testBuildQueryCountI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'`TranslatedArticle`.`id`' => (object)array(
@@ -6589,7 +6593,7 @@ public function testBuildQueryCountI18nConditions() {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(