Move simpletest.module DB-related functions to TestDatabase, deprecate

1. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,213 @@ protected function getLockFile($lock_id) {
   +   * the method behaves just like \Drupal\simpletest\TestBase::assert() in terms
   ...
   +   *   The an array containing the keys 'file' and 'line' that represent the file
   

   CS line length issue

2. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,213 @@ protected function getLockFile($lock_id) {
   +   * @return
   

   Return type missing

3. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,213 @@ protected function getLockFile($lock_id) {
   +    return static::getConnection()
   +        ->insert('simpletest')
   +        ->fields($assertion)
   +        ->execute();
   

   Fix indentation

4. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,213 @@ protected function getLockFile($lock_id) {
   +   * @param $test_id
   

   Param type missing

5. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,213 @@ protected function getLockFile($lock_id) {
   +   * @return array
   

   An empty line before @return missing

6. +++ b/core/modules/simpletest/simpletest.module
   @@ -507,19 +507,15 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
   + * @deprecated in Drupal 8.8.0 for removal before 9.0.0. Use
   + *   \Drupal\Core\Test\TestDatabase::lastTestGet() instead.
   

   CS issue with deprecation message

7. +++ b/core/modules/simpletest/simpletest.module
   @@ -507,19 +507,15 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
   +  @trigger_error(__FUNCTION__ . ' is deprecated in Drupal 8.8.0 for removal before Drupal 9.0.0. Use \Drupal\Core\Test\TestDatabase::lastTestGet() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   

   CS issue with an error message

8. +++ b/core/modules/simpletest/simpletest.module
   @@ -537,30 +533,16 @@ function simpletest_last_test_get($test_id) {
   + * @deprecated in Drupal 8.8.0 for removal before 9.0.0. Use
   + *   \Drupal\Core\Test\TestDatabase::logRead() instead.
   ...
   +  @trigger_error(__FUNCTION__ . ' is deprecated in Drupal 8.8.0 for removal before Drupal 9.0.0. Use \Drupal\Core\Test\TestDatabase::logRead() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   
   @@ -589,34 +571,15 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
   + * @deprecated in Drupal 8.8.0 for removal before 9.0.0. Use
   + *   \Drupal\Core\Test\TestDatabase::insertAssert() instead.
   ...
   +  @trigger_error(__FUNCTION__ . ' is deprecated in Drupal 8.8.0 for removal before Drupal 9.0.0. Use \Drupal\Core\Test\TestDatabase::insertAssert() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   

   The same here

+1 for RTBC

+++ b/core/lib/Drupal/Core/Test/TestDatabase.php
@@ -179,4 +179,214 @@ protected function getLockFile($lock_id) {
+  /**
+   * Implements hook_schema().
+   */
+  public static function simpletestSchema() {

This is no longer a hook_schema implementation, and I think we should now overcome 'simpletest' being part of the method name - how about just getSchema?

+++ b/core/lib/Drupal/Core/Test/TestDatabase.php
@@ -179,4 +179,214 @@ protected function getLockFile($lock_id) {
+  public static function lastTestGet($test_id) {
+    $last_prefix = static::getConnection()
+      ->queryRange('SELECT last_prefix FROM {simpletest_test_id} WHERE test_id = :test_id', 0, 1, [
+        ':test_id' => $test_id,
+      ])
+      ->fetchField();
+    $last_test_class = static::getConnection()
+      ->queryRange('SELECT test_class FROM {simpletest} WHERE test_id = :test_id ORDER BY message_id DESC', 0, 1, [
+        ':test_id' => $test_id,
+      ])
+      ->fetchField();

I'd also love these to become dynamic queries instead (i.e. $connection->select(...) etc.) but I guess that's an obsessions of mine only and it would be out-of-scope here anyway.

Thanks.

+++ b/core/lib/Drupal/Core/Test/TestDatabase.php
@@ -179,4 +179,217 @@ protected function getLockFile($lock_id) {
diff --git a/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php b/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php

diff --git a/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php b/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
index 44aadf5408..74d81af95c 100644

index 44aadf5408..74d81af95c 100644
--- a/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php

--- a/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
+++ b/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php

+++ b/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
+++ b/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
@@ -125,7 +125,7 @@ public function getConfig(Editor $editor) {

@@ -125,7 +125,7 @@ public function getConfig(Editor $editor) {
       'media_library.opener.editor',
       $media_type_ids,
       reset($media_type_ids),
-      1,
+      -1,
       ['filter_format_id' => $editor->getFilterFormat()->id()]
     );
 
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php

diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 3daea82dcd..d6d3270dba 100644

index 3daea82dcd..d6d3270dba 100644
--- a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php

--- a/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php

+++ b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -164,9 +164,7 @@ public function testButton() {

@@ -164,9 +164,7 @@ public function testButton() {
       $this->assertSame($expected_tab_order[$key], $tab->getText());
     }
 
-    $assert_session->pageTextContains('0 of 1 item selected');
     $assert_session->elementExists('css', '.media-library-item')->click();
-    $assert_session->pageTextContains('1 of 1 item selected');
     $assert_session->elementExists('css', 'button.media-library-select.button.button--primary')->click();
     $this->assignNameToCkeditorIframe();
     $this->getSession()->switchToIFrame('ckeditor');

These look like leaks from another patch.

I wonder whether moving these methods to TestDatabase doesn't require also some tests to be added to TestDatabaseTest?

Filed #3075648: Refactor TestDatabase::lastTestGet to use dynamic queries as followup to #13/#14.

There's a small CS issue that could also be fixed on commit.

1. +++ b/core/lib/Drupal/Core/Test/TestDatabase.php
   @@ -179,4 +179,218 @@ protected function getLockFile($lock_id) {
   +    return [$last_prefix, $last_test_class];
   

   We have a chance to rework this here. I doubt this is what we'd design if we did it from scratch. While we're touching it - should we make this a value object return? We can juggle back to the array format it in the old function for BC reasons.

   An API is forever and all that.

2. +++ b/core/modules/simpletest/simpletest.module
   @@ -507,19 +507,15 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
   +  @trigger_error(__FUNCTION__ . ' is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Test\TestDatabase::lastTestGet() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   
   @@ -537,30 +533,16 @@ function simpletest_last_test_get($test_id) {
   +  @trigger_error(__FUNCTION__ . ' is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Test\TestDatabase::logRead() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   
   @@ -589,34 +571,15 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
   +  @trigger_error(__FUNCTION__ . ' is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Test\TestDatabase::insertAssert() instead. See https://www.drupal.org/node/3075252', E_USER_DEPRECATED);
   

   should we be adding deprecation tests for these?

Should we mark all the methods as @internal if we hope to get rid of them then?

This is doing the moves, and we have follow-ups for the refactors. RTBC (there's a small CS 'Expected 1 blank line after function; 2 found' issue but easily fixable at commit). RTBC

Committed 0041ba0 and pushed to 8.8.x. Thanks!

Published change record