Fix path changes from move in r78383

diff --git a/tests/phpunit/includes/SeleniumConfigurationTest.php b/tests/phpunit/includes/SeleniumConfigurationTest.php
index 16a916e..fa0ea80 100644 (file)
--- a/tests/phpunit/includes/SeleniumConfigurationTest.php
+++ b/tests/phpunit/includes/SeleniumConfigurationTest.php
@@ -29,7 +29,7 @@ jUnitLogFile  =
 runAgainstGrid = false
 
 [SeleniumTests]
-testSuite[SimpleSeleniumTestSuite] = "maintenance/tests/selenium/SimpleSeleniumTestSuite.php"
+testSuite[SimpleSeleniumTestSuite] = "tests/selenium/SimpleSeleniumTestSuite.php"
 testSuite[TestSuiteName] = "testSuitePath"
 ';
        /*
@@ -59,7 +59,7 @@ testSuite[TestSuiteName] = "testSuitePath"
         * Array of expected testSuites from $testConfig0
         */
        private $testSuites0 = array(
-               'SimpleSeleniumTestSuite'       => 'maintenance/tests/selenium/SimpleSeleniumTestSuite.php',
+               'SimpleSeleniumTestSuite'       => 'tests/selenium/SimpleSeleniumTestSuite.php',
                'TestSuiteName'                         => 'testSuitePath'
        );
 

diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index 3825a8f..486f375 100644 (file)
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -20,7 +20,7 @@ class MediaWikiParserTest extends MediaWikiTestSetup {
 
                $tester = new self;
 
-               $iter = new TestFileIterator( "$IP/maintenance/tests/parser/parserTests.txt", $tester );
+               $iter = new TestFileIterator( "$IP/tests/parser/parserTests.txt", $tester );
                $tester->count = 0;
 
                foreach ( $iter as $test ) {

diff --git a/tests/selenium/selenium_settings.ini.php52.sample b/tests/selenium/selenium_settings.ini.php52.sample
index ad21037..7011380 100644 (file)
--- a/tests/selenium/selenium_settings.ini.php52.sample
+++ b/tests/selenium/selenium_settings.ini.php52.sample
@@ -19,5 +19,5 @@ runAgainstGrid        = false
 
 [testSuite]
 
-SimpleSeleniumTestSuite        = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
+SimpleSeleniumTestSuite        = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
 WikiEditorTestSuite = "extensions/WikiEditor/selenium/WikiEditorTestSuite.php"

diff --git a/tests/selenium/selenium_settings.ini.sample b/tests/selenium/selenium_settings.ini.sample
index bacc0a9..b1d8819 100644 (file)
--- a/tests/selenium/selenium_settings.ini.sample
+++ b/tests/selenium/selenium_settings.ini.sample
@@ -27,6 +27,6 @@ seleniumserverexecpath = "/opt/local/selenium-remote-control-1.0.3/selenium-serv
 
 [SeleniumTests]
 
-testSuite[SimpleSeleniumTestSuite] = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
+testSuite[SimpleSeleniumTestSuite] = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
 testSuite[WikiEditorTestSuite] = "extensions/WikiEditor/selenium/WikiEditorTestSuite.php"
 

diff --git a/tests/selenium/selenium_settings_grid.ini.sample b/tests/selenium/selenium_settings_grid.ini.sample
index eca60b0..1f80483 100644 (file)
--- a/tests/selenium/selenium_settings_grid.ini.sample
+++ b/tests/selenium/selenium_settings_grid.ini.sample
@@ -11,4 +11,4 @@ runAgainstGrid        = true
 
 [testSuite]
 
-SimpleSeleniumTestSuite        = "maintenance/tests/selenium/suites/SimpleSeleniumTestSuite.php"
\ No newline at end of file
+SimpleSeleniumTestSuite        = "tests/selenium/suites/SimpleSeleniumTestSuite.php"
\ No newline at end of file

diff --git a/tests/selenium/suites/MediaWikExtraTestSuite.php b/tests/selenium/suites/MediaWikExtraTestSuite.php
index 205cb33..cf29cb0 100644 (file)
--- a/tests/selenium/suites/MediaWikExtraTestSuite.php
+++ b/tests/selenium/suites/MediaWikExtraTestSuite.php
@@ -7,13 +7,13 @@ class MediaWikExtraTestSuite extends SeleniumTestSuite {
     }
     public function addTests() {
         $testFiles = array(
-                'maintenance/tests/selenium/suites/MyContributionsTestCase.php',
-                'maintenance/tests/selenium/suites/MyWatchListTestCase.php',
-                'maintenance/tests/selenium/suites/UserPreferencesTestCase.php',
-                'maintenance/tests/selenium/suites/MovePageTestCase.php',
-                'maintenance/tests/selenium/suites/PageSearchTestCase.php',
-                'maintenance/tests/selenium/suites/EmailPasswordTestCase.php',
-                'maintenance/tests/selenium/suites/CreateAccountTestCase.php'
+                'tests/selenium/suites/MyContributionsTestCase.php',
+                'tests/selenium/suites/MyWatchListTestCase.php',
+                'tests/selenium/suites/UserPreferencesTestCase.php',
+                'tests/selenium/suites/MovePageTestCase.php',
+                'tests/selenium/suites/PageSearchTestCase.php',
+                'tests/selenium/suites/EmailPasswordTestCase.php',
+                'tests/selenium/suites/CreateAccountTestCase.php'
         );
         parent::addTestFiles( $testFiles );
     }

diff --git a/tests/selenium/suites/MediaWikiEditorConfig.php b/tests/selenium/suites/MediaWikiEditorConfig.php
index f0b3a7e..c13f185 100644 (file)
--- a/tests/selenium/suites/MediaWikiEditorConfig.php
+++ b/tests/selenium/suites/MediaWikiEditorConfig.php
@@ -32,7 +32,7 @@ class MediaWikiEditorConfig {
     public static function getSettings(&$includeFiles, &$globalConfigs) {
         $includes = array(
                 //files that needed to be included would go here
-                'maintenance/tests/selenium/suites/MediaWikiCommonFunction.php'
+                'tests/selenium/suites/MediaWikiCommonFunction.php'
         );
         $configs = array(
                 'wgPageLoadTime' => "600000"

diff --git a/tests/selenium/suites/MediaWikiEditorTestSuite.php b/tests/selenium/suites/MediaWikiEditorTestSuite.php
index 0604636..c0aee9f 100644 (file)
--- a/tests/selenium/suites/MediaWikiEditorTestSuite.php
+++ b/tests/selenium/suites/MediaWikiEditorTestSuite.php
@@ -7,10 +7,10 @@ class MediaWikiEditorTestSuite extends SeleniumTestSuite {
     }
     public function addTests() {
         $testFiles = array(
-                'maintenance/tests/selenium/suites/AddNewPageTestCase.php',
-                'maintenance/tests/selenium/suites/AddContentToNewPageTestCase.php',
-                'maintenance/tests/selenium/suites/PreviewPageTestCase.php',
-                'maintenance/tests/selenium/suites/SavePageTestCase.php',
+                'tests/selenium/suites/AddNewPageTestCase.php',
+                'tests/selenium/suites/AddContentToNewPageTestCase.php',
+                'tests/selenium/suites/PreviewPageTestCase.php',
+                'tests/selenium/suites/SavePageTestCase.php',
         );
         parent::addTestFiles( $testFiles );
     }

diff --git a/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php b/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php
index 76287b2..5d5ef51 100644 (file)
--- a/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php
+++ b/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php
@@ -10,7 +10,7 @@ class MediawikiCoreSmokeTestSuite extends SeleniumTestSuite
        } 
        public function addTests() {
                $testFiles = array(
-                       'maintenance/tests/selenium/suites/MediawikiCoreSmokeTestCase.php'
+                       'tests/selenium/suites/MediawikiCoreSmokeTestCase.php'
                );
                parent::addTestFiles( $testFiles );
        }

diff --git a/tests/selenium/suites/PageDeleteTestSuite.php b/tests/selenium/suites/PageDeleteTestSuite.php
index 2e535c1..256e354 100644 (file)
--- a/tests/selenium/suites/PageDeleteTestSuite.php
+++ b/tests/selenium/suites/PageDeleteTestSuite.php
@@ -7,7 +7,7 @@ class PageDeleteTestSuite extends SeleniumTestSuite {
     }
     public function addTests() {
         $testFiles = array(
-                'maintenance/tests/selenium/suites/DeletePageAdminTestCase.php'
+                'tests/selenium/suites/DeletePageAdminTestCase.php'
         );
         parent::addTestFiles( $testFiles );
     }

diff --git a/tests/selenium/suites/SimpleSeleniumTestSuite.php b/tests/selenium/suites/SimpleSeleniumTestSuite.php
index a04f33e..3011b3d 100644 (file)
--- a/tests/selenium/suites/SimpleSeleniumTestSuite.php
+++ b/tests/selenium/suites/SimpleSeleniumTestSuite.php
@@ -3,7 +3,7 @@
  * Sample test suite. 
  * Two ways to configure MW for these tests
  * 1) If you are running multiple test suites, add the following in LocalSettings.php
- * require_once("maintenance/tests/selenium/SimpleSeleniumConfig.php");
+ * require_once("tests/selenium/SimpleSeleniumConfig.php");
  * $wgSeleniumTestConfigs['SimpleSeleniumTestSuite'] = 'SimpleSeleniumConfig::getSettings';
  * OR
  * 2) Add the following to your Localsettings.php
@@ -17,7 +17,7 @@ class SimpleSeleniumTestSuite extends SeleniumTestSuite
        } 
        public function addTests() {
                $testFiles = array(
-                       'maintenance/tests/selenium/suites/SimpleSeleniumTestCase.php'
+                       'tests/selenium/suites/SimpleSeleniumTestCase.php'
                );
                parent::addTestFiles( $testFiles );
        }