dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rc_old/new_len null for CategoryMembership RC change"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
TimingTest.php
diff --git
a/tests/phpunit/includes/libs/TimingTest.php
b/tests/phpunit/includes/libs/TimingTest.php
index
93e9d6b
..
4d71944
100644
(file)
--- a/
tests/phpunit/includes/libs/TimingTest.php
+++ b/
tests/phpunit/includes/libs/TimingTest.php
@@
-55,6
+55,7
@@
class TimingTest extends PHPUnit_Framework_TestCase {
$this->assertArrayHasKey( 'startTime', $entry );
$this->assertEquals( 0, $entry['duration'] );
$this->assertArrayHasKey( 'startTime', $entry );
$this->assertEquals( 0, $entry['duration'] );
+ usleep( 100 );
$timing->mark( 'a' );
$newEntry = $timing->getEntryByName( 'a' );
$this->assertGreaterThan( $entry['startTime'], $newEntry['startTime'] );
$timing->mark( 'a' );
$newEntry = $timing->getEntryByName( 'a' );
$this->assertGreaterThan( $entry['startTime'], $newEntry['startTime'] );
@@
-67,9
+68,10
@@
class TimingTest extends PHPUnit_Framework_TestCase {
$timing = new Timing;
$timing->mark( 'a' );
$timing = new Timing;
$timing->mark( 'a' );
- $a = $timing->getEntryByName( 'a' );
-
+ usleep( 100 );
$timing->mark( 'b' );
$timing->mark( 'b' );
+
+ $a = $timing->getEntryByName( 'a' );
$b = $timing->getEntryByName( 'b' );
$timing->measure( 'a_to_b', 'a', 'b' );
$b = $timing->getEntryByName( 'b' );
$timing->measure( 'a_to_b', 'a', 'b' );
@@
-100,12
+102,12
@@
class TimingTest extends PHPUnit_Framework_TestCase {
return $entry['name'];
}, $timing->getEntriesByType( 'mark' ) );
return $entry['name'];
}, $timing->getEntriesByType( 'mark' ) );
- $this->assertEquals(
array( 'requestStart', 'mark_a', 'mark_b', 'mark_c' )
, $marks );
+ $this->assertEquals(
[ 'requestStart', 'mark_a', 'mark_b', 'mark_c' ]
, $marks );
$measures = array_map( function ( $entry ) {
return $entry['name'];
}, $timing->getEntriesByType( 'measure' ) );
$measures = array_map( function ( $entry ) {
return $entry['name'];
}, $timing->getEntriesByType( 'measure' ) );
- $this->assertEquals(
array( 'measure_a', 'measure_b' )
, $measures );
+ $this->assertEquals(
[ 'measure_a', 'measure_b' ]
, $measures );
}
}
}
}