Changeset 40532

Timestamp:

04/22/2017 10:11:56 PM (9 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Convert more test skipping into hard failures. These dependencies should all be present when testing.

See #40533

Location:

trunk/tests/phpunit/tests

Files:

• image/editor_gd.php (modified) (3 diffs)
• image/functions.php (modified) (2 diffs)
• image/intermediate_size.php (modified) (3 diffs)
• image/resize.php (modified) (2 diffs)
• import/parser.php (modified) (1 diff)
• import/postmeta.php (modified) (1 diff)

trunk/tests/phpunit/tests/image/editor_gd.php

@@ -469 +469 @@
         public function test_image_preserves_alpha_on_resize() {
                 if ( ! ( imagetypes() & IMG_PNG ) ) {
-                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                        $this->fail( 'This test requires PHP to be compiled with PNG support.' );
                 }
 
@@ -496 +496 @@
         public function test_image_preserves_alpha() {
                 if ( ! ( imagetypes() & IMG_PNG ) ) {
-                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                        $this->fail( 'This test requires PHP to be compiled with PNG support.' );
                 }
 
@@ -522 +522 @@
         public function test_image_preserves_alpha_on_rotate() {
                 if ( ! ( imagetypes() & IMG_PNG ) ) {
-                        $this->markTestSkipped( 'This test requires PHP to be compiled with PNG support.' );
+                        $this->fail( 'This test requires PHP to be compiled with PNG support.' );
                 }
 

trunk/tests/phpunit/tests/image/functions.php

@@ -290 +290 @@
         public function test_wp_crop_image_file() {
                 if ( !function_exists( 'imagejpeg' ) )
-                        $this->markTestSkipped( 'jpeg support unavailable' );
+                        $this->fail( 'jpeg support unavailable' );
 
                 $file = wp_crop_image( DIR_TESTDATA . '/images/canola.jpg',
@@ -306 +306 @@
         public function test_wp_crop_image_url() {
                 if ( !function_exists( 'imagejpeg' ) )
-                        $this->markTestSkipped( 'jpeg support unavailable' );
+                        $this->fail( 'jpeg support unavailable' );
 
                 if ( ! extension_loaded( 'openssl' ) ) {

trunk/tests/phpunit/tests/image/intermediate_size.php

@@ -31 +31 @@
         function test_make_intermediate_size_width() {
                 if ( !function_exists( 'imagejpeg' ) )
-                        $this->markTestSkipped( 'jpeg support unavailable' );
+                        $this->fail( 'jpeg support unavailable' );
 
                 $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 0, false );
@@ -40 +40 @@
         function test_make_intermediate_size_height() {
                 if ( !function_exists( 'imagejpeg' ) )
-                        $this->markTestSkipped( 'jpeg support unavailable' );
+                        $this->fail( 'jpeg support unavailable' );
 
                 $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 75, false );
@@ -49 +49 @@
         function test_make_intermediate_size_successful() {
                 if ( !function_exists( 'imagejpeg' ) )
-                        $this->markTestSkipped( 'jpeg support unavailable' );
+                        $this->fail( 'jpeg support unavailable' );
 
                 $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 100, 75, true );

trunk/tests/phpunit/tests/image/resize.php

@@ -43 +43 @@
 
                 if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion
-                        $this->markTestSkipped( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );
-                        return;
+                        $this->fail( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );
                 }
 
@@ -60 +59 @@
 
                 if ( ! is_string( $image ) ) {  // WP_Error, stop GLib-GObject-CRITICAL assertion
-                        $this->markTestSkipped( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );
-                        return;
+                        $this->fail( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );
                 }
 

trunk/tests/phpunit/tests/import/parser.php

@@ -17 +17 @@
 
                 if ( ! file_exists( DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php' ) ) {
-                        $this->markTestSkipped( 'WordPress Importer plugin is not installed.' );
+                        $this->fail( 'WordPress Importer plugin is not installed.' );
                 }
 

trunk/tests/phpunit/tests/import/postmeta.php

@@ -17 +17 @@
 
                 if ( ! file_exists( DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php' ) ) {
-                        $this->markTestSkipped( 'WordPress Importer plugin is not installed.' );
+                        $this->fail( 'WordPress Importer plugin is not installed.' );
                 }