$actual_filtered_textExpected:
$expected_filtered_text"); $this->assertEqual($expected_filtered_text, $actual_filtered_text, 'Expected filter result.'); $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', [FilterInterface::TYPE_MARKUP_LANGUAGE]); - $this->verbose("Actual:
$actual_filtered_text_without_html_generatorsExpected:
$expected_filter_text_without_html_generators"); $this->assertEqual($expected_filter_text_without_html_generators, $actual_filtered_text_without_html_generators, 'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters.'); // Related to @see FilterSecurityTest.php/testSkipSecurityFilters(), but // this check focuses on the ability to filter multiple filter types at once. // Drupal core only ships with these two types of filters, so this is the // most extensive test possible. $actual_filtered_text_without_html_generators = check_markup($text, 'filtered_html', '', [FilterInterface::TYPE_HTML_RESTRICTOR, FilterInterface::TYPE_MARKUP_LANGUAGE]); - $this->verbose("Actual:
$actual_filtered_text_without_html_generatorsExpected:
$expected_filter_text_without_html_generators"); $this->assertEqual($expected_filter_text_without_html_generators, $actual_filtered_text_without_html_generators, 'Expected filter result when skipping FilterInterface::TYPE_MARKUP_LANGUAGE filters, even when trying to disable filters of the FilterInterface::TYPE_HTML_RESTRICTOR type.'); } diff --git a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php index 077abfe70a8..effcb7b78e4 100644 --- a/core/modules/filter/tests/src/Kernel/FilterKernelTest.php +++ b/core/modules/filter/tests/src/Kernel/FilterKernelTest.php @@ -389,10 +389,7 @@ class FilterKernelTest extends KernelTestBase { $limit = max(ini_get('pcre.backtrack_limit'), ini_get('pcre.recursion_limit')); $source = $this->randomMachineName($limit); $result = _filter_autop($source); - $success = $this->assertEqual($result, '
' . $source . "
\n", 'Line break filter can process very long strings.'); - if (!$success) { - $this->verbose("\n" . $source . "\n' . $source . "
\n", 'Line break filter can process very long strings.'); } /** diff --git a/core/modules/link/tests/src/Functional/LinkFieldTest.php b/core/modules/link/tests/src/Functional/LinkFieldTest.php index 8e881290cd7..5c51f9bd595 100644 --- a/core/modules/link/tests/src/Functional/LinkFieldTest.php +++ b/core/modules/link/tests/src/Functional/LinkFieldTest.php @@ -841,9 +841,7 @@ class LinkFieldTest extends BrowserTestBase { ->getViewDisplay($entity->getEntityTypeId(), $entity->bundle(), $view_mode); $content = $display->build($entity); $output = \Drupal::service('renderer')->renderRoot($content); - $output = (string) $output; - $this->verbose($output); - return $output; + return (string) $output; } } diff --git a/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php b/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php index 1473aa48345..ad07b5298d9 100644 --- a/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php +++ b/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php @@ -33,9 +33,7 @@ class LocaleUpdateDevelopmentReleaseTest extends BrowserTestBase { public function testLocaleUpdateDevelopmentRelease() { $projects = locale_translation_build_projects(); - $this->verbose($projects['drupal']->info['version']); $this->assertEqual('8.0.x', $projects['drupal']->info['version'], 'The branch of the core dev release.'); - $this->verbose($projects['contrib']->info['version']); $this->assertEqual('12.x-10.x', $projects['contrib']->info['version'], 'The branch of the contrib module dev release.'); } diff --git a/core/modules/search/tests/src/Kernel/SearchExcerptTest.php b/core/modules/search/tests/src/Kernel/SearchExcerptTest.php index eed87ef1641..ab786e34a6d 100644 --- a/core/modules/search/tests/src/Kernel/SearchExcerptTest.php +++ b/core/modules/search/tests/src/Kernel/SearchExcerptTest.php @@ -173,8 +173,6 @@ class SearchExcerptTest extends KernelTestBase { $text = str_repeat($lorem3, 20) . ' ' . $lorem1; $result = $this->doSearchExcerpt('Lìbêró', $text); $this->assertStringContainsString('libero', $result, 'Search excerpt works with caps and accents in longer text with whitespace'); - - $this->verbose('Elapsed time: ' . (microtime(TRUE) - $start_time)); } /** diff --git a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php index 9185687f16a..59d7e07e921 100644 --- a/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php +++ b/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php @@ -58,11 +58,6 @@ class HtmlToTextTest extends BrowserTestBase { $message .= ' (' . $tested_tags . ')'; $result = MailFormatHelper::htmlToText($html, $allowed_tags); $this->assertEqual($text, $result, Html::escape($message)); - $verbose = 'html =' . $this->stringToHtml($html) - . '
' . $this->stringToHtml($result) - . '
' . $this->stringToHtml($text) - . ''; - $this->verbose($verbose); } /** @@ -239,25 +234,11 @@ class HtmlToTextTest extends BrowserTestBase { EOT; $input = str_replace(["\r", "\n"], '', $input); $output = MailFormatHelper::htmlToText($input); - $pass = $this->assertNotRegExp('/\][^\n]*\[/s', $output, 'Block-level HTML tags should force newlines'); - if (!$pass) { - $this->verbose($this->stringToHtml($output)); - } + $this->assertNotRegExp('/\][^\n]*\[/s', $output, 'Block-level HTML tags should force newlines'); $output_upper = mb_strtoupper($output); $upper_input = mb_strtoupper($input); $upper_output = MailFormatHelper::htmlToText($upper_input); - $pass = $this->assertEqual( - $upper_output, - $output_upper, - 'Tag recognition should be case-insensitive' - ); - if (!$pass) { - $this->verbose( - $upper_output - . '
'
- . "\n\nQuery:\n" . $view->build_info['query']
- . "\n\nQuery arguments:\n" . var_export($view->build_info['query']->getArguments(), TRUE)
- . "\n\nActual result:\n" . var_export($result, TRUE)
- . "\n\nExpected result:\n" . var_export($expected_result, TRUE));
-
// Reset the numbering of the arrays.
$result = array_values($result);
$expected_result = array_values($expected_result);
diff --git a/core/modules/views/tests/src/Functional/ViewTestBase.php b/core/modules/views/tests/src/Functional/ViewTestBase.php
index ce6f3bd8461..c5fc8d75e22 100644
--- a/core/modules/views/tests/src/Functional/ViewTestBase.php
+++ b/core/modules/views/tests/src/Functional/ViewTestBase.php
@@ -4,7 +4,6 @@ namespace Drupal\Tests\views\Functional;
use Behat\Mink\Exception\ElementNotFoundException;
use Drupal\Core\Database\Database;
-use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Tests\BrowserTestBase;
use Drupal\views\Tests\ViewResultAssertionTrait;
use Drupal\views\Tests\ViewTestData;
@@ -114,7 +113,7 @@ abstract class ViewTestBase extends BrowserTestBase {
}
/**
- * Executes a view with debugging.
+ * Executes a view.
*
* @param \Drupal\views\ViewExecutable $view
* The view object.
@@ -127,11 +126,6 @@ abstract class ViewTestBase extends BrowserTestBase {
$view->setDisplay();
$view->preExecute($args);
$view->execute();
- $verbose_message = 'Executed view: ' . ((string) $view->build_info['query']) . '
';
- if ($view->build_info['query'] instanceof SelectInterface) {
- $verbose_message .= 'Arguments: ' . print_r($view->build_info['query']->getArguments(), TRUE) . '
';
- }
- $this->verbose($verbose_message);
}
/**
diff --git a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
index 429614b18a9..6d76bbd1501 100644
--- a/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
+++ b/core/modules/views/tests/src/Kernel/ViewsKernelTestBase.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\views\Kernel;
use Drupal\Core\Database\Database;
-use Drupal\Core\Database\Query\SelectInterface;
use Drupal\KernelTests\KernelTestBase;
use Drupal\views\Tests\ViewResultAssertionTrait;
use Drupal\views\Tests\ViewTestData;
@@ -118,7 +117,7 @@ abstract class ViewsKernelTestBase extends KernelTestBase {
}
/**
- * Executes a view with debugging.
+ * Executes a view.
*
* @param \Drupal\views\ViewExecutable $view
* The view object.
@@ -129,11 +128,6 @@ abstract class ViewsKernelTestBase extends KernelTestBase {
$view->setDisplay();
$view->preExecute($args);
$view->execute();
- $verbose_message = 'Executed view: ' . ((string) $view->build_info['query']) . '
';
- if ($view->build_info['query'] instanceof SelectInterface) {
- $verbose_message .= 'Arguments: ' . print_r($view->build_info['query']->getArguments(), TRUE) . '
';
- }
- $this->verbose($verbose_message);
}
/**
diff --git a/core/tests/Drupal/KernelTests/AssertContentTrait.php b/core/tests/Drupal/KernelTests/AssertContentTrait.php
index 61623f2bf81..5c684f0ca41 100644
--- a/core/tests/Drupal/KernelTests/AssertContentTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertContentTrait.php
@@ -885,11 +885,6 @@ trait AssertContentTrait {
$output = (string) $renderer->executeInRenderContext(new RenderContext(), function () use ($callback, $variables) {
return \Drupal::theme()->render($callback, $variables);
});
- $this->verbose(
- '
' . 'Result:' . '' . Html::escape(var_export($output, TRUE)) . '
'
- . '
' . 'Expected:' . '' . Html::escape(var_export($expected, TRUE)) . '
'
- . '
' . $output
- );
if (!$message) {
$message = '%callback rendered correctly.';
}
diff --git a/core/tests/Drupal/KernelTests/AssertLegacyTrait.php b/core/tests/Drupal/KernelTests/AssertLegacyTrait.php
index f2281004134..1f7698e9163 100644
--- a/core/tests/Drupal/KernelTests/AssertLegacyTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertLegacyTrait.php
@@ -113,8 +113,14 @@ trait AssertLegacyTrait {
/**
* @see \Drupal\simpletest\TestBase::verbose()
+ *
+ * @deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use
+ * dump() instead.
+ *
+ * @see https://www.drupal.org/node/3197514
*/
protected function verbose($message) {
+ @trigger_error('AssertLegacyTrait::verbose() is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use dump() instead. See https://www.drupal.org/node/3197514', E_USER_DEPRECATED);
if (in_array('--debug', $_SERVER['argv'], TRUE)) {
// Write directly to STDOUT to not produce unexpected test output.
// The STDOUT stream does not obey output buffering.
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index 87b0ad9c2cc..16c4182e47a 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -271,7 +271,6 @@ class ConfigCRUDTest extends KernelTestBase {
$name = 'config_test.types';
$config = $this->config($name);
$original_content = file_get_contents(drupal_get_path('module', 'config_test') . '/' . InstallStorage::CONFIG_INSTALL_DIRECTORY . "/$name.yml");
- $this->verbose('' . $original_content . "\n" . var_export($storage->read($name), TRUE));
// Verify variable data types are intact.
$data = [
@@ -297,7 +296,6 @@ class ConfigCRUDTest extends KernelTestBase {
$this->assertSame($data, $config->get());
// Assert the data against the file storage.
$this->assertSame($data, $storage->read($name));
- $this->verbose('' . $name . var_export($storage->read($name), TRUE));
// Set data using config::setData().
$config->setData($data)->save();
diff --git a/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php b/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
index 32ba294d325..286ea3554ed 100644
--- a/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
@@ -37,13 +37,6 @@ class RenderElementTypesTest extends KernelTestBase {
*/
protected function assertElements(array $elements, $expected_html, $message) {
$actual_html = (string) \Drupal::service('renderer')->renderRoot($elements);
-
- $out = '' . Html::escape($expected_html) . ' | ';
- $out .= '' . Html::escape($actual_html) . ' | ';
- $out .= '
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEqual($expected_ts, $ts, 'Simple table headers sorted correctly.'); // Test with simple table headers plus $_GET parameters that should _not_ @@ -47,7 +45,6 @@ class TableSortExtenderTest extends KernelTestBase { ]); \Drupal::getContainer()->get('request_stack')->push($request); $ts = TableSort::getContextFromRequest($headers, $request); - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEqual($expected_ts, $ts, 'Simple table headers plus non-overriding $_GET parameters sorted correctly.'); // Test with simple table headers plus $_GET parameters that _should_ @@ -63,7 +60,6 @@ class TableSortExtenderTest extends KernelTestBase { $expected_ts['sort'] = 'desc'; $expected_ts['query'] = ['alpha' => 'beta']; $ts = TableSort::getContextFromRequest($headers, $request); - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEqual($expected_ts, $ts, 'Simple table headers plus $_GET parameters sorted correctly.'); // Test complex table headers. @@ -95,7 +91,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'desc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEqual($expected_ts, $ts, 'Complex table headers sorted correctly.'); // Test complex table headers plus $_GET parameters that should _not_ @@ -114,7 +109,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'asc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEqual($expected_ts, $ts, 'Complex table headers plus non-overriding $_GET parameters sorted correctly.'); // Test complex table headers plus $_GET parameters that _should_ @@ -135,7 +129,6 @@ class TableSortExtenderTest extends KernelTestBase { 'query' => ['alpha' => 'beta'], ]; $ts = TableSort::getContextFromRequest($headers, $request); - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers plus $_GET parameters sorted correctly.'); // Test the initial_click_sort parameter. @@ -174,14 +167,12 @@ class TableSortExtenderTest extends KernelTestBase { ]); \Drupal::getContainer()->get('request_stack')->push($request); $ts = TableSort::getContextFromRequest($headers, $request); - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $expected_ts = [ 'name' => '1', 'sql' => 'one', 'sort' => 'desc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers using the initial_click_sort parameter are sorted correctly.'); // Test that if the initial_click_sort parameter is not defined, the default @@ -198,7 +189,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'asc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers without using the initial_click_sort parameter are sorted correctly.'); // Test that if the initial_click_sort parameter is defined, and the sort @@ -215,7 +205,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'asc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers using the initial_click_sort and sort parameters are sorted correctly.'); // Test that if the initial_click_sort parameter is defined and the value @@ -232,7 +221,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'asc', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers with the initial_click_sort set as ASC are sorted correctly.'); // Tests that if the initial_click_sort is defined with a non expected value @@ -249,7 +237,6 @@ class TableSortExtenderTest extends KernelTestBase { 'sort' => 'foo', 'query' => [], ]; - $this->verbose(strtr('$ts:
!ts', ['!ts' => Html::escape(var_export($ts, TRUE))])); $this->assertEquals($expected_ts, $ts, 'Complex table headers with the initial_click_sort set as foo are sorted correctly.'); } diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index 1c520289dee..26ce0a8a7e8 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -5,7 +5,6 @@ namespace Drupal\KernelTests; use Drupal\Component\FileCache\ApcuFileCacheBackend; use Drupal\Component\FileCache\FileCache; use Drupal\Component\FileCache\FileCacheFactory; -use Drupal\Component\Utility\Html; use Drupal\Core\Config\Development\ConfigSchemaChecker; use Drupal\Core\Database\Database; use Drupal\Core\DependencyInjection\ContainerBuilder; @@ -901,7 +900,6 @@ abstract class KernelTestBase extends TestCase implements ServiceProviderInterfa // Glean the content from the response object. $content = $response->getContent(); $this->setRawContent($content); - $this->verbose('
' . Html::escape($content));
return $content;
}
diff --git a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
index 025c5a490b5..a188703f93e 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
@@ -386,6 +386,16 @@ class KernelTestBaseTest extends KernelTestBase {
$this->assertNotIdentical('foo', 'bar');
}
+ /**
+ * Tests the deprecation of AssertLegacyTrait::verbose().
+ *
+ * @group legacy
+ */
+ public function testVerbose() {
+ $this->expectDeprecation('AssertLegacyTrait::verbose() is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use dump() instead. See https://www.drupal.org/node/3197514');
+ $this->verbose('The show must go on');
+ }
+
/**
* Tests the deprecation of ::installSchema with the tables key_value(_expire).
*