Fix CONCAT assertions in some MCR tests

Change-Id: I9507ae60751f8e9cc5e6205148cf2e37f67f42c5

diff --git a/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
index c984142..f03d403 100644 (file)
--- a/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/McrWriteBothRevisionStoreDbTest.php
@@ -159,8 +159,8 @@ class McrWriteBothRevisionStoreDbTest extends RevisionStoreDbTestBase {
                                                'role_name' => $db->addQuotes( 'main' ),
                                                'content_size' => 'slots.rev_len',
                                                'content_sha1' => 'slots.rev_sha1',
-                                               'content_address' =>
-                                                       'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+                                               'content_address' => $db->buildConcat( [
+                                                       $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
                                                'model_name' => 'slots.rev_content_model',
                                        ]
                                ),

diff --git a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
index 2337805..1d504de 100644 (file)
--- a/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/NoContentModelRevisionStoreDbTest.php
@@ -156,7 +156,7 @@ class NoContentModelRevisionStoreDbTest extends RevisionStoreDbTestBase {
                                                'content_size' => 'slots.rev_len',
                                                'content_sha1' => 'slots.rev_sha1',
                                                'content_address' =>
-                                                       'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+                                                       $db->buildConcat( [ $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
                                                'model_name' => 'NULL',
                                        ]
                                ),

diff --git a/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php b/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
index a27d2bb..7cc3131 100644 (file)
--- a/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
+++ b/tests/phpunit/includes/Storage/PreMcrRevisionStoreDbTest.php
@@ -130,7 +130,7 @@ class PreMcrRevisionStoreDbTest extends RevisionStoreDbTestBase {
                                                'content_size' => 'slots.rev_len',
                                                'content_sha1' => 'slots.rev_sha1',
                                                'content_address' =>
-                                                       'CONCAT(' . $db->addQuotes( 'tt:' ) . ',slots.rev_text_id)',
+                                                       $db->buildConcat( [ $db->addQuotes( 'tt:' ), 'slots.rev_text_id' ] ),
                                                'model_name' => 'slots.rev_content_model',
                                        ]
                                ),