Verified Commit aeccef91 authored by Dave Long's avatar Dave Long
Browse files

Issue #3227598 by nikolay shapovalov, longwave, quietone, smustgrave,... 

Issue #3227598 by nikolay shapovalov, longwave, quietone, smustgrave, larowlan: Remove remaining uses of FormattableMarkup in kernel test assertions
parent c42f5d93

core/modules/dblog/tests/src/Kernel/Views/ViewsIntegrationTest.php

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


namespace Drupal\Tests\dblog\Kernel\Views;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Component\Utility\Xss;

use Drupal\Core\Logger\RfcLogLevel;

use Drupal\Core\Link;
@@ -67,7 +66,7 @@ public function testMessages(): void { 
      }

      $message_vars = $entry['variables'];

      unset($message_vars['link']);

      $this->assertEquals(new FormattableMarkup($entry['message'], $message_vars), $view->style_plugin->getField($index, 'message'));

      $this->assertEquals(strtr($entry['message'], $message_vars), $view->style_plugin->getField($index, 'message'));

      $link_field = $view->style_plugin->getField($index, 'link');

      // The 3rd entry contains some unsafe markup that needs to get filtered.

      if ($index == 2) {

core/modules/field/tests/src/Kernel/DisplayApiTest.php

+9 −10
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


namespace Drupal\Tests\field\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Entity\Entity\EntityViewMode;

use Drupal\entity_test\Entity\EntityTest;

use Drupal\field\Entity\FieldConfig;
@@ -145,7 +144,7 @@ public function testFieldItemListView(): void { 
    $setting = $settings['test_formatter_setting'];

    $this->assertText($this->label, 'Label was displayed.');

    foreach ($this->values as $delta => $value) {

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }



    // Display settings: Check hidden field.
@@ -204,7 +203,7 @@ public function testFieldItemListView(): void { 
    $this->assertNoText($this->label, 'Label was not displayed.');

    $this->assertNoText('field_test_entity_display_build_alter', 'Alter not fired.');

    foreach ($this->values as $delta => $value) {

      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), "Value $delta was displayed with expected setting.");

    }



    // View mode: check that display settings specified in the display object
@@ -214,7 +213,7 @@ public function testFieldItemListView(): void { 
    $setting = $this->displayOptions['teaser']['settings']['test_formatter_setting'];

    $this->assertText($this->label, 'Label was displayed.');

    foreach ($this->values as $delta => $value) {

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }



    // Unknown view mode: check that display settings for 'default' view mode
@@ -224,7 +223,7 @@ public function testFieldItemListView(): void { 
    $setting = $this->displayOptions['default']['settings']['test_formatter_setting'];

    $this->assertText($this->label, 'Label was displayed.');

    foreach ($this->values as $delta => $value) {

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }

  }
@@ -239,7 +238,7 @@ public function testFieldItemView(): void { 
      $item = $this->entity->{$this->fieldName}[$delta];

      $build = $item->view();

      $this->render($build);

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }



    // Check that explicit display settings are used.
@@ -254,7 +253,7 @@ public function testFieldItemView(): void { 
      $item = $this->entity->{$this->fieldName}[$delta];

      $build = $item->view($display);

      $this->render($build);

      $this->assertText($setting . '|0:' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|0:' . $value['value'], "Value $delta was displayed with expected setting.");

    }



    // Check that prepare_view steps are invoked.
@@ -269,7 +268,7 @@ public function testFieldItemView(): void { 
      $item = $this->entity->{$this->fieldName}[$delta];

      $build = $item->view($display);

      $this->render($build);

      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'] . '|' . ($value['value'] + 1), "Value $delta was displayed with expected setting.");

    }



    // View mode: check that display settings specified in the field are used.
@@ -278,7 +277,7 @@ public function testFieldItemView(): void { 
      $item = $this->entity->{$this->fieldName}[$delta];

      $build = $item->view('teaser');

      $this->render($build);

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }



    // Unknown view mode: check that display settings for 'default' view mode
@@ -288,7 +287,7 @@ public function testFieldItemView(): void { 
      $item = $this->entity->{$this->fieldName}[$delta];

      $build = $item->view('unknown_view_mode');

      $this->render($build);

      $this->assertText($setting . '|' . $value['value'], new FormattableMarkup('Value @delta was displayed with expected setting.', ['@delta' => $delta]));

      $this->assertText($setting . '|' . $value['value'], "Value $delta was displayed with expected setting.");

    }

  }

core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php

+8 −44
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


use Drupal\comment\Entity\Comment;

use Drupal\comment\Entity\CommentType;

use Drupal\Component\Render\FormattableMarkup;

use Drupal\Component\Utility\Html;

use Drupal\Core\Field\FieldItemListInterface;

use Drupal\Core\Field\FieldItemInterface;

use Drupal\Core\Field\FieldStorageDefinitionInterface;
@@ -469,13 +469,7 @@ public function testAutocreateValidation(): void { 


    $errors = $entity->validate();

    $this->assertCount(1, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.',

        [

          '%type' => 'node',

          '%label' => $title,

        ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (node: ' . Html::escape($title) . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_node.0.entity', $errors[0]->getPropertyPath());



    // Publish the node and try again.
@@ -523,19 +517,9 @@ public function testAutocreateValidation(): void { 


    $errors = $entity->validate();

    $this->assertCount(2, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'node',

        '%label' => $unsaved_unpublished_node_title,

      ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (node: ' . Html::escape($unsaved_unpublished_node_title) . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_node.0.entity', $errors[0]->getPropertyPath());

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'node',

        '%label' => $saved_unpublished_node->id(),

      ]),

      $errors[1]->getMessage());

    $this->assertEquals('This entity (node: ' . Html::escape($saved_unpublished_node->id()) . ') cannot be referenced.', $errors[1]->getMessage());

    $this->assertEquals('field_test_node.1.target_id', $errors[1]->getPropertyPath());



    // Publish one of the nodes and try again.
@@ -543,12 +527,7 @@ public function testAutocreateValidation(): void { 
    $saved_unpublished_node->save();

    $errors = $entity->validate();

    $this->assertCount(1, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'node',

        '%label' => $unsaved_unpublished_node_title,

      ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (node: ' . Html::escape($unsaved_unpublished_node_title) . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_node.0.entity', $errors[0]->getPropertyPath());



    // Publish the last invalid node and try again.
@@ -572,12 +551,7 @@ public function testAutocreateValidation(): void { 


    $errors = $entity->validate();

    $this->assertCount(1, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'comment',

        '%label' => $title,

      ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (comment: ' . Html::escape($title) . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_comment.0.entity', $errors[0]->getPropertyPath());



    // Publish the comment and try again.
@@ -600,12 +574,7 @@ public function testAutocreateValidation(): void { 


    $errors = $entity->validate();

    $this->assertCount(1, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'user',

        '%label' => $name,

      ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (user: ' . Html::escape($name) . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_user.0.entity', $errors[0]->getPropertyPath());



    // Activate the user and try again.
@@ -628,12 +597,7 @@ public function testAutocreateValidation(): void { 


    $errors = $entity->validate();

    $this->assertCount(1, $errors);

    $this->assertEquals(

      new FormattableMarkup('This entity (%type: %label) cannot be referenced.', [

        '%type' => 'file',

        '%label' => $filename,

      ]),

      $errors[0]->getMessage());

    $this->assertEquals('This entity (file: ' . $filename . ') cannot be referenced.', $errors[0]->getMessage());

    $this->assertEquals('field_test_file.0.entity', $errors[0]->getPropertyPath());



    // Set the file as permanent and try again.

core/modules/field/tests/src/Kernel/FieldKernelTestBase.php

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


namespace Drupal\Tests\field\Kernel;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Entity\EntityInterface;

use Drupal\Core\Language\LanguageInterface;

use Drupal\field\Entity\FieldConfig;
@@ -212,7 +211,7 @@ protected function assertFieldValues(EntityInterface $entity, $field_name, $expe 
    $values = $field->getValue();

    $this->assertCount($expected_values_count, $values, 'Expected number of values were saved.');

    foreach ($expected_values as $key => $value) {

      $this->assertEquals($value, $values[$key][$column], new FormattableMarkup('Value @value was saved correctly.', ['@value' => $value]));

      $this->assertEquals($value, $values[$key][$column], "Value $value was saved correctly.");

    }

  }

core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php

+7 −19
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


namespace Drupal\Tests\field\Kernel\Timestamp;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Entity\Display\EntityViewDisplayInterface;

use Drupal\Core\Entity\FieldableEntityInterface;

use Drupal\entity_test\Entity\EntityTest;
@@ -146,29 +145,17 @@ public function testTimestampFormatter(): void { 
   * Tests TimestampAgoFormatter.

   */

  public function testTimestampAgoFormatter(): void {

    $data = [];



    foreach ([1, 2, 3, 4, 5, 6, 7] as $granularity) {

      $data[] = [

        'future_format' => '@interval hence',

        'past_format' => '@interval ago',

        'granularity' => $granularity,

      ];

    }



    foreach ($data as $settings) {

      $future_format = $settings['future_format'];

      $past_format = $settings['past_format'];

      $granularity = $settings['granularity'];

    foreach (range(1, 7) as $granularity) {

      $request_time = \Drupal::requestStack()->getCurrentRequest()->server->get('REQUEST_TIME');



      // Test a timestamp in the past

      $value = $request_time - 87654321;

      $expected = new FormattableMarkup($past_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($value, ['granularity' => $granularity])]);

      $interval = \Drupal::service('date.formatter')->formatTimeDiffSince($value, ['granularity' => $granularity]);

      $expected = $interval . ' ago';



      $component = $this->display->getComponent($this->fieldName);

      $component['type'] = 'timestamp_ago';

      $component['settings'] = $settings;

      $component['settings'] = ['granularity' => $granularity];

      $this->display->setComponent($this->fieldName, $component);



      $entity = EntityTest::create([]);
@@ -179,11 +166,12 @@ public function testTimestampAgoFormatter(): void { 


      // Test a timestamp in the future

      $value = $request_time + 87654321;

      $expected = new FormattableMarkup($future_format, ['@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($value, ['granularity' => $granularity])]);

      $interval = \Drupal::service('date.formatter')->formatTimeDiffUntil($value, ['granularity' => $granularity]);

      $expected = $interval . ' hence';



      $component = $this->display->getComponent($this->fieldName);

      $component['type'] = 'timestamp_ago';

      $component['settings'] = $settings;

      $component['settings'] = ['granularity' => $granularity];

      $this->display->setComponent($this->fieldName, $component);



      $entity = EntityTest::create([]);