Move content assertion methods into a trait, so DUTB can consume it, too

+++ b/core/modules/simpletest/lib/Drupal/simpletest/AssertContentTrait.php
@@ -0,0 +1,1213 @@
+  protected function getTextContent() {
...
+  protected function getDrupalSettings() {
...
+   * @return
+   *   A SimpleXMLElement or FALSE on failure.
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return
...
+   * @return

Should have the return type (I realise this is C/P but pretty sure we have to fix when we touch it) - fixed in attached (only changes in attached are coding standards)

1. +++ b/core/modules/simpletest/lib/Drupal/simpletest/AssertContentTrait.php
   @@ -0,0 +1,1213 @@
   +      $htmlDom = new \DOMDocument();
   +      @$htmlDom->loadHTML('<?xml encoding="UTF-8">' . $this->getRawContent());
   +      if ($htmlDom) {
   

   $html_dom (c/p) - also fixed?

2. +++ b/core/modules/simpletest/lib/Drupal/simpletest/AssertContentTrait.php
   @@ -0,0 +1,1213 @@
   +        $this->pass(String::format('Valid HTML found on "@path"', array('@path' => $this->getUrl())), 'Browser');
   ...
   +      $this->fail('Parsed page successfully.', 'Browser');
   ...
   +    return $this->assert(isset($links[$index]), $message, $group);
   

   pass, fail, assert and getUrl methods aren't in the trait - but should be if the trait needs them. Even if they're just abstract in the trait or throw Exceptions. Same for assertEqual, assertTrue, assertFalse, assertIdentical, verbose and assertNotEqual? I thought the idea here was that you could drop this trait into any class. But this seems to not fit that - it relies on these methods that are in TestBase.

Of course I could totally have traits wrong

Now that DrupalUnitTestBase is able to render/theme output, too, it severely lacks assertion methods.

Where was that introduced? :) I'd love to convert as many tests as possible in the components I maintain!

+++ b/core/modules/simpletest/lib/Drupal/simpletest/AssertContentTrait.php
@@ -0,0 +1,1213 @@
+  protected function assertTextHelper($text, $message = '', $group, $not_exists) {

couple of these where second argument is optional but subsequent arguments aren't.
I changed them around but it broke some stuff.
hoping this fixes.

Wow. Wow. The consequences of this issue are going to be *awesome*. Thanks for the explanation, and for working on this! :)

Spoke with folks in irc and both timplunkett and Crell agreed that the trait should provide abstract stubs for the methods it calls but does not implement.

More irc discussions: Crell and timplunkett are happy with this as is because its only for test assertions, not runtime code.

Patch in #14 no longer applies due to a recent change in WebTestBase.php.

Rerolled the patch in #14 against latest HEAD.

Reroll for #2247991: [May 27] Move all module code from …/lib/Drupal/… to …/src/… for PSR-4.

Needs a reroll

git ac https://drupal.org/files/issues/test.content.39.patch
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  123k  100  123k    0     0  67750      0  0:00:01  0:00:01 --:--:-- 74758
error: patch failed: core/modules/simpletest/src/WebTestBase.php:2753
error: core/modules/simpletest/src/WebTestBase.php: patch does not apply

I love traits but isn't this excessive? Why can't this be either in TestBase or a common base class one step above TestBase?

reroll after #2282683: Responsive tables do not have tests

+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -1356,16 +1328,18 @@ protected function curlExec($curl_options, $redirect = FALSE) {
-    $this->assertTrue($this->drupalGetContent() !== FALSE, $message, 'Browser');
...
+    $this->assertTrue($this->getRawContent() !== FALSE, $message, 'Browser');

It would have been nice if the issue summary or somewhere documented this change... anyhow this needs a change notice before it can be committed since you are now changing public API method names. And we need to check exiting change records (unlikely I know)

diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/src/Tests/DisplayApiTest.php
index c0abdb5..71fd775 100644
--- a/core/modules/field/src/Tests/DisplayApiTest.php
+++ b/core/modules/field/src/Tests/DisplayApiTest.php
@@ -165,7 +165,7 @@ function testFieldItemListView() {
       ),
     );
     $output = $items->view($display);
-    $view = $this->render($output);
+    $this->render($output);
     $setting = $display['settings']['test_formatter_setting_additional'];
     $this->assertNoText($this->label, 'Label was not displayed.');
     $this->assertNoText('field_test_entity_display_build_alter', 'Alter not fired.');
@@ -274,7 +274,7 @@ function testFieldEmpty() {
     // $this->entity is set by the setUp() method and by default contains 4
     // numeric values.  We only want to test the display of this one field.
     $output = $this->entity->get($this->field_name)->view($display);
-    $view = $this->render($output);
+    $this->render($output);
     // The test field by default contains values, so should not display the
     // default "empty" text.
     $this->assertNoText($display['settings']['test_empty_string']);
@@ -283,7 +283,7 @@ function testFieldEmpty() {
     $this->entity->{$this->field_name} = array();
     $this->entity->save();
     $output = $this->entity->get($this->field_name)->view($display);
-    $view = $this->render($output);
+    $this->render($output);
     // This time, as the field values have been removed, we *should* show the
     // default "empty" text.
     $this->assertText($display['settings']['test_empty_string']);
diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/src/Tests/FieldUnitTestBase.php
index a840ead..ecc278a 100644
--- a/core/modules/field/src/Tests/FieldUnitTestBase.php
+++ b/core/modules/field/src/Tests/FieldUnitTestBase.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\field\Tests;
 
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\simpletest\DrupalUnitTestBase;
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index fef56c4..805c63b 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -11,7 +11,6 @@
 use Drupal\Component\Utility\Crypt;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\String;
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\ConnectionNotDefinedException;
@@ -25,7 +24,6 @@
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\block\Entity\Block;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\CssSelector\CssSelector;
 
 /**
  * Test case for typical Drupal tests.
diff --git a/core/modules/system/src/Tests/System/ScriptTest.php b/core/modules/system/src/Tests/System/ScriptTest.php
index 5e8d294..d712991 100644
--- a/core/modules/system/src/Tests/System/ScriptTest.php
+++ b/core/modules/system/src/Tests/System/ScriptTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\system\Tests\System;
 
-use Drupal\Component\Utility\String;
 use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
diff --git a/core/modules/system/src/Tests/Theme/TableTest.php b/core/modules/system/src/Tests/Theme/TableTest.php
index d00acb3..fd8e8fe 100644
--- a/core/modules/system/src/Tests/Theme/TableTest.php
+++ b/core/modules/system/src/Tests/Theme/TableTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\system\Tests\Theme;
 
-use Drupal\Component\Utility\String;
 use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
diff --git a/core/modules/views/src/Tests/Plugin/RowEntityTest.php b/core/modules/views/src/Tests/Plugin/RowEntityTest.php
index c60f1c7..70511f3 100644
--- a/core/modules/views/src/Tests/Plugin/RowEntityTest.php
+++ b/core/modules/views/src/Tests/Plugin/RowEntityTest.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests\Plugin;
 
-use Drupal\Component\Utility\Xss;
 use Drupal\views\Views;
 use Drupal\views\Tests\ViewUnitTestBase;
 

Above are changes I would have made on commit - that need doing.

Committed 8501b7f and pushed to 8.x. Thanks!

We should update https://www.drupal.org/node/1829160 to note that these assertions are available.