aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unittest for getAdminTags as well as CS and docblock fixes on it

Browse source
This commit is contained in:
Christian Weiske 2011-03-23 19:11:38 +01:00
parent 66c60880d2
commit cb28cd3371
2 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/SemanticScuttle/Service/Bookmark2Tag.php
View file

@ -454,7 +454,27 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
return $output; return $output;
} }
function &getAdminTags($limit = 30, $logged_on_user = NULL, $days = NULL) {
/**
* Returns the tags used by admin users
*
* @param integer $limit Number of tags to return
* @param integer $logged_on_user ID of the user that's currently logged in.
* If the logged in user equals the $user to find
* tags for, tags of private bookmarks are
* returned.
* @param integer $days Bookmarks have to be changed in the last X days
* if their tags shall count*
*
* @return array Array of found tags. Each tag entry is an array with two keys,
* 'tag' (tag name) and 'bCount'.
*
* @see getPopularTags()
*/
public function getAdminTags(
$limit = 30, $logged_on_user = null, $days = null
) {
// look for admin ids // look for admin ids
$userservice = SemanticScuttle_Service_Factory::get('User'); $userservice = SemanticScuttle_Service_Factory::get('User');
$adminIds = $userservice->getAdminIds(); $adminIds = $userservice->getAdminIds();
@ -463,6 +483,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
return $this->getPopularTags($adminIds, $limit, $logged_on_user, $days); return $this->getPopularTags($adminIds, $limit, $logged_on_user, $days);
} }
function &getContactTags($user, $limit = 30, $logged_on_user = NULL, $days = NULL) { function &getContactTags($user, $limit = 30, $logged_on_user = NULL, $days = NULL) {
// look for contact ids // look for contact ids
$userservice = SemanticScuttle_Service_Factory :: get('User'); $userservice = SemanticScuttle_Service_Factory :: get('User');
@ -477,6 +499,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
return $this->getPopularTags($contacts, $limit, $logged_on_user, $days); return $this->getPopularTags($contacts, $limit, $logged_on_user, $days);
} }
/** /**
* The the most popular tags and their usage count * The the most popular tags and their usage count
* *

20
tests/Bookmark2TagTest.php
View file

@ -56,6 +56,7 @@ class Bookmark2TagTest extends TestBase
protected function setUp() protected function setUp()
{ {
$this->us = SemanticScuttle_Service_Factory::get('User'); $this->us = SemanticScuttle_Service_Factory::get('User');
$this->us->deleteAll();
$this->bs = SemanticScuttle_Service_Factory::get('Bookmark'); $this->bs = SemanticScuttle_Service_Factory::get('Bookmark');
$this->bs->deleteAll(); $this->bs->deleteAll();
$this->b2ts= SemanticScuttle_Service_Factory::get('Bookmark2Tag'); $this->b2ts= SemanticScuttle_Service_Factory::get('Bookmark2Tag');
@ -447,6 +448,25 @@ class Bookmark2TagTest extends TestBase
$this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags);
$this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags);
} }
public function testGetAdminTags()
{
$admin1 = $this->addUser('admin1');
$admin2 = $this->addUser('admin2');
$user1 = $this->addUser();
$this->addBookmark($admin1, null, 0, array('admintag', 'admintag1'));
$this->addBookmark($admin2, null, 0, array('admintag', 'admintag2'));
$this->addBookmark($user1, null, 0, array('usertag'));
$GLOBALS['admin_users'] = array('admin1', 'admin2');
$arTags = $this->b2ts->getAdminTags(4);
$this->assertEquals(3, count($arTags));
$this->assertContains(array('tag' => 'admintag', 'bCount' => '2'), $arTags);
$this->assertContains(array('tag' => 'admintag1', 'bCount' => '1'), $arTags);
$this->assertContains(array('tag' => 'admintag2', 'bCount' => '1'), $arTags);
}
} }
if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') {