The branch, master has been updated
via f080342e7a46bfdcac1a5fca39772680ad51e19e (commit)
from aaa8b69055e036c4dbf254be1214eda9f9b1bbb0 (commit)
- Log -----------------------------------------------------------------
commit f080342e7a46bfdcac1a5fca39772680ad51e19e
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 11:39:15 2011 +0200
Add missing bits to test cases setup
-----------------------------------------------------------------------
Summary of changes:
.../common/PMA_buildActionTitles_test.php | 1 +
test/libraries/common/PMA_checkParameters_test.php | 1 +
test/libraries/common/PMA_showDocu_test.php | 10 ++++++----
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/test/libraries/common/PMA_buildActionTitles_test.php
b/test/libraries/common/PMA_buildActionTitles_test.php
index 310bf8f..6f23544 100644
--- a/test/libraries/common/PMA_buildActionTitles_test.php
+++ b/test/libraries/common/PMA_buildActionTitles_test.php
@@ -18,6 +18,7 @@ class PMA_buildActionTitles_test extends
PHPUnit_Framework_TestCase{
function setup()
{
$GLOBALS['cfg'] = array('PropertiesIconic' => 'both');
+ $GLOBALS['pmaThemeImage'] = 'theme/';
}
function testBuildActionTitles(){
diff --git a/test/libraries/common/PMA_checkParameters_test.php
b/test/libraries/common/PMA_checkParameters_test.php
index b18f498..4bfcac9 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -21,6 +21,7 @@ class PMA_checkParameters_test extends
PHPUnit_Extensions_OutputTestCase
$GLOBALS['PMA_Config'] = new PMA_Config();
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['cfg'] = array('ReplaceHelpImg' => true);
+ $GLOBALS['pmaThemeImage'] = 'theme/';
}
function testCheckParameterMissing()
diff --git a/test/libraries/common/PMA_showDocu_test.php
b/test/libraries/common/PMA_showDocu_test.php
index b287ea1..a0c12c4 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -15,10 +15,14 @@ require_once 'libraries/common.lib.php';
class PMA_showDocu_test extends PHPUnit_Framework_TestCase
{
- function testShowDocuReplaceHelpImg()
+ function setup()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = true;
+ $GLOBALS['pmaThemeImage'] = 'theme/';
+ }
+ function testShowDocuReplaceHelpImg()
+ {
$anchor = "relation";
$expected = '<a href="Documentation.html#' . $anchor . '"
target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] .
'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="'
. __('Documentation') . '" /></a>';
@@ -28,12 +32,10 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase
function testShowDocuNotReplaceHelpImg()
{
- $GLOBALS['cfg']['ReplaceHelpImg'] = false;
-
$anchor = "relation";
$expected = '[<a href="Documentation.html#' . $anchor . '"
target="documentation">' . __('Documentation') . '</a>]';
$this->assertEquals($expected, PMA_showDocu($anchor));
}
-}
\ No newline at end of file
+}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
