Skip to content
Snippets Groups Projects
Unverified Commit 82aea19c authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3098244 by longwave, Madhura BK, Krzysztof Domański: Rename...

Issue #3098244 by longwave, Madhura BK, Krzysztof Domański: Rename SafeMarkupKernelTest to FormattableMarkupKernelTest

(cherry picked from commit fd224bc7)
parent 8130c365
Branches
Tags
No related merge requests found
<?php <?php
namespace Drupal\KernelTests\Component\Utility; namespace Drupal\KernelTests\Component\Render;
use Drupal\Component\Render\FormattableMarkup; use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Url; use Drupal\Core\Url;
use Drupal\KernelTests\KernelTestBase; use Drupal\KernelTests\KernelTestBase;
/** /**
* Provides a test covering integration of SafeMarkup with other systems. * Provides a test covering integration of FormattableMarkup with other systems.
* *
* @group Utility * @group Render
*/ */
class SafeMarkupKernelTest extends KernelTestBase { class FormattableMarkupKernelTest extends KernelTestBase {
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -41,7 +41,7 @@ protected function setUp() { ...@@ -41,7 +41,7 @@ protected function setUp() {
* *
* @see \Drupal\Component\Render\FormattableMarkup * @see \Drupal\Component\Render\FormattableMarkup
*/ */
protected static function getSafeMarkupUriArgs($uri, $options = []) { protected static function getFormattableMarkupUriArgs($uri, $options = []) {
$args[':url'] = Url::fromUri($uri, $options)->toString(); $args[':url'] = Url::fromUri($uri, $options)->toString();
return $args; return $args;
} }
...@@ -49,17 +49,17 @@ protected static function getSafeMarkupUriArgs($uri, $options = []) { ...@@ -49,17 +49,17 @@ protected static function getSafeMarkupUriArgs($uri, $options = []) {
/** /**
* Tests URL ":placeholders" in \Drupal\Component\Render\FormattableMarkup. * Tests URL ":placeholders" in \Drupal\Component\Render\FormattableMarkup.
* *
* @dataProvider providerTestSafeMarkupUri * @dataProvider providerTestFormattableMarkupUri
*/ */
public function testSafeMarkupUri($string, $uri, $options, $expected) { public function testFormattableMarkupUri($string, $uri, $options, $expected) {
$args = self::getSafeMarkupUriArgs($uri, $options); $args = self::getFormattableMarkupUriArgs($uri, $options);
$this->assertEquals($expected, new FormattableMarkup($string, $args)); $this->assertEquals($expected, new FormattableMarkup($string, $args));
} }
/** /**
* @return array * @return array
*/ */
public function providerTestSafeMarkupUri() { public function providerTestFormattableMarkupUri() {
$data = []; $data = [];
$data['routed-url'] = [ $data['routed-url'] = [
'Hey giraffe <a href=":url">MUUUH</a>', 'Hey giraffe <a href=":url">MUUUH</a>',
...@@ -108,12 +108,12 @@ public function providerTestSafeMarkupUri() { ...@@ -108,12 +108,12 @@ public function providerTestSafeMarkupUri() {
} }
/** /**
* @dataProvider providerTestSafeMarkupUriWithException * @dataProvider providerTestFormattableMarkupUriWithException
*/ */
public function testSafeMarkupUriWithExceptionUri($string, $uri) { public function testFormattableMarkupUriWithExceptionUri($string, $uri) {
// Should throw an \InvalidArgumentException, due to Uri::toString(). // Should throw an \InvalidArgumentException, due to Uri::toString().
$this->expectException(\InvalidArgumentException::class); $this->expectException(\InvalidArgumentException::class);
$args = self::getSafeMarkupUriArgs($uri); $args = self::getFormattableMarkupUriArgs($uri);
new FormattableMarkup($string, $args); new FormattableMarkup($string, $args);
} }
...@@ -121,7 +121,7 @@ public function testSafeMarkupUriWithExceptionUri($string, $uri) { ...@@ -121,7 +121,7 @@ public function testSafeMarkupUriWithExceptionUri($string, $uri) {
/** /**
* @return array * @return array
*/ */
public function providerTestSafeMarkupUriWithException() { public function providerTestFormattableMarkupUriWithException() {
$data = []; $data = [];
$data['js-protocol'] = [ $data['js-protocol'] = [
'Hey giraffe <a href=":url">MUUUH</a>', 'Hey giraffe <a href=":url">MUUUH</a>',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment