commit a4429a52e68a1b56e61f1f781c4feee5ab06029c
Author: Joel Pittet <joel@pittet.ca>
Date:   Mon Aug 10 21:43:49 2015 -0700

    fix the traps

diff --git a/core/modules/field/src/Tests/String/UuidFormatterTest.php b/core/modules/field/src/Tests/String/UuidFormatterTest.php
index 2eaf7e9..05c65a6 100644
--- a/core/modules/field/src/Tests/String/UuidFormatterTest.php
+++ b/core/modules/field/src/Tests/String/UuidFormatterTest.php
@@ -47,11 +47,11 @@ public function testUuidStringFormatter() {
     $uuid_field = $entity->get('uuid');
 
     $render_array = $uuid_field->view([]);
-    $this->assertIdentical($render_array[0]['#markup'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
+    $this->assertIdentical((string) $render_array[0]['#markup'], $entity->uuid(), 'The rendered UUID matches the entity UUID.');
 
     $render_array = $uuid_field->view(['settings' => ['link_to_entity' => TRUE]]);
     $this->assertIdentical($render_array[0]['#type'], 'link');
-    $this->assertIdentical($render_array[0]['#title'], $entity->uuid());
+    $this->assertIdentical((string) $render_array[0]['#title'], $entity->uuid());
     $this->assertIdentical($render_array[0]['#url']->toString(), $entity->url());
   }
 
diff --git a/core/modules/views/src/Tests/SearchIntegrationTest.php b/core/modules/views/src/Tests/SearchIntegrationTest.php
index f0f3fef..8b3b4d0 100644
--- a/core/modules/views/src/Tests/SearchIntegrationTest.php
+++ b/core/modules/views/src/Tests/SearchIntegrationTest.php
@@ -116,8 +116,8 @@ public function testSearchIntegration() {
     $xpath = '//div[@class="views-row"]//a';
     /** @var \SimpleXMLElement[] $results */
     $results = $this->xpath($xpath);
-    $this->assertEqual((string) $results[0], Html::encodeEntities("Drupal's search rocks <em>really</em> rocks!"));
-    $this->assertEqual((string) $results[1], Html::encodeEntities("Drupal's search rocks."));
+    $this->assertEqual((string) $results[0], "Drupal's search rocks <em>really</em> rocks!");
+    $this->assertEqual((string) $results[1], "Drupal's search rocks.");
 
     // Test sorting with another set of titles.
     $node = [