Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / taxonomy / tests / src / Functional / Views / TaxonomyFieldAllTermsTest.php

diff --git a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
similarity index 86%
rename from web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
rename to web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
index 41780412c32c4e91ef9277378511dc09933dde41..ce70c72cc6ee8db443f80c3ea2a7e0c73bd75be8 100644 (file)
--- a/web/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldAllTermsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldAllTermsTest.php
@@ -1,6 +1,6 @@
 <?php
 
 <?php
 

-namespace Drupal\taxonomy\Tests\Views;
+namespace Drupal\Tests\taxonomy\Functional\Views;

 
 use Drupal\views\Views;
 use Drupal\taxonomy\Entity\Vocabulary;
 
 use Drupal\views\Views;
 use Drupal\taxonomy\Entity\Vocabulary;


@@ -30,14 +30,14 @@ class TaxonomyFieldAllTermsTest extends TaxonomyTestBase {
 
     $actual = $this->xpath('//a[@href="' . $this->term1->url() . '"]');
     $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term1 links');
 
     $actual = $this->xpath('//a[@href="' . $this->term1->url() . '"]');
     $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term1 links');

-    $this->assertEqual($actual[0]->__toString(), $this->term1->label());
-    $this->assertEqual($actual[1]->__toString(), $this->term1->label());
+    $this->assertEqual($actual[0]->getText(), $this->term1->label());
+    $this->assertEqual($actual[1]->getText(), $this->term1->label());

     $this->assertEscaped($this->term1->label());
 
     $actual = $this->xpath('//a[@href="' . $this->term2->url() . '"]');
     $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term2 links');
     $this->assertEscaped($this->term1->label());
 
     $actual = $this->xpath('//a[@href="' . $this->term2->url() . '"]');
     $this->assertEqual(count($actual), 2, 'Correct number of taxonomy term2 links');

-    $this->assertEqual($actual[0]->__toString(), $this->term2->label());
-    $this->assertEqual($actual[1]->__toString(), $this->term2->label());
+    $this->assertEqual($actual[0]->getText(), $this->term2->label());
+    $this->assertEqual($actual[1]->getText(), $this->term2->label());

   }
 
   /**
   }
 
   /**