Issue #2821387 by Mile23, rfay: Convert all tests to BrowserTestBase

Author: Mile23

block_example/tests/src/Functional/BlockExampleMenuTest.php

@@ -4,7 +4,6 @@
 
 use Drupal\Tests\BrowserTestBase;
 
-
 /**
  * Test the user-facing menus in Block Example.
  *
@@ -36,15 +35,15 @@ class BlockExampleMenuTest extends BrowserTestBase {
    */
   public function testBlockExampleLink() {
     $this->drupalGet('');
-    $this->assertSession()->linkByHrefExists('examples/block-example');
+    $this->assertLinkByHref('examples/block-example');
   }
 
   /**
    * Tests block_example menus.
    */
   public function testBlockExampleMenu() {
     $this->drupalGet('examples/block-example');
-    $this->assertSession()->statusCodeEquals(200);
+    $this->assertResponse(200, 'Description page exists.');
   }
 
 }

block_example/tests/src/Functional/BlockExampleTest.php

@@ -81,7 +81,6 @@ public function testBlockExampleBasic() {
     // Verify that new content is shown.
     $this->drupalGet('');
     $assert->statusCodeEquals(200);
-
     $assert->pageTextContains($edit['settings[block_example_string_text]']);
   }
 

cache_example/src/Tests/CacheExampleTestCase.php cache_example/tests/src/Functional/CacheExampleTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\cache_example\Tests;
+namespace Drupal\Tests\cache_example\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests for the cache_example module.
@@ -12,7 +12,7 @@
  * @group cache_example
  * @group examples
  */
