Changeset 25264

Timestamp:

09/05/2013 09:56:10 PM (13 years ago)

Author:

nacin

Message:

Remove old WP version checks from PHPUnit test cases now that tests are branched with each version.

Location:

trunk/tests/phpunit/tests

Files:

• formatting/MakeClickable.php (modified) (1 diff)
• mail.php (modified) (3 diffs)
• theme.php (modified) (1 diff)

trunk/tests/phpunit/tests/formatting/MakeClickable.php

@@ -317 +317 @@
 
         /**
-         * ticket 16892
+         * @ticket 16892
          */
         function test_no_segfault() {
-                if ( version_compare( $GLOBALS['wp_version'], '3.1.1', '<' ) )
-                        $this->markTestSkipped();
-
                 $in = str_repeat( 'http://example.com/2011/03/18/post-title/', 256 );
                 $out = make_clickable( $in );
-                if ( version_compare( $GLOBALS['wp_version'], '3.4-alpha', '>=' ) )
-                        $this->assertEquals( $in, $out );
+                $this->assertEquals( $in, $out );
         }
 

trunk/tests/phpunit/tests/mail.php

@@ -128 +128 @@
                 // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer
                 // Earlier versions of PHPMailer were not touchy about the formatting of these arguments.
-                if ( version_compare( $GLOBALS['wp_version'], '3.1.9', '>' ) ) {
-                        $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
-                        $this->assertEquals('Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][1]);
-                        $this->assertEquals('cc@cc.com', $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][0]);
-                        $this->assertEquals('The Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][1]);
-                        $this->assertEquals('bcc@bcc.com', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][0]);
-                        $this->assertEquals('The Blind Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][1]);
-                } else {
-                        $this->assertEquals($to, $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
-                        $this->assertEquals($cc, $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][0]);
-                        $this->assertEquals($bcc, $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][0]);
-                }
+                $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
+                $this->assertEquals('Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][1]);
+                $this->assertEquals('cc@cc.com', $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][0]);
+                $this->assertEquals('The Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['cc'][0][1]);
+                $this->assertEquals('bcc@bcc.com', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][0]);
+                $this->assertEquals('The Blind Carbon Guy', $GLOBALS['phpmailer']->mock_sent[0]['bcc'][0][1]);
 
                 $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
@@ -160 +154 @@
                 // WordPress 3.2 and later correctly split the address into the two parts and send them seperately to PHPMailer
                 // Earlier versions of PHPMailer were not touchy about the formatting of these arguments.
-                if ( version_compare( $GLOBALS['wp_version'], '3.1.9', '>' ) ) {
-                        $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
-                        $this->assertEquals('Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][1]);
-                        $this->assertEquals('another_address@different-tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][0]);
-                        $this->assertEquals('Another Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][1]);
-                } else {
-                        $this->assertEquals('Name <address@tld.com>', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
-                        $this->assertEquals('Another Name <another_address@different-tld.com>', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][0]);
-                }
+                $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
+                $this->assertEquals('Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][1]);
+                $this->assertEquals('another_address@different-tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][0]);
+                $this->assertEquals('Another Name', $GLOBALS['phpmailer']->mock_sent[0]['to'][1][1]);
 
                 $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
@@ -202 +191 @@
                 wp_mail( $to, $subject, $message );
 
-                // Old PHPMailer blindly accepts the address, the new one santizes it
-                if ( version_compare( $GLOBALS['wp_version'], '3.1.9', '>' ) )
-                        $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
-                else
-                        $this->assertEquals('<address@tld.com>', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
+                $this->assertEquals('address@tld.com', $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0]);
+
                 $this->assertEquals($message . "\n", $GLOBALS['phpmailer']->mock_sent[0]['body']);
                 unset( $_SERVER['SERVER_NAME'] );

trunk/tests/phpunit/tests/theme.php

@@ -175 +175 @@
                 $themes = get_themes();
 
-                $switch_theme_one_argument = version_compare( $GLOBALS['wp_version'], '3.5-alpha-21103', '>=' );
-
-                // switch to each theme in sequence
-                // do it twice to make sure we switch to the first theme, even if it's our starting theme
+                // Switch to each theme in sequence.
+                // Do it twice to make sure we switch to the first theme, even if it's our starting theme.
+                // Do it a third time to ensure switch_theme() works with one argument.
+
                 for ( $i = 0; $i < 3; $i++ ) {
                         foreach ($themes as $name=>$theme) {
                                 // switch to this theme
-                                if ( $i === 2 || $switch_theme_one_argument )
+                                if ( $i === 2 )
                                         switch_theme( $theme['Template'], $theme['Stylesheet'] );
                                 else