Remove unnecessary method prefixes.

diff --git a/framework/Share/test/Horde/Share/Base.php b/framework/Share/test/Horde/Share/Base.php
index 592ffcb..b5d37ca 100644 (file)
--- a/framework/Share/test/Horde/Share/Base.php
+++ b/framework/Share/test/Horde/Share/Base.php
@@ -21,7 +21,7 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertEquals('test', self::$share->getApp());
     }
 
-    public function baseAddShare()
+    public function addShare()
     {
         $share = self::$share->newShare('john', 'myshare');
         $share->set('name', 'My Share');
@@ -30,7 +30,7 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         return $share;
     }
 
-    public function basePermissions($myshareid)
+    public function permissions($myshareid)
     {
         // System share.
         $share = self::$share->newShare(null, 'systemshare');
@@ -72,7 +72,7 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         return array($myshareid, $janeshare->getId(), $groupshare->getId());
     }
 
-    public function baseExists()
+    public function exists()
     {
         // Getting shares from cache.
         $this->assertTrue(self::$share->exists('myshare'));
@@ -84,7 +84,7 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertTrue(self::$share->exists('myshare'));
     }
 
-    public function baseCountShares()
+    public function countShares()
     {
         // Getting shares from cache.
         $this->assertEquals(4, self::$share->countShares('john'));
@@ -98,7 +98,7 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertEquals(2, self::$share->countShares('john', Horde_Perms::EDIT));
     }
 
-    public function baseGetShare()
+    public function getShare()
     {
         // Getting shares from cache.
         $share = self::$share->getShare('myshare');
@@ -114,19 +114,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         return array($share, self::$share->getShare('janeshare'), self::$share->getShare('groupshare'));
     }
 
-    public function baseGetShareById(array $shares)
+    public function getShareById(array $shares)
     {
         // Getting shares from cache.
-        $this->_baseGetShareById($shares);
+        $this->_getShareById($shares);
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseGetShareById($shares);
+        $this->_getShareById($shares);
     }
 
-    protected function _baseGetShareById(array $shares)
+    protected function _getShareById(array $shares)
     {
         $newshare = self::$share->getShareById($shares[0]->getId());
         $this->assertInstanceOf('Horde_Share_Object', $newshare);
@@ -139,19 +139,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertEquals($shares[2], $newshare);
     }
 
-    public function baseGetShares(array $shares)
+    public function getShares(array $shares)
     {
         // Getting shares from cache.
-        $this->_baseGetShares($shares);
+        $this->_getShares($shares);
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseGetShares($shares);
+        $this->_getShares($shares);
     }
 
-    protected function _baseGetShares(array $shares)
+    protected function _getShares(array $shares)
     {
         $newshares = self::$share->getShares(array($shares[0]->getId(), $shares[1]->getId(), $shares[2]->getId()));
         $this->assertType('array', $newshares);
@@ -167,19 +167,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertEquals($newshares['groupshare'], $shares[2]);
     }
 
-    public function baseListAllShares()
+    public function listAllShares()
     {
         // Getting shares from cache.
-        $this->_baseListAllShares();
+        $this->_listAllShares();
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseListAllShares();
+        $this->_listAllShares();
     }
 
-    protected function _baseListAllShares()
+    protected function _listAllShares()
     {
         $shares = self::$share->listAllShares();
         $this->assertType('array', $shares);
@@ -191,19 +191,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertArrayHasKey('noshare', $shares);
     }
 
-    public function baseListShares(array $shareids)
+    public function listShares(array $shareids)
     {
         // Getting shares from cache.
-        $this->_baseListShares($shareids);
+        $this->_listShares($shareids);
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseListShares($shareids);
+        $this->_listShares($shareids);
     }
 
-    public function _baseListShares(array $shareids)
+    public function _listShares(array $shareids)
     {
         // Default listing.
         $shares = self::$share->listShares('john');
@@ -266,19 +266,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertEquals($shareids[1], $shares[0]->getId());
     }
 
-    public function baseListSystemShares()
+    public function listSystemShares()
     {
         // Getting shares from cache.
-        $this->_baseListSystemShares();
+        $this->_listSystemShares();
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseListSystemShares();
+        $this->_listSystemShares();
     }
 
-    public function _baseListSystemShares()
+    public function _listSystemShares()
     {
         $shares = self::$share->listSystemShares();
         $this->assertType('array', $shares);
@@ -286,19 +286,19 @@ class Horde_Share_Test_Base extends Horde_Test_Case
         $this->assertArrayHasKey('systemshare', $shares);
     }
 
-    public function baseRemoveShare(array $share)
+    public function removeShare(array $share)
     {
         // Getting shares from cache.
-        $this->_baseRemoveShare($share);
+        $this->_removeShare($share);
 
         // Reset cache.
         self::$share->resetCache();
 
         // Getting shares from backend.
-        $this->_baseRemoveShare($share);
+        $this->_removeShare($share);
     }
 
