r78386 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r78385‎ | r78386 | r78387 >
Date:16:33, 14 December 2010
Author:demon
Status:ok
Tags:
Comment:
Fix path changes from move in r78383
Modified paths:
  • /trunk/phase3/tests/phpunit/includes/SeleniumConfigurationTest.php (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php (modified) (history)
  • /trunk/phase3/tests/selenium/selenium_settings.ini.php52.sample (modified) (history)
  • /trunk/phase3/tests/selenium/selenium_settings.ini.sample (modified) (history)
  • /trunk/phase3/tests/selenium/selenium_settings_grid.ini.sample (modified) (history)
  • /trunk/phase3/tests/selenium/suites/MediaWikExtraTestSuite.php (modified) (history)
  • /trunk/phase3/tests/selenium/suites/MediaWikiEditorConfig.php (modified) (history)
  • /trunk/phase3/tests/selenium/suites/MediaWikiEditorTestSuite.php (modified) (history)
  • /trunk/phase3/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php (modified) (history)
  • /trunk/phase3/tests/selenium/suites/PageDeleteTestSuite.php (modified) (history)
  • /trunk/phase3/tests/selenium/suites/SimpleSeleniumTestSuite.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/selenium/selenium_settings.ini.sample
@@ -27,6 +27,6 @@
2828
2929 [SeleniumTests]
3030
31 -testSuite[SimpleSeleniumTestSuite] = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
 31+testSuite[SimpleSeleniumTestSuite] = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
3232 testSuite[WikiEditorTestSuite] = "extensions/WikiEditor/selenium/WikiEditorTestSuite.php"
3333
Index: trunk/phase3/tests/selenium/selenium_settings_grid.ini.sample
@@ -11,4 +11,4 @@
1212
1313 [testSuite]
1414
15 -SimpleSeleniumTestSuite = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
\ No newline at end of file
 15+SimpleSeleniumTestSuite = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
\ No newline at end of file
Index: trunk/phase3/tests/selenium/selenium_settings.ini.php52.sample
@@ -19,5 +19,5 @@
2020
2121 [testSuite]
2222
23 -SimpleSeleniumTestSuite = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
 23+SimpleSeleniumTestSuite = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
2424 WikiEditorTestSuite = "extensions/WikiEditor/selenium/WikiEditorTestSuite.php"
Index: trunk/phase3/tests/selenium/suites/MediaWikiEditorConfig.php
@@ -32,7 +32,7 @@
3333 public static function getSettings(&$includeFiles, &$globalConfigs) {
3434 $includes = array(
3535 //files that needed to be included would go here
36 - 'maintenance/tests/selenium/suites/MediaWikiCommonFunction.php'
 36+ 'tests/selenium/suites/MediaWikiCommonFunction.php'
3737 );
3838 $configs = array(
3939 'wgPageLoadTime' => "600000"
Index: trunk/phase3/tests/selenium/suites/SimpleSeleniumTestSuite.php
@@ -3,7 +3,7 @@
44 * Sample test suite.
55 * Two ways to configure MW for these tests
66 * 1) If you are running multiple test suites, add the following in LocalSettings.php
7 - * require_once("maintenance/tests/selenium/SimpleSeleniumConfig.php");
 7+ * require_once("tests/selenium/SimpleSeleniumConfig.php");
88 * $wgSeleniumTestConfigs['SimpleSeleniumTestSuite'] = 'SimpleSeleniumConfig::getSettings';
99 * OR
1010 * 2) Add the following to your Localsettings.php
@@ -17,7 +17,7 @@
1818 }
1919 public function addTests() {
2020 $testFiles = array(
21 - 'maintenance/tests/selenium/suites/SimpleSeleniumTestCase.php'
 21+ 'tests/selenium/suites/SimpleSeleniumTestCase.php'
2222 );
2323 parent::addTestFiles( $testFiles );
2424 }
Index: trunk/phase3/tests/selenium/suites/MediaWikExtraTestSuite.php
@@ -7,13 +7,13 @@
88 }
99 public function addTests() {
1010 $testFiles = array(
11 - 'maintenance/tests/selenium/suites/MyContributionsTestCase.php',
12 - 'maintenance/tests/selenium/suites/MyWatchListTestCase.php',
13 - 'maintenance/tests/selenium/suites/UserPreferencesTestCase.php',
14 - 'maintenance/tests/selenium/suites/MovePageTestCase.php',
15 - 'maintenance/tests/selenium/suites/PageSearchTestCase.php',
16 - 'maintenance/tests/selenium/suites/EmailPasswordTestCase.php',
17 - 'maintenance/tests/selenium/suites/CreateAccountTestCase.php'
 11+ 'tests/selenium/suites/MyContributionsTestCase.php',
 12+ 'tests/selenium/suites/MyWatchListTestCase.php',
 13+ 'tests/selenium/suites/UserPreferencesTestCase.php',
 14+ 'tests/selenium/suites/MovePageTestCase.php',
 15+ 'tests/selenium/suites/PageSearchTestCase.php',
 16+ 'tests/selenium/suites/EmailPasswordTestCase.php',
 17+ 'tests/selenium/suites/CreateAccountTestCase.php'
1818 );
1919 parent::addTestFiles( $testFiles );
2020 }
Index: trunk/phase3/tests/selenium/suites/PageDeleteTestSuite.php
@@ -7,7 +7,7 @@
88 }
99 public function addTests() {
1010 $testFiles = array(
11 - 'maintenance/tests/selenium/suites/DeletePageAdminTestCase.php'
 11+ 'tests/selenium/suites/DeletePageAdminTestCase.php'
1212 );
1313 parent::addTestFiles( $testFiles );
1414 }
Index: trunk/phase3/tests/selenium/suites/MediaWikiEditorTestSuite.php
@@ -7,10 +7,10 @@
88 }
99 public function addTests() {
1010 $testFiles = array(
11 - 'maintenance/tests/selenium/suites/AddNewPageTestCase.php',
12 - 'maintenance/tests/selenium/suites/AddContentToNewPageTestCase.php',
13 - 'maintenance/tests/selenium/suites/PreviewPageTestCase.php',
14 - 'maintenance/tests/selenium/suites/SavePageTestCase.php',
 11+ 'tests/selenium/suites/AddNewPageTestCase.php',
 12+ 'tests/selenium/suites/AddContentToNewPageTestCase.php',
 13+ 'tests/selenium/suites/PreviewPageTestCase.php',
 14+ 'tests/selenium/suites/SavePageTestCase.php',
1515 );
1616 parent::addTestFiles( $testFiles );
1717 }
Index: trunk/phase3/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php
@@ -10,7 +10,7 @@
1111 }
1212 public function addTests() {
1313 $testFiles = array(
14 - 'maintenance/tests/selenium/suites/MediawikiCoreSmokeTestCase.php'
 14+ 'tests/selenium/suites/MediawikiCoreSmokeTestCase.php'
1515 );
1616 parent::addTestFiles( $testFiles );
1717 }
Index: trunk/phase3/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -20,7 +20,7 @@
2121
2222 $tester = new self;
2323
24 - $iter = new TestFileIterator( "$IP/maintenance/tests/parser/parserTests.txt", $tester );
 24+ $iter = new TestFileIterator( "$IP/tests/parser/parserTests.txt", $tester );
2525 $tester->count = 0;
2626
2727 foreach ( $iter as $test ) {
Index: trunk/phase3/tests/phpunit/includes/SeleniumConfigurationTest.php
@@ -29,7 +29,7 @@
3030 runAgainstGrid = false
3131
3232 [SeleniumTests]
33 -testSuite[SimpleSeleniumTestSuite] = "maintenance/tests/selenium/SimpleSeleniumTestSuite.php"
 33+testSuite[SimpleSeleniumTestSuite] = "tests/selenium/SimpleSeleniumTestSuite.php"
3434 testSuite[TestSuiteName] = "testSuitePath"
3535 ';
3636 /*
@@ -59,7 +59,7 @@
6060 * Array of expected testSuites from $testConfig0
6161 */
6262 private $testSuites0 = array(
63 - 'SimpleSeleniumTestSuite' => 'maintenance/tests/selenium/SimpleSeleniumTestSuite.php',
 63+ 'SimpleSeleniumTestSuite' => 'tests/selenium/SimpleSeleniumTestSuite.php',
6464 'TestSuiteName' => 'testSuitePath'
6565 );
6666

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r78383Per wikitech-l discussion: Move tests from maintenance/tests/ to tests/. They...demon16:26, 14 December 2010

Status & tagging log