[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11297-ge490bdd

[Michal Čihař]

The branch, master has been updated
       via  e490bdd2627b5d227de7ceae9e86c27083ddc4ed (commit)
      from  ba395f545e459da2548593876308989d7f4adb05 (commit)


- Log -----------------------------------------------------------------
commit e490bdd2627b5d227de7ceae9e86c27083ddc4ed
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 16:26:07 2011 +0200

    Adjust test cases to sprited icons

-----------------------------------------------------------------------

Summary of changes:
 test/libraries/common/PMA_getIcon_test.php     |   16 ++++++++--------
 test/libraries/common/PMA_showDocu_test.php    |    2 +-
 test/libraries/common/PMA_showPHPDocu_test.php |    6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/libraries/common/PMA_getIcon_test.php b/test/libraries/common/PMA_getIcon_test.php
index 7835aca..b64ef53 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -30,7 +30,7 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
         $GLOBALS['pmaThemeImage'] = 'theme/';
 
         $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
-                            . 'b_comment.png" title="" alt="" class="icon" width="16" height="16" /></span>',
+                            . 'dot.gif" title="" alt="" class="icon ic_b_comment" /></span>',
                             PMA_getIcon('b_comment.png') );
     }
 
@@ -41,8 +41,8 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
         $alternate_text = 'alt_str';
 
         $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
-                            .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
-                            . '" class="icon" width="16" height="16" /></span>',
+                            .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
+                            . '" class="icon ic_b_comment" /></span>',
                             PMA_getIcon('b_comment.png',$alternate_text) );
     }
 
@@ -53,8 +53,8 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
         $alternate_text = 'alt_str';
 
         $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
-                            .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
-                            . '" class="icon" width="16" height="16" /></span>',
+                            .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
+                            . '" class="icon ic_b_comment" /></span>',
                             PMA_getIcon('b_comment.png',$alternate_text, true) );
 
     }
@@ -66,9 +66,9 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
         $alternate_text = 'alt_str';
 
         $this->assertEquals('<span class="nowrap"><img src="'.$GLOBALS['pmaThemeImage']
-                            .'b_comment.png" title="' . $alternate_text . '" alt="' . $alternate_text
-                            . '" class="icon" width="16" height="16" /> ' . $alternate_text . '</span>',
+                            .'dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text
+                            . '" class="icon ic_b_comment" /> ' . $alternate_text . '</span>',
                             PMA_getIcon('b_comment.png',$alternate_text, true, true) );
 
     }
-}
\ No newline at end of file
+}
diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index b11f12d..edf7c46 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -25,7 +25,7 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['ReplaceHelpImg'] = true;
 
         $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>';
+        $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon ic_b_help_s" src="' . $GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
 
         $this->assertEquals($expected, PMA_showDocu($anchor));
 
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index eb98f30..d47269d 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -21,8 +21,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
 
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
-        $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon" src="'
-                    . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target . '" target="documentation"><img class="icon ic_b_help_s" src="'
+                    . $GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
 
         $this->assertEquals($expected, PMA_showPHPDocu($target));
     }
@@ -39,4 +39,4 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
     }
 
 
-}
\ No newline at end of file
+}


hooks/post-receive
-- 
phpMyAdmin