Verified Commit 816ac01b authored by Dave Long's avatar Dave Long
Browse files

Issue #3463288 by catch: Consolidate test methods in StandardPerformanceTest 

(cherry picked from commit 24b7c3ff)
parent 7c9adb2d

core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php

+31 −18
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
use Drupal\FunctionalJavascriptTests\PerformanceTestBase;

use Drupal\Tests\PerformanceData;

use Drupal\node\NodeInterface;

use Drupal\user\UserInterface;



/**

 * Tests the performance of basic functionality in the standard profile.
@@ -29,6 +30,11 @@ class StandardPerformanceTest extends PerformanceTestBase { 
   */

  protected $profile = 'standard';



  /**

   * The user account created during testing.

   */

  protected ?UserInterface $user = NULL;



  /**

   * {@inheritdoc}

   */
@@ -43,10 +49,19 @@ protected function setUp(): void { 
    user_role_grant_permissions('anonymous', ['access user profiles']);

  }



  /**

   * Tests performance of the standard profile.

   */

  public function testStandardPerformance(): void {

    $this->testAnonymous();

    $this->testLogin();

    $this->testLoginBlock();

  }



  /**

   * Tests performance for anonymous users.

   */

  public function testAnonymous(): void {

  protected function testAnonymous(): void {

    // Request the front page, then immediately clear all object caches, so that

    // aggregates and image styles are created on disk but otherwise caches are

    // empty.
@@ -146,9 +161,9 @@ public function testAnonymous(): void { 
    $this->assertSame(0, $performance_data->getCacheTagInvalidationCount());



    // Test user profile page.

    $user = $this->drupalCreateUser();

    $performance_data = $this->collectPerformanceData(function () use ($user) {

      $this->drupalGet('user/' . $user->id());

    $this->user = $this->drupalCreateUser();

    $performance_data = $this->collectPerformanceData(function () {

      $this->drupalGet('user/' . $this->user->id());

    }, 'standardUserPage');

    $this->assertNoJavaScript($performance_data);

    $this->assertSame(1, $performance_data->getStylesheetCount());
@@ -182,23 +197,22 @@ public function testAnonymous(): void { 
  /**

   * Tests the performance of logging in.

   */

  public function testLogin(): void {

  protected function testLogin(): void {

    // Create a user and log them in to warm all caches. Manually submit the

    // form so that we repeat the same steps when recording performance data. Do

    // this twice so that any caches which take two requests to warm are also

    // covered.

    $account = $this->drupalCreateUser();

    foreach (range(0, 1) as $index) {

      $this->drupalGet('node');

      $this->drupalGet('user/login');

      $this->submitLoginForm($account);

      $this->submitLoginForm($this->user);

      $this->drupalLogout();

    }



    $this->drupalGet('node');

    $this->drupalGet('user/login');

    $performance_data = $this->collectPerformanceData(function () use ($account) {

      $this->submitLoginForm($account);

    $performance_data = $this->collectPerformanceData(function () {

      $this->submitLoginForm($this->user);

    }, 'standardLogin');



    $expected_queries = [
@@ -228,30 +242,29 @@ public function testLogin(): void { 
    $this->assertSame(1, $performance_data->getCacheTagChecksumCount());

    $this->assertSame(23, $performance_data->getCacheTagIsValidCount());

    $this->assertSame(0, $performance_data->getCacheTagInvalidationCount());

    $this->drupalLogout();

  }



  /**

   * Tests the performance of logging in via the user login block.

   */

  public function testLoginBlock(): void {

  protected function testLoginBlock(): void {

    $this->drupalPlaceBlock('user_login_block');

    // Create a user and log them in to warm all caches. Manually submit the

    // form so that we repeat the same steps when recording performance data. Do

    // this twice so that any caches which take two requests to warm are also

    // covered.

    $account = $this->drupalCreateUser();

    // Log the user in in to warm all caches. Manually submit the form so that

    // we repeat the same steps when recording performance data. Do this twice

    // so that any caches which take two requests to warm are also covered.



    foreach (range(0, 1) as $index) {

      $this->drupalGet('node');

      $this->assertSession()->responseContains('Password');

      $this->submitLoginForm($account);

      $this->submitLoginForm($this->user);

      $this->drupalLogout();

    }



    $this->drupalGet('node');

    $this->assertSession()->responseContains('Password');

    $performance_data = $this->collectPerformanceData(function () use ($account) {

      $this->submitLoginForm($account);

    $performance_data = $this->collectPerformanceData(function () {

      $this->submitLoginForm($this->user);

    }, 'standardBlockLogin');



    $expected_queries = [