| Index: trunk/phase3/maintenance/tests/HttpTest.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | |
| 127 | 127 | function testFailureDefault() { |
| 128 | 128 | Http::$httpEngine = false; |
| 129 | | - self::runHTTPFailureChecks(); |
| | 129 | + $this->runHTTPFailureChecks(); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | function testFailurePhp() { |
| — | — | @@ -134,7 +134,7 @@ |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | Http::$httpEngine = "php"; |
| 138 | | - self::runHTTPFailureChecks(); |
| | 138 | + $this->runHTTPFailureChecks(); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | function testFailureCurl() { |
| — | — | @@ -143,7 +143,7 @@ |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | Http::$httpEngine = "curl"; |
| 147 | | - self::runHTTPFailureChecks(); |
| | 147 | + $this->runHTTPFailureChecks(); |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /* ./phase3/includes/Import.php:1108: $data = Http::request( $method, $url ); */ |
| — | — | @@ -167,7 +167,7 @@ |
| 168 | 168 | |
| 169 | 169 | function testRequestDefault() { |
| 170 | 170 | Http::$httpEngine = false; |
| 171 | | - self::runHTTPRequests(); |
| | 171 | + $this->runHTTPRequests(); |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | function testRequestPhp() { |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | Http::$httpEngine = "php"; |
| 180 | | - self::runHTTPRequests(); |
| | 180 | + $this->runHTTPRequests(); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | function testRequestCurl() { |
| — | — | @@ -185,7 +185,7 @@ |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | Http::$httpEngine = "curl"; |
| 189 | | - self::runHTTPRequests(); |
| | 189 | + $this->runHTTPRequests(); |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /* ./extensions/SpamBlacklist/SpamBlacklist_body.php:164: $httpText = Http::get( $fileName ); */ |
| — | — | @@ -249,7 +249,7 @@ |
| 250 | 250 | |
| 251 | 251 | function testGetDefault() { |
| 252 | 252 | Http::$httpEngine = false; |
| 253 | | - self::runHTTPGets(); |
| | 253 | + $this->runHTTPGets(); |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | function testGetPhp() { |
| — | — | @@ -258,7 +258,7 @@ |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | Http::$httpEngine = "php"; |
| 262 | | - self::runHTTPGets(); |
| | 262 | + $this->runHTTPGets(); |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | function testGetCurl() { |
| — | — | @@ -267,7 +267,7 @@ |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | Http::$httpEngine = "curl"; |
| 271 | | - self::runHTTPGets(); |
| | 271 | + $this->runHTTPGets(); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | /* ./phase3/maintenance/parserTests.inc:1618: return Http::post( $url, array( 'postData' => wfArrayToCGI( $data ) ) ); */ |
| — | — | @@ -290,7 +290,7 @@ |
| 291 | 291 | |
| 292 | 292 | function testPostDefault() { |
| 293 | 293 | Http::$httpEngine = false; |
| 294 | | - self::runHTTPPosts(); |
| | 294 | + $this->runHTTPPosts(); |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | function testPostPhp() { |
| — | — | @@ -299,7 +299,7 @@ |
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | Http::$httpEngine = "php"; |
| 303 | | - self::runHTTPPosts(); |
| | 303 | + $this->runHTTPPosts(); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | function testPostCurl() { |
| — | — | @@ -308,26 +308,26 @@ |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | Http::$httpEngine = "curl"; |
| 312 | | - self::runHTTPPosts(); |
| | 312 | + $this->runHTTPPosts(); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | function runProxyRequests() { |
| 316 | 316 | if ( !self::$has_proxy ) { |
| 317 | 317 | $this->markTestIncomplete( "This test requires a proxy." ); |
| 318 | 318 | } |
| 319 | | - self::runHTTPGets( self::$proxy ); |
| 320 | | - self::runHTTPPosts( self::$proxy ); |
| 321 | | - self::runHTTPRequests( self::$proxy ); |
| | 319 | + $this->runHTTPGets( self::$proxy ); |
| | 320 | + $this->runHTTPPosts( self::$proxy ); |
| | 321 | + $this->runHTTPRequests( self::$proxy ); |
| 322 | 322 | |
| 323 | 323 | // Set false here to do noProxy |
| 324 | | - self::runHTTPGets( false ); |
| 325 | | - self::runHTTPPosts( false ); |
| 326 | | - self::runHTTPRequests( false ); |
| | 324 | + $this->runHTTPGets( false ); |
| | 325 | + $this->runHTTPPosts( false ); |
| | 326 | + $this->runHTTPRequests( false ); |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | function testProxyDefault() { |
| 330 | 330 | Http::$httpEngine = false; |
| 331 | | - self::runProxyRequests(); |
| | 331 | + $this->runProxyRequests(); |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | function testProxyPhp() { |
| — | — | @@ -336,7 +336,7 @@ |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | Http::$httpEngine = 'php'; |
| 340 | | - self::runProxyRequests(); |
| | 340 | + $this->runProxyRequests(); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | function testProxyCurl() { |
| — | — | @@ -345,7 +345,7 @@ |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | Http::$httpEngine = 'curl'; |
| 349 | | - self::runProxyRequests(); |
| | 349 | + $this->runProxyRequests(); |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | function testIsLocalUrl() { |
| — | — | @@ -546,7 +546,7 @@ |
| 547 | 547 | |
| 548 | 548 | function testCookieRequestDefault() { |
| 549 | 549 | Http::$httpEngine = false; |
| 550 | | - self::runCookieRequests(); |
| | 550 | + $this->runCookieRequests(); |
| 551 | 551 | } |
| 552 | 552 | function testCookieRequestPhp() { |
| 553 | 553 | if ( !self::$has_fopen ) { |
| — | — | @@ -554,7 +554,7 @@ |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | Http::$httpEngine = 'php'; |
| 558 | | - self::runCookieRequests(); |
| | 558 | + $this->runCookieRequests(); |
| 559 | 559 | } |
| 560 | 560 | function testCookieRequestCurl() { |
| 561 | 561 | if ( !self::$has_curl ) { |
| — | — | @@ -562,6 +562,6 @@ |
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | Http::$httpEngine = 'curl'; |
| 566 | | - self::runCookieRequests(); |
| | 566 | + $this->runCookieRequests(); |
| 567 | 567 | } |
| 568 | 568 | } |