-    public function _baseRemoveShare(array $share)
+    public function _removeShare(array $share)
     {
         self::$share->removeShare($share[0]);
         try {

diff --git a/framework/Share/test/Horde/Share/Sql/Base.php b/framework/Share/test/Horde/Share/Sql/Base.php
index c3cd355..7787705 100644 (file)
--- a/framework/Share/test/Horde/Share/Sql/Base.php
+++ b/framework/Share/test/Horde/Share/Sql/Base.php
@@ -32,7 +32,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
 
     public function testAddShare()
     {
-        $share = parent::baseAddShare();
+        $share = parent::addShare();
         $this->assertInstanceOf('Horde_Share_Object_Sql', $share);
         return $share->getId();
     }
@@ -42,7 +42,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testPermissions($myshareid)
     {
-        return parent::basePermissions($myshareid);
+        return parent::permissions($myshareid);
     }
 
     /**
@@ -50,7 +50,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testExists()
     {
-        parent::baseExists();
+        parent::exists();
     }
 
     /**
@@ -58,7 +58,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testCountShares()
     {
-        parent::baseCountShares();
+        parent::countShares();
     }
 
     /**
@@ -66,7 +66,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testGetShare()
     {
-        $shares = parent::baseGetShare();
+        $shares = parent::getShare();
         $this->assertInstanceOf('Horde_Share_Object_Sql', $shares[0]);
         $this->assertInstanceOf('Horde_Share_Object_Sql', $shares[1]);
         $this->assertInstanceOf('Horde_Share_Object_Sql', $shares[2]);
@@ -78,7 +78,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testGetShareById(array $shares)
     {
-        parent::baseGetShareById($shares);
+        parent::getShareById($shares);
     }
 
     /**
@@ -86,7 +86,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testGetShares(array $shares)
     {
-        parent::baseGetShares($shares);
+        parent::getShares($shares);
     }
 
     /**
@@ -94,7 +94,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testListAllShares()
     {
-        parent::baseListAllShares();
+        parent::listAllShares();
     }
 
     /**
@@ -102,7 +102,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testListShares(array $shareids)
     {
-        parent::baseListShares($shareids);
+        parent::listShares($shareids);
     }
 
     /**
@@ -110,7 +110,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testListSystemShares()
     {
-        parent::baseListSystemShares();
+        parent::listSystemShares();
     }
 
     /**
@@ -118,7 +118,7 @@ class Horde_Share_Test_Sql_Base extends Horde_Share_Test_Base
      */
     public function testRemoveShare(array $share)
     {
-        parent::baseRemoveShare($share);
+        parent::removeShare($share);
     }
 
     public static function setUpBeforeClass()

diff --git a/framework/Share/test/Horde/Share/SqlHierarchical/Base.php b/framework/Share/test/Horde/Share/SqlHierarchical/Base.php
index 7464d39..7f4ad25 100644 (file)
--- a/framework/Share/test/Horde/Share/SqlHierarchical/Base.php
+++ b/framework/Share/test/Horde/Share/SqlHierarchical/Base.php
@@ -32,7 +32,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
 
     public function testAddShare()
     {
-        $share = parent::baseAddShare();
+        $share = parent::addShare();
         $this->assertInstanceOf('Horde_Share_Object_Sql_Hierarchical', $share);
         return $share->getId();
     }
@@ -42,7 +42,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testPermissions($myshareid)
     {
-        $shareids = parent::basePermissions($myshareid);
+        $shareids = parent::permissions($myshareid);
         return array(self::$share->getShareById($shareids[0]),
                      self::$share->getShareById($shareids[1]),
                      self::$share->getShareById($shareids[2]));
@@ -61,7 +61,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testCountShares()
     {
-        parent::baseCountShares();
+        parent::countShares();
     }
 
     /**
@@ -71,7 +71,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testGetShare()
     {
-        parent::baseGetShare();
+        parent::getShare();
     }
 
     /**
@@ -79,7 +79,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testGetShareById(array $shares)
     {
-        parent::baseGetShareById($shares);
+        parent::getShareById($shares);
     }
 
     /**
@@ -124,7 +124,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testListShares(array $shareids)
     {
-        parent::baseListShares(array($shareids[0]->getId(), $shareids[1]->getId(), $shareids[2]->getId()));
+        parent::listShares(array($shareids[0]->getId(), $shareids[1]->getId(), $shareids[2]->getId()));
     }
 
     /**
@@ -140,7 +140,7 @@ class Horde_Share_Test_SqlHierarchical_Base extends Horde_Share_Test_Base
      */
     public function testRemoveShare(array $share)
     {
-        parent::baseRemoveShare($share);
+        parent::removeShare($share);
     }
 
     public static function setUpBeforeClass()