From 6b18c1764b870a82a1f8d02cd42e93f5f1c22aab Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 2 Aug 2013 12:21:09 +0530
Subject: [PATCH 1/3] Unit tests for user group manipulation functions

---
 libraries/server_privileges.lib.php           |   2 +-
 .../libraries/PMA_server_user_groups_test.php | 233 ++++++++++++++++++
 2 files changed, 234 insertions(+), 1 deletion(-)
 create mode 100644 test/libraries/PMA_server_user_groups_test.php

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 065de8f5a2..802574508a 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3451,7 +3451,7 @@ function _getTabList($title, $level, $selected)
     foreach ($tabs as $tab => $tabName) {
         $html_output .= '<div class="item">';
         $html_output .= '<input type="checkbox" class="checkall"'
-            . (in_array($tab, $selected) ? 'checked="checked"' : '')
+            . (in_array($tab, $selected) ? ' checked="checked"' : '')
             . ' name="' . $level . '_' . $tab .  '" value="Y" />';
         $html_output .= '<label for="' . $level . '_' . $tab .  '">'
             . '<code>' . $tabName . '</code>'
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
new file mode 100644
index 0000000000..de65fc58b9
--- /dev/null
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -0,0 +1,233 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Tests for server_user_groups.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/Util.class.php';
+require_once 'libraries/relation.lib.php';
+/*
+ * Include to test.
+ */
+require_once 'libraries/server_privileges.lib.php';
+
+/**
+ * Tests for server_user_groups.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
+        $GLOBALS['cfg']['Server']['users'] = 'users';
+        $GLOBALS['cfg']['Server']['usergroups'] = 'usergroups';
+    }
+
+    /**
+     * Tests PMA_getHtmlForUserGroupsTable() function
+     *
+     * @return void
+     */
+    public function testGetHtmlForUserGroupsTable()
+    {
+        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
+            . " ORDER BY `usergroup` ASC";
+
+        // no user groups
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->once())
+            ->method('tryQuery')
+            ->with($expectedQuery)
+            ->will($this->returnValue(true));
+        $dbi->expects($this->once())
+            ->method('numRows')
+            ->withAnyParameters()
+            ->will($this->returnValue(0));
+        $dbi->expects($this->once())
+            ->method('freeResult');
+        $GLOBALS['dbi'] = $dbi;
+
+        $html = PMA_getHtmlForUserGroupsTable();
+        $this->assertNotContains(
+            '<table id="userGroupsTable">',
+            $html
+        );
+        $this->assertContains(
+            '<a href="server_user_groups.php?'
+            . PMA_generate_common_url() . '&addUserGroup=1">',
+            $html
+        );
+
+        // with user groups
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->once())
+            ->method('tryQuery')
+            ->with($expectedQuery)
+            ->will($this->returnValue(true));
+        $dbi->expects($this->once())
+            ->method('numRows')
+            ->withAnyParameters()
+            ->will($this->returnValue(1));
+        $dbi->expects($this->at(0))
+            ->method('fetchAssoc')
+            ->withAnyParameters()
+            ->will(
+                $this->returnValue(
+                    array(
+                        'usergroup' => 'usergroup<',
+                        'server_sql' => 'Y',
+                        'server_databases' => 'N',
+                        'db_sql' => 'Y',
+                        'db_structure' => 'N',
+                        'table_sql' => 'Y',
+                        'table_browse' => 'N'
+                    )
+                )
+            );
+        $dbi->expects($this->at(1))
+            ->method('fetchAssoc')
+            ->withAnyParameters()
+            ->will($this->returnValue(false));
+        $dbi->expects($this->once())
+            ->method('freeResult');
+        $GLOBALS['dbi'] = $dbi;
+
+        $html = PMA_getHtmlForUserGroupsTable();
+        $this->assertContains(
+            '<td>usergroup&lt;</td>',
+            $html
+        );
+        $this->assertContains(
+            '<a class="" href="server_user_groups.php?'
+            . PMA_generate_common_url() . '&viewUsers=1&userGroup='
+            . urlencode('usergroup<') . '">',
+            $html
+        );
+        $this->assertContains(
+            '<a class="" href="server_user_groups.php?'
+            . PMA_generate_common_url() . '&editUserGroup=1&userGroup='
+            . urlencode('usergroup<') . '">',
+            $html
+        );
+        $this->assertContains(
+            '<a class="deleteUserGroup ajax" href="server_user_groups.php?'
+            . PMA_generate_common_url() . '&deleteUserGroup=1&userGroup='
+            . urlencode('usergroup<') . '">',
+            $html
+        );
+    }
+
+    /**
+     * Tests PMA_deleteUserGroup() function
+     *
+     * @return void
+     */
+    public function testDeleteUserGroup()
+    {
+        $userDelQuery = "DELETE FROM `pmadb`.`users`"
+            . " WHERE `usergroup`='ug'";
+        $userGrpDelQuery = "DELETE FROM `pmadb`.`usergroups`"
+            . " WHERE `usergroup`='ug'";
+
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->at(0))
+            ->method('query')
+            ->with($userDelQuery);
+        $dbi->expects($this->at(1))
+            ->method('query')
+            ->with($userGrpDelQuery);
+        $GLOBALS['dbi'] = $dbi;
+
+        PMA_deleteUserGroup('ug');
+    }
+
+    /**
+     * Tests PMA_getHtmlToEditUserGroup() function
+     *
+     * @return void
+     */
+    public function testGetHtmlToEditUserGroup()
+    {
+        // adding a user group
+        $html = PMA_getHtmlToEditUserGroup();
+        $this->assertContains(
+            '<input type="hidden" name="addUserGroupSubmit" value="1"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="userGroup"',
+            $html
+        );
+
+        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
+            . " WHERE `usergroup`='ug'";
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $dbi->expects($this->once())
+            ->method('tryQuery')
+            ->with($expectedQuery)
+            ->will($this->returnValue(true));
+        $dbi->expects($this->once())
+            ->method('fetchAssoc')
+            ->withAnyParameters()
+            ->will(
+                $this->returnValue(
+                    array(
+                        'usergroup' => 'ug',
+                        'server_sql' => 'Y',
+                        'server_databases' => 'N',
+                        'db_sql' => 'Y',
+                        'db_structure' => 'N',
+                        'table_sql' => 'Y',
+                        'table_browse' => 'N'
+                    )
+                )
+            );
+        $dbi->expects($this->once())
+            ->method('freeResult');
+        $GLOBALS['dbi'] = $dbi;
+
+        // editing a user group
+        $html = PMA_getHtmlToEditUserGroup('ug');
+        $this->assertContains(
+            '<input type="hidden" name="userGroup" value="ug"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="hidden" name="editUserGroupSubmit" value="1"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="hidden" name="editUserGroupSubmit" value="1"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="checkbox" class="checkall" checked="checked"'
+            . ' name="server_sql" value="Y" />',
+            $html
+        );
+        $this->assertContains(
+            '<input type="checkbox" class="checkall"'
+            . ' name="server_databases" value="Y" />',
+            $html
+        );
+    }
+}
+?>
\ No newline at end of file

