| Index: trunk/phase3/tests/phpunit/includes/api/ApiTest.php |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | |
| 72 | 72 | libxml_use_internal_errors( true ); |
| 73 | 73 | $sxe = simplexml_load_string( $resp ); |
| 74 | | - $this->assertNotType( "bool", $sxe ); |
| | 74 | + $this->assertNotInternalType( "bool", $sxe ); |
| 75 | 75 | $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); |
| 76 | 76 | } |
| 77 | 77 | |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | |
| 103 | 103 | $result = $ret[0]; |
| 104 | 104 | |
| 105 | | - $this->assertNotType( "bool", $result ); |
| | 105 | + $this->assertNotInternalType( "bool", $result ); |
| 106 | 106 | $a = $result["login"]["result"]; |
| 107 | 107 | $this->assertEquals( "NeedToken", $a ); |
| 108 | 108 | |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | |
| 119 | 119 | $result = $ret[0]; |
| 120 | 120 | |
| 121 | | - $this->assertNotType( "bool", $result ); |
| | 121 | + $this->assertNotInternalType( "bool", $result ); |
| 122 | 122 | $a = $result["login"]["result"]; |
| 123 | 123 | |
| 124 | 124 | $this->assertEquals( "WrongPass", $a ); |
| — | — | @@ -140,8 +140,8 @@ |
| 141 | 141 | ); |
| 142 | 142 | |
| 143 | 143 | $result = $ret[0]; |
| 144 | | - $this->assertNotType( "bool", $result ); |
| 145 | | - $this->assertNotType( "null", $result["login"] ); |
| | 144 | + $this->assertNotInternalType( "bool", $result ); |
| | 145 | + $this->assertNotInternalType( "null", $result["login"] ); |
| 146 | 146 | |
| 147 | 147 | $a = $result["login"]["result"]; |
| 148 | 148 | $this->assertEquals( "NeedToken", $a ); |
| — | — | @@ -157,7 +157,7 @@ |
| 158 | 158 | |
| 159 | 159 | $result = $ret[0]; |
| 160 | 160 | |
| 161 | | - $this->assertNotType( "bool", $result ); |
| | 161 | + $this->assertNotInternalType( "bool", $result ); |
| 162 | 162 | $a = $result["login"]["result"]; |
| 163 | 163 | |
| 164 | 164 | $this->assertEquals( "Success", $a ); |
| — | — | @@ -180,9 +180,9 @@ |
| 181 | 181 | |
| 182 | 182 | libxml_use_internal_errors( true ); |
| 183 | 183 | $sxe = simplexml_load_string( $req->getContent() ); |
| 184 | | - $this->assertNotType( "bool", $sxe ); |
| | 184 | + $this->assertNotInternalType( "bool", $sxe ); |
| 185 | 185 | $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); |
| 186 | | - $this->assertNotType( "null", $sxe->login[0] ); |
| | 186 | + $this->assertNotInternalType( "null", $sxe->login[0] ); |
| 187 | 187 | |
| 188 | 188 | $a = $sxe->login[0]->attributes()->result[0]; |
| 189 | 189 | $this->assertEquals( ' result="NeedToken"', $a->asXML() ); |
| — | — | @@ -220,7 +220,7 @@ |
| 221 | 221 | $req->execute(); |
| 222 | 222 | libxml_use_internal_errors( true ); |
| 223 | 223 | $sxe = simplexml_load_string( $req->getContent() ); |
| 224 | | - $this->assertNotType( "bool", $sxe ); |
| | 224 | + $this->assertNotInternalType( "bool", $sxe ); |
| 225 | 225 | $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); |
| 226 | 226 | $a = $sxe->query[0]->pages[0]->page[0]->attributes(); |
| 227 | 227 | } |
| Index: trunk/phase3/tests/phpunit/includes/MessageTest.php |
| — | — | @@ -21,8 +21,8 @@ |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | function testKey() { |
| 25 | | - $this->assertType( 'Message', wfMessage( 'mainpage' ) ); |
| 26 | | - $this->assertType( 'Message', wfMessage( 'i-dont-exist-evar' ) ); |
| | 25 | + $this->assertInstanceOf( 'Message', wfMessage( 'mainpage' ) ); |
| | 26 | + $this->assertInstanceOf( 'Message', wfMessage( 'i-dont-exist-evar' ) ); |
| 27 | 27 | $this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->text() ); |
| 28 | 28 | $this->assertEquals( '<i-dont-exist-evar>', wfMessage( 'i-dont-exist-evar' )->text() ); |
| 29 | 29 | } |
| Index: trunk/phase3/tests/phpunit/includes/GlobalTest.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | |
| 65 | 65 | function testTime() { |
| 66 | 66 | $start = wfTime(); |
| 67 | | - $this->assertType( 'float', $start ); |
| | 67 | + $this->assertInternalType( 'float', $start ); |
| 68 | 68 | $end = wfTime(); |
| 69 | 69 | $this->assertTrue( $end > $start, "Time is running backwards!" ); |
| 70 | 70 | } |