From be18b58f14611d5b0337a29ebaf633efdb9f80ad Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Mon, 15 Jul 2024 16:52:01 +0200 Subject: [PATCH 1/2] Use get_token_name over get_tag get_token_name will be the tag name when on tags, or a meaningful token name otherwise. This is helpful in test failure message in case we may not be on a tag. --- tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php index 403f40a1da032..0ac623ec67f5e 100644 --- a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php +++ b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php @@ -587,11 +587,11 @@ public function test_breadcrumbs_on_virtual_nodes( string $html, int $token_posi $processor->next_token(); } - $this->assertSame( $expected_tag_name, $processor->get_tag(), "Found incorrect tag name {$processor->get_tag()}." ); + $this->assertSame( $expected_tag_name, $processor->get_tag(), "Found incorrect tag name {$processor->get_token_name()}." ); if ( 'open' === $expect_open_close ) { - $this->assertFalse( $processor->is_tag_closer(), "Found closer when opener expected at {$processor->get_tag()}." ); + $this->assertFalse( $processor->is_tag_closer(), "Found closer when opener expected at {$processor->get_token_name()}." ); } else { - $this->assertTrue( $processor->is_tag_closer(), "Found opener when closer expected at {$processor->get_tag()}." ); + $this->assertTrue( $processor->is_tag_closer(), "Found opener when closer expected at {$processor->get_token_name()}." ); } $this->assertEquals( $expected_breadcrumbs, $processor->get_breadcrumbs(), "Found incorrect breadcrumbs in {$html}." ); From 5e158fc32eb46a61257c305ff8b4b5f60731769e Mon Sep 17 00:00:00 2001 From: Jon Surrell Date: Mon, 15 Jul 2024 16:52:38 +0200 Subject: [PATCH 2/2] Prefer assertSame assertSame (strict equals) should be preferred when possible. --- tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php index 0ac623ec67f5e..c3d02ba7db4fd 100644 --- a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php +++ b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php @@ -594,7 +594,7 @@ public function test_breadcrumbs_on_virtual_nodes( string $html, int $token_posi $this->assertTrue( $processor->is_tag_closer(), "Found opener when closer expected at {$processor->get_token_name()}." ); } - $this->assertEquals( $expected_breadcrumbs, $processor->get_breadcrumbs(), "Found incorrect breadcrumbs in {$html}." ); + $this->assertSame( $expected_breadcrumbs, $processor->get_breadcrumbs(), "Found incorrect breadcrumbs in {$html}." ); } /**