Changeset 53527

Timestamp:

06/19/2022 03:43:34 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Rename some test methods in Tests_Image_Functions for consistency.

This matches the names of the functions being tested:

• file_is_valid_image()
• file_is_displayable_image()

Follow-up to [184/tests], [53523], [53524], [53525], [53526].

See #55652.

File:

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

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

@@ -65 +65 @@
 
         /**
-         * @dataProvider data_is_image_positive
+         * @dataProvider data_file_is_valid_image_positive
          *
          * @covers ::file_is_valid_image
@@ -72 +72 @@
          * @param string $file File name.
          */
-        public function test_is_image_positive( $file ) {
+        public function test_file_is_valid_image_positive( $file ) {
                 $this->assertTrue(
                         file_is_valid_image( DIR_TESTDATA . '/images/' . $file ),
@@ -84 +84 @@
          * @return array
          */
-        public function data_is_image_positive() {
+        public function data_file_is_valid_image_positive() {
                 // These are all image files recognized by PHP.
                 $files = array(
@@ -109 +109 @@
 
         /**
-         * @dataProvider data_is_image_negative
+         * @dataProvider data_file_is_valid_image_negative
          *
          * @covers ::file_is_valid_image
@@ -116 +116 @@
          * @param string $file File name.
          */
-        public function test_is_image_negative( $file ) {
+        public function test_file_is_valid_image_negative( $file ) {
                 $this->assertFalse(
                         file_is_valid_image( DIR_TESTDATA . '/images/' . $file ),
@@ -128 +128 @@
          * @return array
          */
-        public function data_is_image_negative() {
+        public function data_file_is_valid_image_negative() {
                 // These are actually image files but aren't recognized or usable by PHP.
                 $files = array(
@@ -140 +140 @@
 
         /**
-         * @dataProvider data_is_displayable_image_positive
+         * @dataProvider data_file_is_displayable_image_positive
          *
          * @covers ::file_is_displayable_image
@@ -146 +146 @@
          * @param string $file File name.
          */
-        public function test_is_displayable_image_positive( $file ) {
+        public function test_file_is_displayable_image_positive( $file ) {
                 $this->assertTrue(
                         file_is_displayable_image( DIR_TESTDATA . '/images/' . $file ),
@@ -158 +158 @@
          * @return array
          */
-        public function data_is_displayable_image_positive() {
+        public function data_file_is_displayable_image_positive() {
                 // These are all usable in typical web browsers.
                 $files = array(
@@ -182 +182 @@
 
         /**
-         * @dataProvider data_is_displayable_image_negative
+         * @dataProvider data_file_is_displayable_image_negative
          *
          * @covers ::file_is_displayable_image
@@ -188 +188 @@
          * @param string $file File name.
          */
-        public function test_is_displayable_image_negative( $file ) {
+        public function test_file_is_displayable_image_negative( $file ) {
                 $this->assertFalse(
                         file_is_displayable_image( DIR_TESTDATA . '/images/' . $file ),
@@ -200 +200 @@
          * @return array
          */
-        public function data_is_displayable_image_negative() {
+        public function data_file_is_displayable_image_negative() {
                 // These are image files but aren't suitable for web pages because of compatibility or size issues.
                 $files = array(