Changeset 51462 for trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php

Timestamp:

07/19/2021 02:00:11 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertContains() with assertStringContainsString() when used with strings.

Using the assertContains() and assertNotContains() methods with string haystacks was deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

• assertStringContainsString()
• assertStringContainsStringIgnoringCase
• assertStringNotContainsString()
• assertStringNotContainsStringIgnoringCase

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods were added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51331], [51451], [51461].

Props jrf, dd32, SergeyBiryukov.
See #53363, #46149.

File:

• trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php (modified) (11 diffs)

trunk/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php

@@ -115 +115 @@
         $this->assertSame( 'request-confirmed', get_post_status( self::$request_id ) );
         $this->assertSame( self::$requester_email, $mailer->get_recipient( 'to' )->address );
-        $this->assertContains( 'Personal Data Export', $mailer->get_sent()->subject );
-        $this->assertContains( $export_file_url, $mailer->get_sent()->body );
-        $this->assertContains( 'please download it', $mailer->get_sent()->body );
+        $this->assertStringContainsString( 'Personal Data Export', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( $export_file_url, $mailer->get_sent()->body );
+        $this->assertStringContainsString( 'please download it', $mailer->get_sent()->body );
         $this->assertTrue( $email_sent );
     }
@@ -161 +161 @@
 
         $mailer = tests_retrieve_phpmailer_instance();
-        $this->assertContains( 'we will automatically delete the file on December 18, 2017,', $mailer->get_sent()->body );
+        $this->assertStringContainsString( 'we will automatically delete the file on December 18, 2017,', $mailer->get_sent()->body );
     }
 
@@ -239 +239 @@
 
         $mailer = tests_retrieve_phpmailer_instance();
-        $this->assertContains( 'Custom content for request ID: ' . self::$request_id, $mailer->get_sent()->body );
+        $this->assertStringContainsString( 'Custom content for request ID: ' . self::$request_id, $mailer->get_sent()->body );
     }
 
@@ -268 +268 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'From: Tester <tester@example.com>', $mailer->get_sent()->header );
+        $this->assertStringContainsString( 'From: Tester <tester@example.com>', $mailer->get_sent()->header );
     }
 
@@ -298 +298 @@
         $site_url = home_url();
         $mailer   = tests_retrieve_phpmailer_instance();
-        $this->assertContains( 'Custom content using the $site_url of $email_data: ' . $site_url, $mailer->get_sent()->body );
+        $this->assertStringContainsString( 'Custom content using the $site_url of $email_data: ' . $site_url, $mailer->get_sent()->body );
     }
 
@@ -342 +342 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Exportación de datos personales', $mailer->get_sent()->subject );
     }
 
@@ -364 +364 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
     }
 
@@ -386 +386 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Exportación de datos personales', $mailer->get_sent()->subject );
     }
 
@@ -410 +410 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Export personenbezogener Daten', $mailer->get_sent()->subject );
     }
 
@@ -432 +432 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Personal Data Export', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Personal Data Export', $mailer->get_sent()->subject );
     }
 
@@ -457 +457 @@
         $mailer = tests_retrieve_phpmailer_instance();
 
-        $this->assertContains( 'Exportación de datos personales', $mailer->get_sent()->subject );
+        $this->assertStringContainsString( 'Exportación de datos personales', $mailer->get_sent()->subject );
     }
 }