-class CacheExampleTestCase extends WebTestBase {
+class CacheExampleTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -37,14 +37,17 @@ class CacheExampleTestCase extends WebTestBase {
    */
   public function testCacheExampleMenu() {
 
+    $assert = $this->assertSession();
+
     // Test for a link to the cache_example in the Tools menu.
     $this->drupalGet('');
-    $this->assertResponse(200, 'The Home page is available.');
-    $this->assertLinkByHref('examples/cache-example');
+    $assert->statusCodeEquals(200);
+
+    $assert->linkByHrefExists('examples/cache-example');
 
     // Verify if the can successfully access the cache_example form.
     $this->drupalGet('examples/cache-example');
-    $this->assertResponse(200, 'The Cache Example description page is available.');
+    $assert->statusCodeEquals(200);
   }
 
   /**
@@ -57,6 +60,7 @@ public function testCacheExampleMenu() {
    * - Clear cache at the end and test if displaying uncached version again.
    */
   public function testCacheExampleBasic() {
+    $assert = $this->assertSession();
 
     // We need administrative privileges to clear the cache.
     $admin_user = $this->drupalCreateUser(array('administer site configuration'));
@@ -65,42 +69,42 @@ public function testCacheExampleBasic() {
     // Get initial page cache example page, first time accessed,
     // and assert uncached output.
     $this->drupalGet('examples/cache-example');
-    $this->assertText('Source: actual file search');
+    $assert->pageTextContains('Source: actual file search');
 
     // Reload the page; the number should be cached.
     $this->drupalGet('examples/cache-example');
-    $this->assertText('Source: cached');
+    $assert->pageTextContains('Source: cached');
 
     // Now push the button to remove the count.
     $this->drupalPostForm('examples/cache-example', array(), t('Explicitly remove cached file count'));
-    $this->assertText('Source: actual file search');
+    $assert->pageTextContains('Source: actual file search');
 
     // Create a cached item. First make sure it doesn't already exist.
-    $this->assertText('Cache item does not exist');
+    $assert->pageTextContains('Cache item does not exist');
     $this->drupalPostForm('examples/cache-example', array('expiration' => -10), t('Create a cache item with this expiration'));
     // We should now have an already-expired item. Automatically invalid.
-    $this->assertText('Cache_item is invalid');
+    $assert->pageTextContains('Cache_item is invalid');
     // Now do the expiration operation.
     $this->drupalPostForm('examples/cache-example', array('cache_clear_type' => 'expire'), t('Clear or expire cache'));
     // And verify that it was removed.
-    $this->assertText('Cache item does not exist');
+    $assert->pageTextContains('Cache item does not exist');
 
     // Create a cached item. This time we'll make it not expire.
     $this->drupalPostForm('examples/cache-example', array('expiration' => 'never_remove'), t('Create a cache item with this expiration'));
     // We should now have an never-remove item.
-    $this->assertText('Cache item exists and is set to expire at Never expires');
+    $assert->pageTextContains('Cache item exists and is set to expire at Never expires');
     // Now do the expiration operation.
     $this->drupalPostForm('examples/cache-example', array('cache_clear_type' => 'expire'), t('Clear or expire cache'));
     // And verify that it was not removed.
-    $this->assertText('Cache item exists and is set to expire at Never expires');
+    $assert->pageTextContains('Cache item exists and is set to expire at Never expires');
     // Now do tag invalidation.
     $this->drupalPostForm('examples/cache-example', array('cache_clear_type' => 'remove_tag'), t('Clear or expire cache'));
     // And verify that it was invalidated.
-    $this->assertText('Cache_item is invalid');
+    $assert->pageTextContains('Cache_item is invalid');
     // Do the hard delete.
     $this->drupalPostForm('examples/cache-example', array('cache_clear_type' => 'remove_all'), t('Clear or expire cache'));
     // And verify that it was removed.
-    $this->assertText('Cache item does not exist');
+    $assert->pageTextContains('Cache item does not exist');
   }
 
 }

config_entity_example/src/Tests/ConfigEntityExampleTest.php config_entity_example/tests/src/Functional/ConfigEntityExampleTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\config_entity_example\Tests;
-
-use Drupal\simpletest\WebTestBase;
+namespace Drupal\Tests\config_entity_example\Functional;
+use Drupal\config_entity_example\Entity\Robot;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test the Config Entity Example module.
@@ -12,7 +12,7 @@
  *
  * @ingroup config_entity_example
  */
-class ConfigEntityExampleTest extends WebTestBase {
+class ConfigEntityExampleTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -56,9 +56,11 @@ public static function getInfo() {
    * 5) Verify that the label is shown in the list.
    */
   public function testConfigEntityExample() {
+    $assert = $this->assertSession();
+
     // 1) Verify that the Marvin entity was created when the module was
     // installed.
-    $entity = entity_load('robot', 'marvin');
+    $entity = Robot::load('marvin');
     $this->assertNotNull($entity, 'Marvin was created during installation.');
 
     // 2) Verify that permissions are applied to the various defined paths.
@@ -74,7 +76,7 @@ public function testConfigEntityExample() {
     // we haven't logged in any users, so the client is anonymous.
     foreach ($forbidden_paths as $path) {
       $this->drupalGet($path);
-      $this->assertResponse(403, "Access denied to anonymous for path: $path");
+      $assert->statusCodeEquals(403);
     }
 
     // Create a user with no permissions.
@@ -84,7 +86,7 @@ public function testConfigEntityExample() {
     // special permissions for these paths.
     foreach ($forbidden_paths as $path) {
       $this->drupalGet($path);
-      $this->assertResponse(403, "Access denied to generic user for path: $path");
+      $assert->statusCodeEquals(403);
     }
 
     // Create a user who can administer robots.
@@ -93,12 +95,12 @@ public function testConfigEntityExample() {
     // Forbidden paths aren't forbidden any more.
     foreach ($forbidden_paths as $unforbidden) {
       $this->drupalGet($unforbidden);
-      $this->assertResponse(200, "Access granted to admin user for path: $unforbidden");
+      $assert->statusCodeEquals(200);
     }
 
     // Now that we have the admin user logged in, check the menu links.
     $this->drupalGet('');
-    $this->assertLinkByHref('examples/config-entity-example');
+    $assert->linkByHrefExists('examples/config-entity-example');
 
     // 3) Verify that we can manage entities through the user interface.
     // We still have the admin user logged in, so we'll create, update, and
@@ -119,8 +121,8 @@ public function testConfigEntityExample() {
 
     // 4) Verify that our robot appears when we edit it.
     $this->drupalGet('/examples/config-entity-example/manage/' . $robot_machine_name);
-    $this->assertField('label');
-    $this->assertFieldChecked('edit-floopy');
+    $assert->fieldExists('label');
+    $assert->checkboxChecked('edit-floopy');
 
     // 5) Verify that the label and machine name are shown in the list.
     $this->drupalGet('/examples/config-entity-example');
@@ -137,8 +139,8 @@ public function testConfigEntityExample() {
       t('Create Robot')
     );
     $this->drupalGet('/examples/config-entity-example');
-    $this->assertText($robby_label);
-    $this->assertText($robby_machine_name);
+    $assert->pageTextContains($robby_label);
+    $assert->pageTextContains($robby_machine_name);
 
     // 6) Verify that required links are present on respective paths.
     $this->assertLinkByHref('/examples/config-entity-example/add');

content_entity_example/src/Tests/ContentEntityExampleTest.php content_entity_example/tests/src/Functional/ContentEntityExampleTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\content_entity_example\Tests;
 
 use Drupal\content_entity_example\Entity\Contact;
-use Drupal\examples\Tests\ExamplesTestBase;
+use Drupal\Tests\examples\Functional\ExamplesBrowserTestBase;
 
 /**
  * Tests the basic functions of the Content Entity Example module.
@@ -15,14 +15,16 @@
  * @group content_entity_example
  * @group examples
  */
-class ContentEntityExampleTest extends ExamplesTestBase {
+class ContentEntityExampleTest extends ExamplesBrowserTestBase {
 
   public static $modules = array('content_entity_example', 'block', 'field_ui');
 
   /**
    * Basic tests for Content Entity Example.
    */
   public function testContentEntityExample() {
+    $assert = $this->assertSession();
+
     $web_user = $this->drupalCreateUser(array(
       'add contact entity',
       'edit contact entity',
@@ -35,26 +37,26 @@ public function testContentEntityExample() {
     ));
 
     // Anonymous User should not see the link to the listing.
-    $this->assertNoText(t('Content Entity Example: Contacts Listing'));
+    $assert->pageTextNotContains('Content Entity Example: Contacts Listing');
 
     $this->drupalLogin($web_user);
 
     // Web_user user has the right to view listing.
-    $this->assertLink(t('Content Entity Example: Contacts Listing'));
+    $assert->linkExists('Content Entity Example: Contacts Listing');
 
-    $this->clickLink(t('Content Entity Example: Contacts Listing'));
+    $this->clickLink('Content Entity Example: Contacts Listing');
 
     // WebUser can add entity content.
-    $this->assertLink(t('Add Contact'));
+    $assert->linkExists('Add Contact');
 
     $this->clickLink(t('Add Contact'));
 
-    $this->assertFieldByName('name[0][value]', '', 'Name Field, empty');
-    $this->assertFieldByName('name[0][value]', '', 'First Name Field, empty');
-    $this->assertFieldByName('name[0][value]', '', 'Gender Field, empty');
+    $assert->fieldValueEquals('name[0][value]', '');
+    $assert->fieldValueEquals('name[0][value]', '');
+    $assert->fieldValueEquals('name[0][value]', '');
 
     $user_ref = $web_user->name->value . ' (' . $web_user->id() . ')';
-    $this->assertFieldByName('user_id[0][target_id]', $user_ref, 'User ID reference field points to web_user');
+    $assert->fieldValueEquals('user_id[0][target_id]', $user_ref);
 
     // Post content, save an instance. Go back to list after saving.
     $edit = array(
@@ -65,44 +67,46 @@ public function testContentEntityExample() {
     $this->drupalPostForm(NULL, $edit, t('Save'));
 
     // Entity listed.
-    $this->assertLink(t('Edit'));
-    $this->assertLink(t('Delete'));
+    $assert->linkExists('Edit');
+    $assert->linkExists('Delete');
 
     $this->clickLink('test name');
 
     // Entity shown.
-    $this->assertText(t('test name'));
-    $this->assertText(t('test first name'));
-    $this->assertText(t('male'));
-    $this->assertLink(t('Add Contact'));
-    $this->assertLink(t('Edit'));
-    $this->assertLink(t('Delete'));
+    $assert->pageTextContains('test name');
+    $assert->pageTextContains('test first name');
+    $assert->pageTextContains('male');
+    $assert->linkExists('Add Contact');
+    $assert->linkExists('Edit');
+    $assert->linkExists('Delete');
 
     // Delete the entity.
     $this->clickLink('Delete');
 
     // Confirm deletion.
-    $this->assertLink(t('Cancel'));
+    $assert->linkExists('Cancel');
     $this->drupalPostForm(NULL, array(), 'Delete');
 
     // Back to list, must be empty.
-    $this->assertNoText('test name');
+    $assert->pageTextNotContains('test name');
 
     // Settings page.
     $this->drupalGet('admin/structure/content_entity_example_contact_settings');
-    $this->assertText(t('Contact Settings'));
+    $assert->pageTextContains('Contact Settings');
 
     // Make sure the field manipulation links are available.
-    $this->assertLink(t('Settings'));
-    $this->assertLink(t('Manage fields'));
-    $this->assertLink(t('Manage form display'));
-    $this->assertLink(t('Manage display'));
+    $assert->linkExists('Settings');
+    $assert->linkExists('Manage fields');
+    $assert->linkExists('Manage form display');
+    $assert->linkExists('Manage display');
   }
 
   /**
    * Test all paths exposed by the module, by permission.
    */
   public function testPaths() {
+    $assert = $this->assertSession();
+
     // Generate a contact so that we can test the paths against it.
     $contact = Contact::create(
       array(
@@ -129,7 +133,7 @@ public function testPaths() {
         $this->drupalLogin($user);
       }
       $this->drupalGet($datum[1]);
-      $this->assertResponse($datum[0]);
+      $assert->statusCodeEquals($datum[0]);
     }
   }
 
@@ -237,8 +241,7 @@ public function testAddFields() {
 
     // Fetch url without query parameters.
     $current_path = strtok($this->getUrl(), '?');
-    $this->assertEqual($expected_path, $current_path, 'It should redirect to field storage settings page.');
-
+    $this->assertEquals($expected_path, $current_path);
   }
 
 }