Merge two tests for checkPmaAbsoluteUri

1 files changed, 11 insertions, 21 deletions

diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 39dbf91b2b..1314bc9378 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -417,7 +417,7 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
      * @depends testCheckPmaAbsoluteUriEmpty
      * @dataProvider absoluteUris
      */
-    public function testCheckPmaAbsoluteUriNormal($real, $expected)
+    public function testCheckPmaAbsoluteUri($real, $expected)
     {
         $this->object->set('PmaAbsoluteUri', $real);
         $this->object->checkPmaAbsoluteUri();
@@ -439,13 +439,21 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
                 'localhost/phpmyadmin/',
                 'http://localhost/phpmyadmin/',
             ),
+            array(
+                'http://user:pwd@localhost/phpmyadmin/index.php',
+                "http://user:pwd@localhost/phpmyadmin/index.php/",
+            ),
+            array(
+                'https://user:pwd@localhost/phpmyadmin/index.php',
+                "https://user:pwd@localhost/phpmyadmin/index.php/",
+            ),
         );
     }
 
     /**
+     * Test for absolute URI composition
      *
-     *
-     * @depends testCheckPmaAbsoluteUriNormal
+     * @depends testCheckPmaAbsoluteUri
      */
     public function testCheckPmaAbsoluteUriScheme()
     {
@@ -460,24 +468,6 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
         $this->assertEquals("http://localhost/", $this->object->get('PmaAbsoluteUri'));
     }
 
-    /**
-     *
-     *
-     * @depends testCheckPmaAbsoluteUriScheme
-     */
-    public function testCheckPmaAbsoluteUriUser()
-    {
-        $this->object->set('PmaAbsoluteUri', 'http://user:pwd@localhost/phpmyadmin/index.php');
-
-        $this->object->checkPmaAbsoluteUri();
-        $this->assertEquals("http://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
-
-        $this->object->set('PmaAbsoluteUri', 'https://user:pwd@localhost/phpmyadmin/index.php');
-
-        $this->object->checkPmaAbsoluteUri();
-        $this->assertEquals("https://user:pwd@localhost/phpmyadmin/index.php/", $this->object->get('PmaAbsoluteUri'));
-    }
-
     public function testCheckCollationConnection()
     {
         $_REQUEST['collation_connection'] = 'utf-8';