Changeset 53495

Timestamp:

06/13/2022 04:42:17 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Move helper functions in Tests_Image_Functions to more appropriate places.

• Move a non-test specific helper function used by multiple tests up to the top of the class to make it more easily discoverable.
• Move a test-specific helper function used by only one test to be directly below the test using the helper function and make the link with the test explicit by adding a @see tag.

Follow-up to [1201/tests], [51415].

Props jrf.
See #55652.

File:

• trunk/tests/phpunit/tests/image/functions.php (modified) (4 diffs)

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

@@ -26 +26 @@
                         unlink( $file );
                 }
+        }
+
+        /**
+         * Get the available image editor engine class(es).
+         *
+         * @return string[] Available image editor classes; empty array when none are available.
+         */
+        private function get_image_editor_engine_classes() {
+                $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
+
+                foreach ( $classes as $key => $class ) {
+                        if ( ! call_user_func( array( $class, 'test' ) ) ) {
+                                // If the image editor isn't available, skip it.
+                                unset( $classes[ $key ] );
+                        }
+                }
+
+                if ( empty( $classes ) ) {
+                        $this->markTestSkipped( 'Image editor engines WP_Image_Editor_GD and WP_Image_Editor_Imagick are not supported on this system.' );
+                }
+
+                return $classes;
         }
 
@@ -322 +344 @@
 
         /**
-         * Get the available image editor engine class(es).
-         *
-         * @return string[] Available image editor classes; empty array when none are avaialble.
-         */
-        private function get_image_editor_engine_classes() {
-                $classes = array( 'WP_Image_Editor_GD', 'WP_Image_Editor_Imagick' );
-
-                foreach ( $classes as $key => $class ) {
-                        if ( ! call_user_func( array( $class, 'test' ) ) ) {
-                                // If the image editor isn't available, skip it.
-                                unset( $classes[ $key ] );
-                        }
-                }
-
-                if ( empty( $classes ) ) {
-                        $this->markTestSkipped( 'Image editor engines WP_Image_Editor_GD and WP_Image_Editor_Imagick are not supported on this system.' );
-                }
-
-                return $classes;
-        }
-
-        /**
          * @ticket 55403
          */
@@ -447 +447 @@
         }
 
-        public function mock_image_editor( $editors ) {
-                return array( 'WP_Image_Editor_Mock' );
-        }
-
         /**
          * @ticket 23325
@@ -471 +467 @@
                 remove_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
                 WP_Image_Editor_Mock::$save_return = array();
+        }
+
+        /**
+         * @see test_wp_crop_image_error_on_saving()
+         */
+        public function mock_image_editor( $editors ) {
+                return array( 'WP_Image_Editor_Mock' );
         }