| Index: trunk/phase3/tests/phpunit/includes/debug/MWDebugTest.php |
| — | — | @@ -17,9 +17,6 @@ |
| 18 | 18 | MWDebug::clearLog(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | | - /** |
| 22 | | - * @group Broken |
| 23 | | - */ |
| 24 | 21 | function testAddLog() { |
| 25 | 22 | MWDebug::log( 'logging a string' ); |
| 26 | 23 | $this->assertEquals( array( array( |
| — | — | @@ -31,9 +28,6 @@ |
| 32 | 29 | ); |
| 33 | 30 | } |
| 34 | 31 | |
| 35 | | - /** |
| 36 | | - * @group Broken |
| 37 | | - */ |
| 38 | 32 | function testAddWarning() { |
| 39 | 33 | MWDebug::warning( 'Warning message' ); |
| 40 | 34 | $this->assertEquals( array( array( |
| — | — | @@ -45,24 +39,17 @@ |
| 46 | 40 | ); |
| 47 | 41 | } |
| 48 | 42 | |
| 49 | | - /** |
| 50 | | - * Broken on gallium which use an old PHPUnit version |
| 51 | | - * @group Broken |
| 52 | | - */ |
| 53 | 43 | function testAvoidDuplicateDeprecations() { |
| 54 | 44 | MWDebug::deprecated( 'wfOldFunction', '1.0', 'component' ); |
| 55 | 45 | MWDebug::deprecated( 'wfOldFunction', '1.0', 'component' ); |
| 56 | 46 | |
| 57 | | - $this->assertCount( 1, |
| 58 | | - MWDebug::getLog(), |
| | 47 | + // assertCount() not available on WMF integration server |
| | 48 | + $this->assertEquals( 1, |
| | 49 | + count( MWDebug::getLog() ), |
| 59 | 50 | "Only one deprecated warning per function should be kept" |
| 60 | 51 | ); |
| 61 | 52 | } |
| 62 | 53 | |
| 63 | | - /** |
| 64 | | - * Broken on gallium which use an old PHPUnit version |
| 65 | | - * @group Broken |
| 66 | | - */ |
| 67 | 54 | function testAvoidNonConsecutivesDuplicateDeprecations() { |
| 68 | 55 | MWDebug::deprecated( 'wfOldFunction', '1.0', 'component' ); |
| 69 | 56 | MWDebug::warning( 'some warning' ); |
| — | — | @@ -70,8 +57,9 @@ |
| 71 | 58 | // Another deprecation |
| 72 | 59 | MWDebug::deprecated( 'wfOldFunction', '1.0', 'component' ); |
| 73 | 60 | |
| 74 | | - $this->assertCount( 3, |
| 75 | | - MWDebug::getLog(), |
| | 61 | + // assertCount() not available on WMF integration server |
| | 62 | + $this->assertEquals( 3, |
| | 63 | + count( MWDebug::getLog() ), |
| 76 | 64 | "Only one deprecated warning per function should be kept" |
| 77 | 65 | ); |
| 78 | 66 | } |