Get WordPress

Make WordPress Core

Changeset 57673

Timestamp:
02/20/2024 06:14:41 PM (5 months ago)
Author:
SergeyBiryukov
Message:

Tests: Use assertSame() in wp_read_image_metadata() tests.

This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using assertSame() should generally be preferred to assertEquals() where appropriate, to make the tests more reliable.

Follow-up to [49/tests], [198/tests], [34374], [48937], [52269].

Props costdev.
See #59655.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/tests/image/meta.php

    r57267 r57673  
    3333        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0008.jpg' );
    3434
    35         $this->assertEquals( 6.3, $out['aperture'], 'Aperture value not equivalent' );
     35        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    3636        $this->assertSame( '', $out['credit'], 'Credit value not the same' );
    3737        $this->assertSame( 'NIKON D70', $out['camera'], 'Camera value not the same' );
    3838        $this->assertSame( '', $out['caption'], 'Caption value not the same' );
    39         $this->assertEquals( strtotime( '2004-07-22 17:14:59' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
    40         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    41         $this->assertEquals( 27, $out['focal_length'], 'Focal length value not equivalent' );
    42         $this->assertEquals( 400, $out['iso'], 'Iso value not equivalent' );
    43         $this->assertEquals( 1 / 40, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     39        $this->assert strtotime( '2004-07-22 17:14:59' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
     40        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     41        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     42        $this->assert, $out['iso'], 'Iso value not equivalent' );
     43        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    4444        $this->assertSame( '', $out['title'], 'Title value not the same' );
    4545    }
    … …  
    5353        $this->assertSame( 'NIKON D70', $out['camera'], 'Camera value not the same' );
    5454        $this->assertSame( 'Copyright Alex Shiels', $out['caption'], 'Caption value not the same' );
    55         $this->assertEquals( strtotime( '2007-06-17 21:18:00' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
    56         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    57         $this->assertEquals( 0, $out['focal_length'], 'Focal length value not equivalent' );
    58         $this->assertEquals( 0, $out['iso'], 'Iso value not equivalent' ); // Interesting - a Nikon bug?
    59         $this->assertEquals( 1 / 500, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     55        $this->assert strtotime( '2007-06-17 21:18:00' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
     56        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     57        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     58        $this->assert, $out['iso'], 'Iso value not equivalent' ); // Interesting - a Nikon bug?
     59        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    6060        $this->assertSame( 'Copyright Alex Shiels', $out['title'], 'Title value not the same' );
    6161        // $this->assertSame( array( 'Flowers' ), $out['keywords'] );
    … …  
    6666        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0007.jpg' );
    6767
    68         $this->assertEquals( 6.3, $out['aperture'], 'Aperture value not equivalent' );
     68        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    6969        $this->assertSame( 'IPTC Creator', $out['credit'], 'Credit value not the same' );
    7070        $this->assertSame( 'NIKON D70', $out['camera'], 'Camera value not the same' );
    7171        $this->assertSame( 'IPTC Caption', $out['caption'], 'Caption value not the same' );
    72         $this->assertEquals( strtotime( '2004-07-22 17:14:35' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
     72        $this->assert strtotime( '2004-07-22 17:14:35' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
    7373        $this->assertSame( 'IPTC Copyright', $out['copyright'], 'Copyright value not the same' );
    74         $this->assertEquals( 18, $out['focal_length'], 'Focal length value not equivalent' );
    75         $this->assertEquals( 200, $out['iso'], 'Iso value not equivalent' );
    76         $this->assertEquals( 1 / 25, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     74        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     75        $this->assert, $out['iso'], 'Iso value not equivalent' );
     76        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    7777        $this->assertSame( 'IPTC Headline', $out['title'], 'Title value not the same' );
    7878    }
    … …  
    8282        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/a2-small.jpg' );
    8383
    84         $this->assertEquals( 4.5, $out['aperture'], 'Aperture value not equivalent' );
     84        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    8585        $this->assertSame( '', $out['credit'], 'Credit value not the same' );
    8686        $this->assertSame( 'FinePix S5600', $out['camera'], 'Camera value not the same' );
    8787        $this->assertSame( '', $out['caption'], 'Caption value not the same' );
    88         $this->assertEquals( strtotime( '2007-09-03 10:17:03' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
    89         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    90         $this->assertEquals( 6.3, $out['focal_length'], 'Focal length value not equivalent' );
    91         $this->assertEquals( 64, $out['iso'], 'Iso value not equivalent' );
    92         $this->assertEquals( 1 / 320, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     88        $this->assert strtotime( '2007-09-03 10:17:03' ), $out['created_timestamp'], 'Timestamp value not equivalent' );
     89        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     90        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     91        $this->assert, $out['iso'], 'Iso value not equivalent' );
     92        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    9393        $this->assertSame( '', $out['title'], 'Title value not the same' );
    9494    }
    … …  
    102102        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/waffles.jpg' );
    103103
    104         $this->assertEquals( 0, $out['aperture'], 'Aperture value not equivalent' );
     104        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    105105        $this->assertSame( '', $out['credit'], 'Credit value not the same' );
    106106        $this->assertSame( '', $out['camera'], 'Camera value not the same' );
    107107        $this->assertSame( '', $out['caption'], 'Caption value not the same' );
    108         $this->assertEquals( 0, $out['created_timestamp'], 'Timestamp value not equivalent' );
    109         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    110         $this->assertEquals( 0, $out['focal_length'], 'Focal length value not equivalent' );
    111         $this->assertEquals( 0, $out['iso'], 'Iso value not equivalent' );
    112         $this->assertEquals( 0, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     108        $this->assert, $out['created_timestamp'], 'Timestamp value not equivalent' );
     109        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     110        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     111        $this->assert, $out['iso'], 'Iso value not equivalent' );
     112        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    113113        $this->assertSame( '', $out['title'], 'Title value not the same' );
    114114    }
    … …  
    118118        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/canola.jpg' );
    119119
    120         $this->assertEquals( 0, $out['aperture'], 'Aperture value not equivalent' );
     120        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    121121        $this->assertSame( '', $out['credit'], 'Credit value not the same' );
    122122        $this->assertSame( '', $out['camera'], 'Camera value not the same' );
    123123        $this->assertSame( '', $out['caption'], 'Caption value not the same' );
    124         $this->assertEquals( 0, $out['created_timestamp'], 'Timestamp value not equivalent' );
    125         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    126         $this->assertEquals( 0, $out['focal_length'], 'Focal length value not equivalent' );
    127         $this->assertEquals( 0, $out['iso'], 'Iso value not equivalent' );
    128         $this->assertEquals( 0, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     124        $this->assert, $out['created_timestamp'], 'Timestamp value not equivalent' );
     125        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     126        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     127        $this->assert, $out['iso'], 'Iso value not equivalent' );
     128        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    129129        $this->assertSame( '', $out['title'], 'Title value not the same' );
    130130    }
    … …  
    159159        $this->assertSame( 'DMC-LX2', $out['camera'], 'Camera value not the same' );
    160160        $this->assertSame( 'Photoshop Description', $out['caption'], 'Caption value not the same' );
    161         $this->assertEquals( 1306315327, $out['created_timestamp'], 'Timestamp value not equivalent' );
     161        $this->assert, $out['created_timestamp'], 'Timestamp value not equivalent' );
    162162        $this->assertSame( 'Photoshop Copyrright Notice', $out['copyright'], 'Copyright value not the same' );
    163163        $this->assertSame( '6.3', $out['focal_length'], 'Focal length value not the same' );
    … …  
    165165        $this->assertSame( '0.0025', $out['shutter_speed'], 'Shutter speed value not the same' );
    166166        $this->assertSame( 'Photoshop Document Ttitle', $out['title'], 'Title value not the same' );
    167         $this->assertEquals( 1, $out['orientation'], 'Orientation value not equivalent' );
     167        $this->assert, $out['orientation'], 'Orientation value not equivalent' );
    168168        $this->assertSame( array( 'beach', 'baywatch', 'LA', 'sunset' ), $out['keywords'], 'Keywords not the same' );
    169169    }
    … …  
    247247        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/sugarloaf-mountain.jpg' );
    248248
    249         $this->assertEquals( 0, $out['aperture'], 'Aperture value not equivalent' );
     249        $this->assert, $out['aperture'], 'Aperture value not equivalent' );
    250250        $this->assertSame( '', $out['credit'], 'Credit value not the same' );
    251251        $this->assertSame( 'X-T1', $out['camera'], 'Camera value not the same' );
    252252        $this->assertSame( '', $out['caption'], 'Caption value not the same' );
    253         $this->assertEquals( 0, $out['created_timestamp'], 'Timestamp value not equivalent' );
    254         $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
    255         $this->assertEquals( 50, $out['focal_length'], 'Focal length value not equivalent' );
    256         $this->assertEquals( 200, $out['iso'], 'Iso value not equivalent' );
    257         $this->assertEquals( 2, $out['shutter_speed'], 'Shutter speed value not equivalent' );
     253        $this->assert, $out['created_timestamp'], 'Timestamp value not equivalent' );
     254        $this->assertSame( '', $out['copyright'], 'Copyright value not the same' );
     255        $this->assert, $out['focal_length'], 'Focal length value not equivalent' );
     256        $this->assert, $out['iso'], 'Iso value not equivalent' );
     257        $this->assert, $out['shutter_speed'], 'Shutter speed value not equivalent' );
    258258        $this->assertSame( 'Sugarloaf Panorama', $out['title'], 'Title value not the same' );
    259259    }
Note: See TracChangeset for help on using the changeset viewer.