Merge "Finish stash uploads with upload dialog"

[lhc/web/wiklou.git] / tests / phpunit / includes / utils / UIDGeneratorTest.php

diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php b/tests/phpunit/includes/utils/UIDGeneratorTest.php
index 7123b94..d746ea1 100644 (file)
--- a/tests/phpunit/includes/utils/UIDGeneratorTest.php
+++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php
@@ -9,21 +9,24 @@ class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
        }
 
        /**
+        * Flaky test (T131549).
+        *
+        * @group Broken
         * @dataProvider provider_testTimestampedUID
         * @covers UIDGenerator::newTimestampedUID128
         * @covers UIDGenerator::newTimestampedUID88
         */
        public function testTimestampedUID( $method, $digitlen, $bits, $tbits, $hostbits ) {
-               $id = call_user_func( array( 'UIDGenerator', $method ) );
+               $id = call_user_func( [ 'UIDGenerator', $method ] );
                $this->assertEquals( true, ctype_digit( $id ), "UID made of digit characters" );
                $this->assertLessThanOrEqual( $digitlen, strlen( $id ),
                        "UID has the right number of digits" );
                $this->assertLessThanOrEqual( $bits, strlen( Wikimedia\base_convert( $id, 10, 2 ) ),
                        "UID has the right number of bits" );
 
-               $ids = array();
+               $ids = [];
                for ( $i = 0; $i < 300; $i++ ) {
-                       $ids[] = call_user_func( array( 'UIDGenerator', $method ) );
+                       $ids[] = call_user_func( [ 'UIDGenerator', $method ] );
                }
 
                $lastId = array_shift( $ids );
@@ -55,18 +58,18 @@ class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
         * NOTE: When adding a new method name here please update the covers tags for the tests!
         */
        public static function provider_testTimestampedUID() {
-               return array(
-                       array( 'newTimestampedUID128', 39, 128, 46, 48 ),
-                       array( 'newTimestampedUID128', 39, 128, 46, 48 ),
-                       array( 'newTimestampedUID88', 27, 88, 46, 32 ),
-               );
+               return [
+                       [ 'newTimestampedUID128', 39, 128, 46, 48 ],
+                       [ 'newTimestampedUID128', 39, 128, 46, 48 ],
+                       [ 'newTimestampedUID88', 27, 88, 46, 32 ],
+               ];
        }
 
        /**
         * @covers UIDGenerator::newUUIDv1
         */
        public function testUUIDv1() {
-               $ids = array();
+               $ids = [];
                for ( $i = 0; $i < 100; $i++ ) {
                        $id = UIDGenerator::newUUIDv1();
                        $this->assertEquals( true,
@@ -79,7 +82,7 @@ class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
                                preg_match( '!^[0-9a-f]{12}1[0-9a-f]{3}[89ab][0-9a-f]{15}$!', $id ),
                                "UID $id has the right format" );
 
-                       $id = UIDGenerator::newRawUUIDv1( UIDGenerator::QUICK_RAND );
+                       $id = UIDGenerator::newRawUUIDv1();
                        $this->assertEquals( true,
                                preg_match( '!^[0-9a-f]{12}1[0-9a-f]{3}[89ab][0-9a-f]{15}$!', $id ),
                                "UID $id has the right format" );
@@ -92,7 +95,7 @@ class UIDGeneratorTest extends PHPUnit_Framework_TestCase {
         * @covers UIDGenerator::newUUIDv4
         */
        public function testUUIDv4() {
-               $ids = array();
+               $ids = [];
                for ( $i = 0; $i < 100; $i++ ) {
                        $id = UIDGenerator::newUUIDv4();
                        $ids[] = $id;