Issue #2144669 by Mile23, daffie, Nitesh Sethia: Improve/Refactor TestBase...

Issue #2144669 by Mile23, daffie, Nitesh Sethia: Improve/Refactor TestBase Through Expanded Unit Testing

core/modules/simpletest/src/TestBase.php

@@ -9,8 +9,8 @@
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\Random;
-use Drupal\Core\Database\Database;
 use Drupal\Component\Utility\String;
+use Drupal\Core\Database\Database;
 use Drupal\Core\Config\ConfigImporter;
 use Drupal\Core\Config\StorageComparer;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -343,6 +343,23 @@ protected function checkRequirements() {
     return array();
   }
 
+  /**
+   * Helper method to store an assertion record in the configured database.
+   *
+   * This method decouples database access from assertion logic.
+   *
+   * @param array $assertion
+   *   Keyed array representing an assertion, as generated by assert().
+   *
+   * @see self::assert()
+   */
+  protected function storeAssertion(array $assertion) {
+    return self::getDatabaseConnection()
+      ->insert('simpletest')
+      ->fields($assertion)
+      ->execute();
+  }
+
   /**
    * Internal helper: stores the assert.
    *
@@ -393,10 +410,7 @@ protected function assert($status, $message = '', $group = 'Other', array $calle
     );
 
     // Store assertion for display after the test has completed.
-    self::getDatabaseConnection()
-      ->insert('simpletest')
-      ->fields($assertion)
-      ->execute();
+    $this->storeAssertion($assertion);
 
     // We do not use a ternary operator here to allow a breakpoint on
     // test failure.
@@ -450,6 +464,7 @@ public static function insertAssert($test_id, $test_class, $status, $message = '
       'file' => $caller['file'],
     );
 
+    // We can't use storeAssertion() because this method is static.
     return self::getDatabaseConnection()
       ->insert('simpletest')
       ->fields($assertion)
@@ -468,6 +483,7 @@ public static function insertAssert($test_id, $test_class, $status, $message = '
    * @see \Drupal\simpletest\TestBase::insertAssert()
    */
   public static function deleteAssert($message_id) {
+    // We can't use storeAssertion() because this method is static.
     return (bool) self::getDatabaseConnection()
       ->delete('simpletest')
       ->condition('message_id', $message_id)
@@ -1334,7 +1350,6 @@ private function restoreEnvironment() {
    */
   public function errorHandler($severity, $message, $file = NULL, $line = NULL) {
     if ($severity & error_reporting()) {
-      require_once DRUPAL_ROOT . '/core/includes/errors.inc';
       $error_map = array(
         E_STRICT => 'Run-time notice',
         E_WARNING => 'Warning',
@@ -1369,7 +1384,6 @@ public function errorHandler($severity, $message, $file = NULL, $line = NULL) {
    * @see set_exception_handler
    */
   protected function exceptionHandler($exception) {
-    require_once DRUPAL_ROOT . '/core/includes/errors.inc';
     $backtrace = $exception->getTrace();
     $verbose_backtrace = $backtrace;
     // Push on top of the backtrace the call that generated the exception.