From 3465975ee730bc91535a463ded35d40d8473eef4 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Wed, 1 Apr 2009 07:22:15 +0000 Subject: [PATCH] Adapt testing to the new object class structure. --- .../Kolab_Server/lib/Horde/Kolab/Server/Test.php | 7 +-- .../Kolab_Server/lib/Horde/Kolab/Test/Server.php | 53 +++++++++++----------- .../test/Horde/Kolab/Server/AddingObjectsTest.php | 2 +- .../test/Horde/Kolab/Server/AdminTest.php | 6 +-- .../Horde/Kolab/Server/DistListHandlingTest.php | 2 +- .../test/Horde/Kolab/Server/GroupHandlingTest.php | 12 ++--- .../test/Horde/Kolab/Server/GroupTest.php | 6 +-- .../test/Horde/Kolab/Server/ObjectTest.php | 6 +-- .../test/Horde/Kolab/Server/ServerTest.php | 18 ++++---- .../test/Horde/Kolab/Server/TestTest.php | 50 ++++++++++---------- .../test/Horde/Kolab/Server/UserTest.php | 10 ++-- 11 files changed, 88 insertions(+), 84 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php index 8406258db..6e8332d3d 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php @@ -25,7 +25,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Server */ -class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap +class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Kolab { /** @@ -527,7 +527,8 @@ class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap $this->data[$dn] = array( 'dn' => $dn, - 'data' => $ldap_data + 'data' => array_merge($ldap_data, + array('dn' => $dn)), ); $this->store(); } @@ -614,7 +615,7 @@ class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap foreach ($result as $entry) { $t = $entry['data']; $t['dn'] = $entry['dn']; - $data[] = $t; + $data[$entry['dn']] = $t; } return $data; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php index 34312e97d..9093432f6 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Test/Server.php @@ -106,10 +106,10 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase $world['result']['add'] = $world['server']->add($this->provideDistributionList()); break; case 'listing all users': - $world['list'] = $world['server']->listObjects('Horde_Kolab_Server_Object_user'); + $world['list'] = $world['server']->listObjects('Horde_Kolab_Server_Object_Kolab_User'); break; case 'listing all groups': - $world['list'] = $world['server']->listObjects('Horde_Kolab_Server_Object_group'); + $world['list'] = $world['server']->listObjects('Horde_Kolab_Server_Object_Kolabgroupofnames'); break; case 'listing all objects of type': $world['list'] = $world['server']->listObjects($arguments[0]); @@ -271,14 +271,13 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase * * @return Horde_Kolab_Server The empty server. */ - public function &prepareEmptyKolabServer($type = 'test') + public function &prepareEmptyKolabServer($type = 'Test') { global $conf; /** Prepare a Kolab test server */ $conf['kolab']['server']['driver'] = $type; $conf['kolab']['server']['params']['basedn'] = 'dc=example,dc=org'; - $conf['kolab']['server']['params']['data'] = array(); if ($type == 'file') { $conf['kolab']['server']['params']['file'] = Horde::getTempFile('fileTest'); @@ -309,7 +308,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase * * @return Horde_Kolab_Server The empty server. */ - public function &prepareBasicServer($type = 'test') + public function &prepareBasicServer($type = 'Test') { $server = $this->prepareEmptyKolabServer($type); $this->prepareUsers($server); @@ -367,7 +366,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('givenName' => 'Gunnar', 'sn' => 'Wrobel', - 'type' => 'Horde_Kolab_Server_Object_user', + 'type' => 'Horde_Kolab_Server_Object_Kolab_User', 'mail' => 'wrobel@example.org', 'uid' => 'wrobel', 'userPassword' => 'none', @@ -389,7 +388,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('givenName' => 'Test', 'sn' => 'Test', - 'type' => 'Horde_Kolab_Server_Object_user', + 'type' => 'Horde_Kolab_Server_Object_Kolab_User', 'mail' => 'test@example.org', 'uid' => 'test', 'userPassword' => 'test', @@ -409,7 +408,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('givenName' => 'Test', 'sn' => 'Address', - 'type' => 'Horde_Kolab_Server_Object_address', + 'type' => 'Horde_Kolab_Server_Object_Kolab_Address', 'mail' => 'address@example.org'); } @@ -423,7 +422,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase return array('sn' => 'Administrator', 'givenName' => 'The', 'uid' => 'admin', - 'type' => 'Horde_Kolab_Server_Object_administrator', + 'type' => 'Horde_Kolab_Server_Object_Kolab_Administrator', 'userPassword' => 'none'); } @@ -437,7 +436,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase return array('sn' => 'Tainer', 'givenName' => 'Main', 'uid' => 'maintainer', - 'type' => 'Horde_Kolab_Server_Object_maintainer', + 'type' => 'Horde_Kolab_Server_Object_Kolab_Maintainer', 'userPassword' => 'none', ); } @@ -452,7 +451,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase return array('sn' => 'Maintainer', 'givenName' => 'Domain', 'uid' => 'domainmaintainer', - 'type' => 'Horde_Kolab_Server_Object_domainmaintainer', + 'type' => 'Horde_Kolab_Server_Object_Kolab_Domainmaintainer', 'userPassword' => 'none', 'domain' => array('example.com'), ); @@ -467,7 +466,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('cn' => 'shared@example.org', 'kolabHomeServer' => 'example.org', - 'type' => 'Horde_Kolab_Server_Object_sharedfolder'); + 'type' => 'Horde_Kolab_Server_Object_Kolabsharedfolder'); } /** @@ -478,7 +477,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase public function provideBasicGroupOne() { return array('mail' => 'empty.group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group'); + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames'); } /** @@ -489,7 +488,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase public function provideBasicGroupTwo() { return array('mail' => 'group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', 'member' => array('cn=Test Test,dc=example,dc=org', 'cn=Gunnar Wrobel,dc=example,dc=org')); } @@ -497,7 +496,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase public function provideDistributionList() { return array('mail' => 'distlist@example.org', - 'type' => 'Horde_Kolab_Server_Object_distlist', + 'type' => 'Horde_Kolab_Server_Object_Kolab_Distlist', 'member' => array('cn=Test Test,dc=example,dc=org', 'cn=Gunnar Wrobel,dc=example,dc=org')); } @@ -506,7 +505,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('givenName' => 'Test', 'sn' => 'Test', - 'type' => 'Horde_Kolab_Server_Object_user', + 'type' => 'Horde_Kolab_Server_Object_Kolab_User', 'mail' => 'test@example.org'); } @@ -514,7 +513,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('sn' => 'Test', 'userPassword' => 'none', - 'type' => 'Horde_Kolab_Server_Object_user', + 'type' => 'Horde_Kolab_Server_Object_Kolab_User', 'mail' => 'test@example.org'); } @@ -522,7 +521,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array('givenName' => 'Test', 'userPassword' => 'none', - 'type' => 'Horde_Kolab_Server_Object_user', + 'type' => 'Horde_Kolab_Server_Object_Kolab_User', 'mail' => 'test@example.org'); } @@ -531,7 +530,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase return array('givenName' => 'Test', 'sn' => 'Test', 'userPassword' => 'none', - 'type' => 'Horde_Kolab_Server_Object_user'); + 'type' => 'Horde_Kolab_Server_Object_Kolab_User'); } public function provideInvalidUsers() @@ -619,14 +618,14 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase ), array( array('mail' => 'group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', 'member' => array('cn=Test Test,dc=example,dc=org', 'cn=Gunnar Wrobel,dc=example,dc=org') ), ), array( array('mail' => 'group2@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', 'member' => array('cn=Gunnar Wrobel,dc=example,dc=org') ), ), @@ -637,7 +636,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase { return array( array('cn' => 'Shared', - 'type' => 'Horde_Kolab_Server_Object_sharedfolder' + 'type' => 'Horde_Kolab_Server_Object_Kolabsharedfolder' ), ); } @@ -645,7 +644,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase public function validGroupWithoutMembers() { return array('mail' => 'empty.group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', ); } @@ -660,7 +659,7 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase return array( array( array( - array('type' => 'Horde_Kolab_Server_Object_group', + array('type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', 'mail' => 'empty.group@example.org', ), ) @@ -668,19 +667,19 @@ class Horde_Kolab_Test_Server extends PHPUnit_Extensions_Story_TestCase array( array( array('mail' => 'empty.group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', ), ), array( array('mail' => 'group@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupnames', 'member' => array('cn=Test Test,dc=example,dc=org', 'cn=Gunnar Wrobel,dc=example,dc=org') ), ), array( array('mail' => 'group2@example.org', - 'type' => 'Horde_Kolab_Server_Object_group', + 'type' => 'Horde_Kolab_Server_Object_Kolabgroupofnames', 'member' => array('cn=Gunnar Wrobel,dc=example,dc=org') ), ), diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php index abc6e21a0..718a922b8 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AddingObjectsTest.php @@ -46,6 +46,6 @@ class Horde_Kolab_Server_AddingObjectsTest extends Horde_Kolab_Test_Server { $this->given('an empty Kolab server') ->when('adding a Kolab server object', $user) - ->then('the result should be an object of type', 'Horde_Kolab_Server_Object_user'); + ->then('the result should be an object of type', 'Horde_Kolab_Server_Object_Kolab_User'); } } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php index f23992840..99519328f 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/AdminTest.php @@ -64,7 +64,7 @@ class Horde_Kolab_Server_AdminTest extends Horde_Kolab_Test_Server { $admin = $this->provideBasicAdmin(); $this->assertNoError($admin); - $uid = $this->ldap->generateUid('Horde_Kolab_Server_Object_administrator', $admin); + $uid = $this->ldap->generateUid('Horde_Kolab_Server_Object_Kolab_Administrator', $admin); $this->assertNoError($uid); $this->assertEquals('cn=The Administrator,dc=example,dc=org', $uid); } @@ -91,7 +91,7 @@ class Horde_Kolab_Server_AdminTest extends Horde_Kolab_Test_Server $admin = $this->ldap->fetch('cn=The Administrator,dc=example,dc=org'); $this->assertNoError($admin); - $this->assertEquals('Horde_Kolab_Server_Object_administrator', + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_Administrator', get_class($admin)); } @@ -127,7 +127,7 @@ class Horde_Kolab_Server_AdminTest extends Horde_Kolab_Test_Server $this->assertNoError($entries); $this->assertEquals(1, count($entries)); - $list = $this->ldap->listObjects('Horde_Kolab_Server_Object_administrator'); + $list = $this->ldap->listObjects('Horde_Kolab_Server_Object_Kolab_Administrator'); $this->assertNoError($list); $this->assertEquals(1, count($list)); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php index b72f48ad1..0b114eec0 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/DistListHandlingTest.php @@ -47,7 +47,7 @@ class Horde_Kolab_Server_DistListHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding a distribution list') ->then('the result should be an object of type', - 'Horde_Kolab_Server_Object_distlist'); + 'Horde_Kolab_Server_Object_Kolab_Distlist'); } } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php index 269008184..086b3f66c 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupHandlingTest.php @@ -45,7 +45,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server { $this->given('an empty Kolab server') ->when('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('the list is an empty array'); } @@ -64,7 +64,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding an object list', $group_list) ->and('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('the result indicates success.') ->and('the list has a number of entries equal to', count($group_list)); @@ -85,7 +85,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding an object list', $group_list) ->and('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('the provided list and the result list match with regard to these attributes', 'mail', 'id', $group_list); } @@ -105,7 +105,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding an object list', $group_list) ->and('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('the provided list and the result list match with regard to these attributes', 'mail', 'mail', $group_list); } @@ -125,7 +125,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding an object list', $group_list) ->and('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('each element in the result list has an attribute', 'visible'); } @@ -157,7 +157,7 @@ class Horde_Kolab_Server_GroupHandlingTest extends Horde_Kolab_Test_Server $this->given('an empty Kolab server') ->when('adding an object', $this->validGroupWithoutMembers()) ->and('retrieving a hash list with all objects of type', - 'Horde_Kolab_Server_Object_group') + 'Horde_Kolab_Server_Object_Kolabgroupofnames') ->then('each element in the result list has an attribute set to a given value', 'visible', true); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php index 988d36673..31cfdaa21 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/GroupTest.php @@ -66,7 +66,7 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server { $groups = $this->validGroups(); $this->assertEquals('cn=empty.group@example.org,dc=example,dc=org', - $this->ldap->generateUid('Horde_Kolab_Server_Object_group', $groups[0][0])); + $this->ldap->generateUid('Horde_Kolab_Server_Object_Kolabgroupofnames', $groups[0][0])); } /** @@ -80,7 +80,7 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server $group = $this->ldap->fetch('cn=empty.group@example.org,dc=example,dc=org'); $this->assertNoError($group); - $this->assertEquals('Horde_Kolab_Server_Object_group', get_class($group)); + $this->assertEquals('Horde_Kolab_Server_Object_Kolabgroupofnames', get_class($group)); } /** @@ -129,7 +129,7 @@ class Horde_Kolab_Server_GroupTest extends Horde_Kolab_Test_Server $result = $result->as_struct(); $this->assertEquals(3, count($result)); - $list = $this->ldap->listObjects('Horde_Kolab_Server_Object_group'); + $list = $this->ldap->listObjects('Horde_Kolab_Server_Object_Kolabgroupofnames'); $this->assertNoError($list); $this->assertEquals(3, count($list)); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php index d2cf23ca8..4e5d13488 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ObjectTest.php @@ -86,7 +86,7 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server public function testConstructDn($dn, $data, $expect) { $ko = &new Horde_Kolab_Server_Object($this->_dummydb, $dn, $data); - $ndn = $ko->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_UID); + $ndn = $ko->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_UID); $this->assertNoError($ndn); $this->assertEquals($expect, $ndn); } @@ -119,10 +119,10 @@ class Horde_Kolab_Server_ObjectTest extends Horde_Kolab_Test_Server */ public function testGetFn($data, $expect) { - $ko = &Horde_Kolab_Server_Object::factory('Horde_Kolab_Server_Object_user', + $ko = &Horde_Kolab_Server_Object::factory('Horde_Kolab_Server_Object_Kolab_User', null, $this->_dummydb, $data); $this->assertNoError($ko); - $ndn = $ko->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_FN); + $ndn = $ko->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_FN); $this->assertNoError($ndn); $this->assertEquals($expect, $ndn); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php index 6a532d235..3fe0fb2c9 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php @@ -37,12 +37,12 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase * * @return NULL */ -/* public function testGenerateUid() */ -/* { */ -/* $ks = &Horde_Kolab_Server::factory('none'); */ -/* $uid = $ks->generateUid('Horde_Kolab_Server_Object', array()); */ -/* $this->assertEquals($uid, ''); */ -/* } */ + public function testGenerateUid() + { + $ks = &Horde_Kolab_Server::factory('none'); + $uid = $ks->generateUid('Horde_Kolab_Server_Object', array()); + $this->assertEquals(preg_replace('/[0-9a-f]*/', '', $uid), ''); + } /** * Test creating the server object. @@ -71,11 +71,11 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase { $ks = &Horde_Kolab_Server::factory('none'); $user = $ks->fetch('test'); - $this->assertEquals('Horde_Kolab_Server_Object_user', get_class($user)); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_User', get_class($user)); $ks = &Horde_Kolab_Server::factory('none', array('uid' => 'test')); $user = $ks->fetch(); - $this->assertEquals('Horde_Kolab_Server_Object_user', get_class($user)); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_User', get_class($user)); } /** @@ -134,7 +134,7 @@ class Horde_Kolab_Server_None extends Horde_Kolab_Server */ protected function determineType($uid) { - return 'Horde_Kolab_Server_Object_user'; + return 'Horde_Kolab_Server_Object_Kolab_User'; } /** diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php index e200f3e25..f1e46c4e4 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php @@ -44,13 +44,18 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server { $server = &$this->prepareBasicServer($type); - $result = $server->search('(objectClass=top)', array('objectClass')); + $result = $server->search( + '(' . Horde_Kolab_Server_Object::ATTRIBUTE_OC + . '=' . Horde_Kolab_Server_Object::OBJECTCLASS_TOP . ')', + array(Horde_Kolab_Server_Object::ATTRIBUTE_OC)); $result = $result->as_struct(); $this->assertEquals(13, count($result)); - $result = $server->search('(objectClass=top)', - array('objectClass'), - 'cn=internal,dc=example,dc=org'); + $result = $server->search( + '(' . Horde_Kolab_Server_Object::ATTRIBUTE_OC + . '=' . Horde_Kolab_Server_Object::OBJECTCLASS_TOP . ')', + array(Horde_Kolab_Server_Object::ATTRIBUTE_OC), + 'cn=internal,dc=example,dc=org'); $result = $result->as_struct(); $this->assertNoError($result); $this->assertEquals(4, count($result)); @@ -98,28 +103,28 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server $filter = '(&(objectClass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))'; $attributes = array( - Horde_Kolab_Server_Object_base::ATTRIBUTE_SN, - Horde_Kolab_Server_Object_base::ATTRIBUTE_CN, - Horde_Kolab_Server_Object::ATTRIBUTE_UID, - Horde_Kolab_Server_Object_base::ATTRIBUTE_MAIL, - Horde_Kolab_Server_Object_base::ATTRIBUTE_DELETED, + Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_SN, + Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_CN, + Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_UID, + Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_MAIL, + Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_DELETED, ); - $sort = Horde_Kolab_Server_Object_base::ATTRIBUTE_SN; + $sort = Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_SN; $result = $server->search($filter); $result = $result->as_struct(); $this->assertNoError($result); $this->assertEquals(2, count($result)); - $result = $server->listObjects('Horde_Kolab_Server_Object_user'); + $result = $server->listObjects('Horde_Kolab_Server_Object_Kolab_User'); $this->assertNoError($result); $this->assertEquals(2, count($result)); - $this->assertEquals('Horde_Kolab_Server_Object_user', get_class(array_shift($result))); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_User', get_class(array_shift($result))); - $result = $server->listObjects('Horde_Kolab_Server_Object_sharedfolder'); + $result = $server->listObjects('Horde_Kolab_Server_Object_Kolabsharedfolder'); $this->assertNoError($result); $this->assertEquals(1, count($result)); - $this->assertEquals('Horde_Kolab_Server_Object_sharedfolder', get_class(array_shift($result))); + $this->assertEquals('Horde_Kolab_Server_Object_Kolabsharedfolder', get_class(array_shift($result))); } /** @@ -137,7 +142,6 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server $this->assertNoError($classes); $this->assertContains('top', $classes); $this->assertContains('kolabinetorgperson', $classes); - $this->assertContains('hordeperson', $classes); try { $classes = $server->getObjectClasses('cn=DOES NOT EXIST,dc=example,dc=org'); @@ -164,31 +168,31 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server $type = $server->determineType('cn=empty.group@example.org,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_group', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolabgroupofnames', $type); $type = $server->determineType('cn=shared@example.org,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_sharedfolder', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolabsharedfolder', $type); $type = $server->determineType('cn=The Administrator,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_administrator', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_Administrator', $type); $type = $server->determineType('cn=Main Tainer,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_maintainer', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_Maintainer', $type); $type = $server->determineType('cn=Domain Maintainer,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_domainmaintainer', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_Domainmaintainer', $type); $type = $server->determineType('cn=Test Address,cn=external,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_address', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_Address', $type); $type = $server->determineType('cn=Gunnar Wrobel,dc=example,dc=org'); $this->assertNoError($type); - $this->assertEquals('Horde_Kolab_Server_Object_user', $type); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_User', $type); } /** @@ -282,7 +286,7 @@ class Horde_Kolab_Server_testTest extends Horde_Kolab_Test_Server $testuser = $server->fetch('cn=Test Test,dc=example,dc=org'); $this->assertNoError($testuser); $this->assertContains('wrobel@example.org', - $testuser->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_DELEGATE, false)); + $testuser->get(Horde_Kolab_Server_Object_Kolabinetorgperson::ATTRIBUTE_DELEGATE, false)); $this->assertNoError($addrs); $this->assertContains('wrobel@example.org', $addrs); diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php index ad4cb3573..dd450749c 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/UserTest.php @@ -56,10 +56,10 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server { $users = $this->validUsers(); $this->assertEquals('Gunnar Wrobel', - Horde_Kolab_Server_Object_user::generateId($users[0][0])); + Horde_Kolab_Server_Object_Kolab_User::generateId($users[0][0])); $this->assertEquals('cn=Gunnar Wrobel,dc=example,dc=org', - $this->server->generateUid('Horde_Kolab_Server_Object_user', + $this->server->generateUid('Horde_Kolab_Server_Object_Kolab_User', $users[0][0])); } @@ -84,8 +84,8 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server public function testFetchUser() { $user = $this->server->fetch('cn=Gunnar Wrobel,dc=example,dc=org'); - $this->assertEquals('Horde_Kolab_Server_Object_user', get_class($user)); - $this->assertEquals('Gunnar Wrobel', $user->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_FNLN)); + $this->assertEquals('Horde_Kolab_Server_Object_Kolab_User', get_class($user)); + $this->assertEquals('Gunnar Wrobel', $user->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_FNLN)); } /** @@ -104,7 +104,7 @@ class Horde_Kolab_Server_UserTest extends Horde_Kolab_Test_Server $this->assertEquals('home.example.org', $imap); $user = $this->server->fetch('cn=Gunnar Wrobel,dc=example,dc=org'); - $attr = $user->get(Horde_Kolab_Server_Object_base::ATTRIBUTE_FREEBUSYHOST); + $attr = $user->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_FREEBUSYHOST); if (is_a($attr, 'PEAR_Error')) { $this->assertEquals('', $attr->getMessage()); } -- 2.11.0