From 8b5ebb87846103cb00fb6e93cbb2f81bf8b1e164 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 2 Aug 2013 12:30:33 +0530
Subject: [PATCH 2/3] Break different scenarios into different tests

---
 test/libraries/PMA_server_user_groups_test.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index de65fc58b9..575b0bfda6 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -34,16 +34,15 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Tests PMA_getHtmlForUserGroupsTable() function
+     * Tests PMA_getHtmlForUserGroupsTable() function when there are no user groups
      *
      * @return void
      */
-    public function testGetHtmlForUserGroupsTable()
+    public function testGetHtmlForUserGroupsTableWithNoUserGroups()
     {
         $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
             . " ORDER BY `usergroup` ASC";
 
-        // no user groups
         $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();
@@ -69,8 +68,18 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             . PMA_generate_common_url() . '&addUserGroup=1">',
             $html
         );
+    }
+
+    /**
+     * Tests PMA_getHtmlForUserGroupsTable() function when there are user groups
+     *
+     * @return void
+     */
+    public function testGetHtmlForUserGroupsTableWithUserGroups()
+    {
+        $expectedQuery = "SELECT * FROM `pmadb`.`usergroups`"
+            . " ORDER BY `usergroup` ASC";
 
-        // with user groups
         $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
             ->disableOriginalConstructor()
             ->getMock();

From 2f252cc83df1d8e2525537e900d800c51a6ec20f Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Fri, 2 Aug 2013 12:40:04 +0530
Subject: [PATCH 3/3] Fix failing tests

---
 test/libraries/PMA_server_user_groups_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index 575b0bfda6..0878b17de3 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -91,7 +91,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             ->method('numRows')
             ->withAnyParameters()
             ->will($this->returnValue(1));
-        $dbi->expects($this->at(0))
+        $dbi->expects($this->at(2))
             ->method('fetchAssoc')
             ->withAnyParameters()
             ->will(
@@ -107,7 +107,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
                     )
                 )
             );
-        $dbi->expects($this->at(1))
+        $dbi->expects($this->at(3))
             ->method('fetchAssoc')
             ->withAnyParameters()
             ->will($this->returnValue(false));