| Index: trunk/phase3/maintenance/tests/ApiTest.php |
| — | — | @@ -57,9 +57,10 @@ |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | function testApi() { |
| 61 | | - global $wgServerName, $wgServer, $wgDBprefix; |
| | 61 | + global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| 62 | 62 | |
| 63 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 63 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 64 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 64 | 65 | if(!isset($wgServerName) || !isset($wgServer)) { |
| 65 | 66 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 66 | 67 | 'be set in LocalSettings.php'); |
| — | — | @@ -74,9 +75,10 @@ |
| 75 | 76 | } |
| 76 | 77 | |
| 77 | 78 | function testApiLoginNoName() { |
| 78 | | - global $wgServerName, $wgServer, $wgDBprefix; |
| | 79 | + global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| 79 | 80 | |
| 80 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 81 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 82 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 81 | 83 | if(!isset($wgServerName) || !isset($wgServer)) { |
| 82 | 84 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 83 | 85 | 'be set in LocalSettings.php'); |
| — | — | @@ -94,9 +96,10 @@ |
| 95 | 97 | } |
| 96 | 98 | |
| 97 | 99 | function testApiLoginBadPass() { |
| 98 | | - global $wgServerName, $wgServer, $wgDBprefix; |
| | 100 | + global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| 99 | 101 | |
| 100 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 102 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 103 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 101 | 104 | if(!isset($wgServerName) || !isset($wgServer)) { |
| 102 | 105 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 103 | 106 | 'be set in LocalSettings.php'); |
| — | — | @@ -114,9 +117,10 @@ |
| 115 | 118 | } |
| 116 | 119 | |
| 117 | 120 | function testApiLoginGoodPass() { |
| 118 | | - global $wgServerName, $wgServer, $wgDBprefix; |
| | 121 | + global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| 119 | 122 | |
| 120 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 123 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 124 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 121 | 125 | if(!isset($wgServerName) || !isset($wgServer)) { |
| 122 | 126 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 123 | 127 | 'be set in LocalSettings.php'); |
| — | — | @@ -134,9 +138,10 @@ |
| 135 | 139 | } |
| 136 | 140 | |
| 137 | 141 | function testApiGotCookie() { |
| 138 | | - global $wgServerName, $wgServer, $wgScriptPath, $wgDBprefix; |
| | 142 | + global $wgServerName, $wgServer, $wgScriptPath, $wgDBprefix, $wgDBtype; |
| 139 | 143 | |
| 140 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 144 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 145 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 141 | 146 | if(!isset($wgServerName) || !isset($wgServer)) { |
| 142 | 147 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 143 | 148 | 'be set in LocalSettings.php'); |
| — | — | @@ -159,9 +164,10 @@ |
| 160 | 165 | */ |
| 161 | 166 | function testApiListPages(CookieJar $cj) { |
| 162 | 167 | $this->markTestIncomplete("Not done with this yet"); |
| 163 | | - global $wgServerName, $wgServer, $wgDBprefix; |
| | 168 | + global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| 164 | 169 | |
| 165 | | - if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| | 170 | + if($wgDBprefix === "parsertest_" || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) |
| | 171 | + $this->markTestSkipped("This test can't (yet?) be run with the parser tests"); |
| 166 | 172 | if($wgServerName == "localhost" || $wgServer == "http://localhost") { |
| 167 | 173 | $this->markTestIncomplete('This test needs $wgServerName and $wgServer to '. |
| 168 | 174 | 'be set in LocalSettings.php'); |
| Index: trunk/phase3/maintenance/tests/phpunit.xml |
| — | — | @@ -1,25 +1,25 @@ |
| 2 | 2 | <!-- See http://www.phpunit.de/manual/3.3/en/appendixes.configuration.html --> |
| 3 | 3 | <phpunit bootstrap="./bootstrap.php" |
| 4 | | - colors="false" |
| | 4 | + colors="true" |
| | 5 | + backupGlobals="false" |
| | 6 | + convertErrorsToExceptions="true" |
| | 7 | + convertNoticesToExceptions="true" |
| | 8 | + convertWarningsToExceptions="true" |
| 5 | 9 | stopOnFailure="false"> |
| 6 | | - <!-- convertErrorsToExceptions="true" --> |
| 7 | | - <!-- convertNoticesToExceptions="true" --> |
| 8 | | - <!-- convertWarningsToExceptions="true" --> |
| 9 | 10 | <testsuite name="MediaWiki Test Suite"> |
| 10 | | - <directory>.</directory> |
| 11 | | - <!-- <file>HttpTest.php</file> --> |
| 12 | | - <!-- <file>SearchEngineTest.php</file> --> |
| 13 | | - <!-- <file>SiteConfigurationTest.php</file> --> |
| 14 | | - <!-- <file>RevisionTest.php</file> --> |
| 15 | | - <!-- <file>XmlTest.php</file> --> |
| 16 | | - <!-- <file>TimeAdjustTest.php</file> --> |
| 17 | | - <!-- <file>ApiTest.php</file> --> |
| 18 | | - <!-- <file>LanguageConverterTest.php</file> --> |
| 19 | | - <!-- <file>TitleTest.php</file> --> |
| 20 | | - <!-- <file>UploadFromChunksTest.php</file> --> |
| 21 | | - <!-- <file>LocalFileTest.php</file> --> |
| 22 | | - <!-- <file>XmlTest.php</file> --> |
| 23 | | - <!-- <file>MediaWikiParserTest.php</file> --> |
| | 11 | + <!-- <directory>.</directory> --> |
| | 12 | + <file>ApiTest.php</file> |
| | 13 | + <file>HttpTest.php</file> |
| | 14 | + <file>LanguageConverterTest.php</file> |
| | 15 | + <file>LocalFileTest.php</file> |
| | 16 | + <file>MediaWikiParserTest.php</file> |
| | 17 | + <file>RevisionTest.php</file> |
| | 18 | + <file>SearchEngineTest.php</file> |
| | 19 | + <file>SiteConfigurationTest.php</file> |
| | 20 | + <file>TimeAdjustTest.php</file> |
| | 21 | + <file>TitleTest.php</file> |
| | 22 | + <file>UploadFromChunksTest.php</file> |
| | 23 | + <file>XmlTest.php</file> |
| 24 | 24 | </testsuite> |
| 25 | 25 | <groups> |
| 26 | 26 | <exclude> |