Revert "merged master"

[lhc/web/wiklou.git] / tests / selenium / installer / MediaWikiErrorsConnectToDatabasePageTestCase.php

diff --git a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
index 380129c..b112bc0 100644 (file)
--- a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
+++ b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php
@@ -28,9 +28,9 @@
  */
 
 
-require_once( str_replace('//','/',dirname(__FILE__).'/') .'MediaWikiInstallationCommonFunction.php');
+require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' );
 
-/*
+/**
  * Test Case ID   : 09 (http://www.mediawiki.org/wiki/New_installer/Test_plan)
  * Test Case Name : Invalid/ blank values for fields in 'Connect to database' page.
  * Version        : MediaWiki 1.18alpha
@@ -51,14 +51,14 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
         $this->type( "mysql_wgDBserver", INVALID_DB_HOST );
         parent::clickContinueButton();
         $this->assertEquals( "DB connection error: php_network_getaddresses: getaddrinfo failed: No such host is known. (".INVALID_DB_HOST.").",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[1]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[1]" ));
         $this->assertEquals( "Check the host, username and password below and try again.",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[2]" ));
         // Verify warning message for the blank database host
         $this->type( "mysql_wgDBserver", "" );
         parent::clickContinueButton();
         $this->assertEquals( "MySQL 4.0.14 or later is required, you have .",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]" ));
 
         // Valid Database Host
         $this->type( "mysql_wgDBserver", VALID_DB_HOST );
@@ -67,13 +67,13 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
         $this->type( "mysql_wgDBname", INVALID_DB_NAME );
         parent::clickContinueButton();
         $this->assertEquals( "Invalid database name \"".INVALID_DB_NAME."\". Use only ASCII letters (a-z, A-Z), numbers (0-9) and underscores (_).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p" ));
 
         // Verify warning message for the blank database name
         $this->type( "mysql_wgDBname", "");
         parent::clickContinueButton();
         $this->assertEquals( "You must enter a value for \"Database name\"",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]" ));
 
         // valid Database name
         $this->type( "mysql_wgDBname", VALID_DB_NAME);
@@ -82,7 +82,7 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
         $this->type( "mysql_wgDBprefix", INVALID_DB_PREFIX );
         parent::clickContinueButton();
         $this->assertEquals( "Invalid database prefix \"".INVALID_DB_PREFIX."\". Use only ASCII letters (a-z, A-Z), numbers (0-9) and underscores (_).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]" ));
 
         // Valid Database prefix
         $this->type( "mysql_wgDBprefix", VALID_DB_PREFIX );
@@ -91,17 +91,17 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
         $this->type( "mysql__InstallUser", INVALID_DB_USER_NAME );
         parent::clickContinueButton();
         $this->assertEquals( "DB connection error: Access denied for user '".INVALID_DB_USER_NAME."'@'localhost' (using password: NO) (localhost).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[1]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[1]" ));
         $this->assertEquals( "Check the host, username and password below and try again.",
-                $this->getText("//div[@id='bodyContent']/div/div/div[2]/div[2]/p[2]"));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[2]"));
 
         // Verify warning message for the blank database user name
         $this->type( "mysql__InstallUser", "" );
         parent::clickContinueButton();
         $this->assertEquals( "DB connection error: Access denied for user 'SYSTEM'@'localhost' (using password: NO) (localhost).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[1]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[1]" ));
         $this->assertEquals( "Check the host, username and password below and try again.",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[2]" ));
 
         // Valid Database username
         $this->type( "mysql__InstallUser",  VALID_DB_USER_NAME );
@@ -111,18 +111,18 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
         parent::clickContinueButton();
 
         $this->assertEquals( "DB connection error: Access denied for user 'root'@'localhost' (using password: YES) (localhost).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[1]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[1]" ));
         $this->assertEquals( "Check the host, username and password below and try again.",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[2]" ));
 
         // Verify warning message for the invalid username and password
         $this->type( "mysql__InstallUser", INVALID_DB_USER_NAME );
         $this->type( "mysql__InstallPassword", INVALID_DB_PASSWORD );
         parent::clickContinueButton();
         $this->assertEquals( "DB connection error: Access denied for user '".INVALID_DB_USER_NAME."'@'localhost' (using password: YES) (localhost).",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[1]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[1]" ));
         $this->assertEquals( "Check the host, username and password below and try again.",
-                $this->getText( "//div[@id='bodyContent']/div/div/div[2]/div[2]/p[2]" ));
+                $this->getText( LINK_DIV."div[2]/div[2]/p[2]" ));
 
         // Valid username and valid password
         $this->type( "mysql__InstallUser", VALID_DB_USER_NAME );
@@ -131,6 +131,6 @@ class MediaWikiErrorsConnectToDatabasePageTestCase extends MediaWikiInstallation
 
         // successfully completes the 'Connect to database' page
         $this->assertEquals( "Database settings",
-                $this->getText("//div[@id='bodyContent']/div/div/h2" ));
+                $this->getText( LINK_DIV."h2" ));
     }
 }