From 82aea19c5d12814db970ea8363dcaa5443a408cc Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 13 Jan 2020 17:08:51 +0000
Subject: [PATCH] =?UTF-8?q?Issue=20#3098244=20by=20longwave,=20Madhura=20B?=
=?UTF-8?q?K,=20Krzysztof=20Doma=C5=84ski:=20Rename=20SafeMarkupKernelTest?=
=?UTF-8?q?=20to=20FormattableMarkupKernelTest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit fd224bc774049d32dea4571bf07733a89a571b78)
---
.../FormattableMarkupKernelTest.php} | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
rename core/tests/Drupal/KernelTests/Component/{Utility/SafeMarkupKernelTest.php => Render/FormattableMarkupKernelTest.php} (79%)
diff --git a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php b/core/tests/Drupal/KernelTests/Component/Render/FormattableMarkupKernelTest.php
similarity index 79%
rename from core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
rename to core/tests/Drupal/KernelTests/Component/Render/FormattableMarkupKernelTest.php
index b8f4693545a3..c7249c591e06 100644
--- a/core/tests/Drupal/KernelTests/Component/Utility/SafeMarkupKernelTest.php
+++ b/core/tests/Drupal/KernelTests/Component/Render/FormattableMarkupKernelTest.php
@@ -1,17 +1,17 @@
<?php
-namespace Drupal\KernelTests\Component\Utility;
+namespace Drupal\KernelTests\Component\Render;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Core\Url;
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
-*/
-class SafeMarkupKernelTest extends KernelTestBase {
+ * @group Render
+ */
+class FormattableMarkupKernelTest extends KernelTestBase {
/**
* {@inheritdoc}
@@ -41,7 +41,7 @@ protected function setUp() {
*
* @see \Drupal\Component\Render\FormattableMarkup
*/
- protected static function getSafeMarkupUriArgs($uri, $options = []) {
+ protected static function getFormattableMarkupUriArgs($uri, $options = []) {
$args[':url'] = Url::fromUri($uri, $options)->toString();
return $args;
}
@@ -49,17 +49,17 @@ protected static function getSafeMarkupUriArgs($uri, $options = []) {
/**
* Tests URL ":placeholders" in \Drupal\Component\Render\FormattableMarkup.
*
- * @dataProvider providerTestSafeMarkupUri
+ * @dataProvider providerTestFormattableMarkupUri
*/
- public function testSafeMarkupUri($string, $uri, $options, $expected) {
- $args = self::getSafeMarkupUriArgs($uri, $options);
+ public function testFormattableMarkupUri($string, $uri, $options, $expected) {
+ $args = self::getFormattableMarkupUriArgs($uri, $options);
$this->assertEquals($expected, new FormattableMarkup($string, $args));
}
/**
* @return array
*/
- public function providerTestSafeMarkupUri() {
+ public function providerTestFormattableMarkupUri() {
$data = [];
$data['routed-url'] = [
'Hey giraffe <a href=":url">MUUUH</a>',
@@ -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().
$this->expectException(\InvalidArgumentException::class);
- $args = self::getSafeMarkupUriArgs($uri);
+ $args = self::getFormattableMarkupUriArgs($uri);
new FormattableMarkup($string, $args);
}
@@ -121,7 +121,7 @@ public function testSafeMarkupUriWithExceptionUri($string, $uri) {
/**
* @return array
*/
- public function providerTestSafeMarkupUriWithException() {
+ public function providerTestFormattableMarkupUriWithException() {
$data = [];
$data['js-protocol'] = [
'Hey giraffe <a href=":url">MUUUH</a>',
--
GitLab