Changeset 40533

Timestamp:

04/22/2017 10:54:15 PM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Remove unnecessary checks and skips that should instead cause failures if they ever fail.

See #40533

Location:

trunk/tests/phpunit/tests

Files:

• functions.php (modified) (2 diffs)
• image/size.php (modified) (5 diffs)

trunk/tests/phpunit/tests/functions.php

@@ -62 +62 @@
 
     function test_path_is_absolute() {
-        if ( !is_callable('path_is_absolute') )
-            $this->markTestSkipped();
-
         $absolute_paths = array(
             '/',
@@ -82 +79 @@
 
     function test_path_is_not_absolute() {
-        if ( !is_callable('path_is_absolute') )
-            $this->markTestSkipped();
-
         $relative_paths = array(
             '',

trunk/tests/phpunit/tests/image/size.php

@@ -9 +9 @@
 
     function test_constrain_dims_zero() {
-        if (!is_callable('wp_constrain_dimensions'))
-            $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
-
         // no constraint - should have no effect
         $out = wp_constrain_dimensions(640, 480, 0, 0);
@@ -27 +24 @@
 
     function test_constrain_dims_smaller() {
-        if (!is_callable('wp_constrain_dimensions'))
-            $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
-
         // image size is smaller than the constraint - no effect
         $out = wp_constrain_dimensions(500, 600, 1024, 768);
@@ -42 +36 @@
 
     function test_constrain_dims_equal() {
-        if (!is_callable('wp_constrain_dimensions'))
-            $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
-
         // image size is equal to the constraint - no effect
         $out = wp_constrain_dimensions(1024, 768, 1024, 768);
@@ -57 +48 @@
 
     function test_constrain_dims_larger() {
-        if (!is_callable('wp_constrain_dimensions'))
-            $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
-
         // image size is larger than the constraint - result should be constrained
         $out = wp_constrain_dimensions(1024, 768, 500, 600);
@@ -82 +70 @@
 
     function test_constrain_dims_boundary() {
-        if (!is_callable('wp_constrain_dimensions'))
-            $this->markTestSkipped('wp_constrain_dimensions() is not callable.');
-
         // one dimension is larger than the constraint, one smaller - result should be constrained
         $out = wp_constrain_dimensions(1024, 768, 500, 800);