Преглед на файлове

Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581]

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17682 44c647ce-9c0f-0410-b52a-842ac1e357ba
alexander преди 16 години
родител
ревизия
2a54f3600f

+ 7 - 1
tests/Zend/Amf/AuthTest.php

@@ -38,7 +38,12 @@ require_once 'Zend/Acl.php';
 require_once 'Zend/Acl/Role.php';
 
 /**
- *  test case.
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
  */
 class Zend_Amf_AuthTest extends PHPUnit_Framework_TestCase
 {
@@ -341,3 +346,4 @@ class Zend_Amf_Auth_testclass_NoAcl {
 if (PHPUnit_MAIN_METHOD == "Zend_Amf_AuthTest::main") {
     Zend_Amf_AuthTest::main();
 }
+

+ 7 - 0
tests/Zend/Amf/Contact.php

@@ -22,6 +22,12 @@
 
 /**
  * Test Class for class mapping tests.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Contact
 {
@@ -37,3 +43,4 @@ class Contact
         return 'ContactVO';
     }
 }
+

+ 7 - 1
tests/Zend/Amf/ContactVO.php

@@ -23,6 +23,11 @@
 /**
  * Test Class for returning the name of the php class to flex.
  *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group ZF-6130
  */
 class ContactVO
@@ -33,4 +38,5 @@ class ContactVO
   public $email = "";
   public $mobile = "";
 
-}
+}
+

+ 6 - 1
tests/Zend/Amf/RequestTest.php

@@ -34,8 +34,12 @@ require_once 'Contact.php';
 /**
  * Test case for Zend_Amf_Request
  *
- * @package Zend_Amf
+ * @category   Zend
+ * @package    Zend_Amf
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
  */
 class Zend_Amf_RequestTest extends PHPUnit_Framework_TestCase
 {
@@ -663,3 +667,4 @@ class Zend_Amf_RequestTest extends PHPUnit_Framework_TestCase
 if (PHPUnit_MAIN_METHOD == 'Zend_Amf_RequestTest::main') {
     Zend_Amf_RequestTest::main();
 }
+

+ 7 - 1
tests/Zend/Amf/ResourceTest.php

@@ -33,7 +33,12 @@ require_once 'Zend/Amf/Parse/TypeLoader.php';
 require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
 
 /**
- *  test case.
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
  */
 class Zend_Amf_ResourceTest extends PHPUnit_Framework_TestCase
 {
@@ -190,3 +195,4 @@ class Zend_Amf_TestResourceLoader implements Zend_Loader_PluginLoader_Interface
 if (PHPUnit_MAIN_METHOD == "Zend_Amf_ResourceTest::main") {
     Zend_Amf_ResourceTest::main();
 }
+

+ 8 - 0
tests/Zend/Amf/Resources/StreamContext.php

@@ -20,6 +20,13 @@
  * @version    $Id$
  */
 
+/**
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class Zend_Amf_Parse_Resource_StreamContext
 {
     public function parse($resource)
@@ -27,3 +34,4 @@ class Zend_Amf_Parse_Resource_StreamContext
         return stream_context_get_options($resource);
     }
 }
+

+ 6 - 1
tests/Zend/Amf/ResponseTest.php

@@ -38,8 +38,12 @@ require_once 'Zend/Date.php';
 /**
  * Test case for Zend_Amf_Response
  *
- * @package Zend_Amf
+ * @category   Zend
+ * @package    Zend_Amf
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
  */
 class Zend_Amf_ResponseTest extends PHPUnit_Framework_TestCase
 {
@@ -1060,3 +1064,4 @@ class TestObject {
 if (PHPUnit_MAIN_METHOD == 'Zend_Amf_ResponseTest::main') {
     Zend_Amf_ResponseTest::main();
 }
+

+ 4 - 0
tests/Zend/Cache/ZendServerDiskTest.php

@@ -37,8 +37,12 @@ require_once 'CommonBackendTest.php';
 require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
+ * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Cache
  */
 class Zend_Cache_ZendServerDiskTest extends Zend_Cache_CommonBackendTest {
 

+ 4 - 0
tests/Zend/Cache/ZendServerShMemTest.php

@@ -37,8 +37,12 @@ require_once 'CommonBackendTest.php';
 require_once 'PHPUnit/Framework/TestCase.php';
 
 /**
+ * @category   Zend
  * @package    Zend_Cache
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Cache
  */
 class Zend_Cache_ZendServerShMemTest extends Zend_Cache_CommonBackendTest {
 

+ 10 - 4
tests/Zend/Gdata/Health/ProfileEntryTest.php

@@ -13,19 +13,24 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Gdata
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 require_once 'Zend/Gdata/Health.php';
 require_once 'Zend/Gdata/Health/ProfileEntry.php';
 
 /**
- * @package Zend_Gdata
+ * @category   Zend
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Gdata
+ * @group      Zend_Gdata_Health
  */
 class Zend_Gdata_Health_ProfileEntryTest extends PHPUnit_Framework_TestCase
 {
@@ -134,3 +139,4 @@ class Zend_Gdata_Health_ProfileEntryTest extends PHPUnit_Framework_TestCase
         }
     }
 }
+

+ 10 - 4
tests/Zend/Gdata/Health/ProfileFeedTest.php

@@ -13,11 +13,11 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Gdata
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 require_once 'Zend/Gdata/Health.php';
@@ -25,8 +25,13 @@ require_once 'Zend/Gdata/Health/ProfileFeed.php';
 require_once 'Zend/Gdata/Health/ProfileEntry.php';
 
 /**
- * @package Zend_Gdata
+ * @category   Zend
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Gdata
+ * @group      Zend_Gdata_Health
  */
 class Zend_Gdata_Health_ProfileFeedTest extends PHPUnit_Framework_TestCase
 {
@@ -116,3 +121,4 @@ class Zend_Gdata_Health_ProfileFeedTest extends PHPUnit_Framework_TestCase
         }
     }
 }
+

+ 10 - 4
tests/Zend/Gdata/Health/ProfileListEntryTest.php

@@ -13,19 +13,24 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Gdata
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 require_once 'Zend/Gdata/Health.php';
 require_once 'Zend/Gdata/Health/ProfileListEntry.php';
 
 /**
- * @package Zend_Gdata
+ * @category   Zend
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Gdata
+ * @group      Zend_Gdata_Health
  */
 class Zend_Gdata_Health_ProfileListEntryTest extends PHPUnit_Framework_TestCase
 {
@@ -56,3 +61,4 @@ class Zend_Gdata_Health_ProfileListEntryTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('profile name', $this->entry->getProfileName());
     }
 }
+

+ 10 - 4
tests/Zend/Gdata/Health/QueryTest.php

@@ -13,11 +13,11 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Gdata
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 require_once 'Zend/Gdata/Health.php';
@@ -25,8 +25,13 @@ require_once 'Zend/Gdata/Health/Query.php';
 require_once 'Zend/Http/Client.php';
 
 /**
- * @package Zend_Gdata
+ * @category   Zend
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Gdata
+ * @group      Zend_Gdata_Health
  */
 class Zend_Gdata_Health_QueryTest extends PHPUnit_Framework_TestCase
 {
@@ -146,3 +151,4 @@ class Zend_Gdata_Health_QueryTest extends PHPUnit_Framework_TestCase
     }
 
 }
+

+ 11 - 4
tests/Zend/Gdata/HealthOnlineTest.php

@@ -1,3 +1,4 @@
+<<<<<<< .working
 <?php
 /**
  * Zend Framework
@@ -13,11 +14,11 @@
  * to license@zend.com so we can send you a copy immediately.
  *
  * @category   Zend
- * @package    Zend_Gdata
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 require_once 'Zend/Gdata/Health.php';
@@ -25,8 +26,13 @@ require_once 'Zend/Gdata/Health/Query.php';
 require_once 'Zend/Gdata/ClientLogin.php';
 
 /**
- * @package Zend_Gdata
+ * @category   Zend
+ * @package    Zend_Gdata_Health
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Gdata
+ * @group      Zend_Gdata_Health
  */
 class Zend_Gdata_HealthOnlineTest extends PHPUnit_Framework_TestCase
 {
@@ -309,3 +315,4 @@ class Zend_Gdata_HealthOnlineTest extends PHPUnit_Framework_TestCase
         $this->assertXmlStringEqualsXmlString($responseEntry->getCcr()->saveXML(), $ccrXML);
     }
 }
+

+ 454 - 453
tests/Zend/Ldap/AttributeTest.php

@@ -1,43 +1,43 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Ldap
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
- */
-
-/**
- * Test helper
- */
-require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
-/**
- * Zend_Ldap_Attribute
- */
-require_once 'Zend/Ldap/Attribute.php';
-
-/**
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-
-class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
+ */
+
+/**
+ * Test helper
+ */
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
+/**
+ * Zend_Ldap_Attribute
+ */
+require_once 'Zend/Ldap/Attribute.php';
+
+/**
+ * @category   Zend
+ * @package    Zend_Ldap
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Ldap
+ */
+class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
 {
     protected function _assertLocalDateTimeString($timestamp, $value)
     {
@@ -50,29 +50,29 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $utcTimestamp = $localTimestamp - $currentOffset;
         $this->assertEquals(date('YmdHis', $utcTimestamp) . 'Z', $value);
     }
-
-    public function testGetAttributeValue()
-    {
-        $data=array('uid' => array('value'));
-        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid', 0);
-        $this->assertEquals('value', $value);
-    }
-
-    public function testGetNonExistentAttributeValue()
-    {
-        $data=array('uid' => array('value'));
-        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid', 1);
-        $this->assertNull($value);
-    }
-
-    public function testGetNonExistentAttribute()
-    {
-        $data=array('uid' => array('value'));
-        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid2', 0);
-        $this->assertNull($value);
-        $array=Zend_Ldap_Attribute::getAttribute($data, 'uid2');
-        $this->assertType('array', $array);
-        $this->assertEquals(0, count($array));
+
+    public function testGetAttributeValue()
+    {
+        $data=array('uid' => array('value'));
+        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid', 0);
+        $this->assertEquals('value', $value);
+    }
+
+    public function testGetNonExistentAttributeValue()
+    {
+        $data=array('uid' => array('value'));
+        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid', 1);
+        $this->assertNull($value);
+    }
+
+    public function testGetNonExistentAttribute()
+    {
+        $data=array('uid' => array('value'));
+        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid2', 0);
+        $this->assertNull($value);
+        $array=Zend_Ldap_Attribute::getAttribute($data, 'uid2');
+        $this->assertType('array', $array);
+        $this->assertEquals(0, count($array));
     }
 
     public function testGetAttributeWithWrongIndexType()
@@ -82,346 +82,346 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
         $this->assertNull($value);
         $value=Zend_Ldap_Attribute::getAttribute($data, 'uid', 3.1415);
         $this->assertNull($value);
-    }
-
-    public function testGetAttributeArray()
-    {
-        $data=array('uid' => array('value'));
-        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid');
-        $this->assertType('array', $value);
-        $this->assertEquals(1, count($value));
-        $this->assertContains('value', $value);
-    }
-
-    public function testSimpleSetAttribute()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(1, count($data['uid']));
-        $this->assertContains('new', $data['uid']);
-    }
-
-    public function testSimpleOverwriteAttribute()
-    {
-        $data=array('uid' => array('old'));
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(1, count($data['uid']));
-        $this->assertContains('new', $data['uid']);
-    }
-
-    public function testSimpleAppendAttribute()
-    {
-        $data=array('uid' => array('old'));
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', true);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(2, count($data['uid']));
-        $this->assertContains('old', $data['uid']);
-        $this->assertContains('new', $data['uid']);
-        $this->assertEquals('old', $data['uid'][0]);
-        $this->assertEquals('new', $data['uid'][1]);
-    }
-
-    public function testBooleanAttributeHandling()
-    {
-        $data=array(
-            'p1_true' => array('TRUE'),
-            'p1_false' => array('FALSE')
-        );
-        Zend_Ldap_Attribute::setAttribute($data, 'p2_true', true);
-        Zend_Ldap_Attribute::setAttribute($data, 'p2_false', false);
-        $this->assertEquals('TRUE', $data['p2_true'][0]);
-        $this->assertEquals('FALSE', $data['p2_false'][0]);
-        $this->assertEquals(true, Zend_Ldap_Attribute::getAttribute($data, 'p1_true', 0));
-        $this->assertEquals(false, Zend_Ldap_Attribute::getAttribute($data, 'p1_false', 0));
-    }
-
-    public function testArraySetAttribute()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(2, count($data['uid']));
-        $this->assertContains('new1', $data['uid']);
-        $this->assertContains('new2', $data['uid']);
-        $this->assertEquals('new1', $data['uid'][0]);
-        $this->assertEquals('new2', $data['uid'][1]);
-    }
-
-    public function testArrayOverwriteAttribute()
-    {
-        $data=array('uid' => array('old'));
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(2, count($data['uid']));
-        $this->assertContains('new1', $data['uid']);
-        $this->assertContains('new2', $data['uid']);
-        $this->assertEquals('new1', $data['uid'][0]);
-        $this->assertEquals('new2', $data['uid'][1]);
-    }
-
-    public function testArrayAppendAttribute()
-    {
-        $data=array('uid' => array('old'));
-        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), true);
-        $this->assertArrayHasKey('uid', $data);
-        $this->assertType('array', $data['uid']);
-        $this->assertEquals(3, count($data['uid']));
-        $this->assertContains('old', $data['uid']);
-        $this->assertContains('new1', $data['uid']);
-        $this->assertContains('new2', $data['uid']);
-        $this->assertEquals('old', $data['uid'][0]);
-        $this->assertEquals('new1', $data['uid'][1]);
-        $this->assertEquals('new2', $data['uid'][2]);
-    }
-
-    public function testPasswordSettingSHA()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd', Zend_Ldap_Attribute::PASSWORD_HASH_SHA);
-        $password=Zend_Ldap_Attribute::getAttribute($data, 'userPassword', 0);
-        $this->assertEquals('{SHA}vi3X+3ptD4ulrdErXo+3W72mRyE=', $password);
-    }
-
-    public function testPasswordSettingMD5()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd', Zend_Ldap_Attribute::PASSWORD_HASH_MD5);
-        $password=Zend_Ldap_Attribute::getAttribute($data, 'userPassword', 0);
-        $this->assertEquals('{MD5}bJuLJ96h3bhF+WqiVnxnVA==', $password);
-    }
-
-    public function testPasswordSettingUnicodePwd()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setPassword($data, 'new', Zend_Ldap_Attribute::PASSWORD_UNICODEPWD);
-        $password=Zend_Ldap_Attribute::getAttribute($data, 'unicodePwd', 0);
-        $this->assertEquals("\x22\x00\x6E\x00\x65\x00\x77\x00\x22\x00", $password);
-    }
-
-    public function testPasswordSettingCustomAttribute()
-    {
-        $data=array();
-        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd',
-            Zend_Ldap_Attribute::PASSWORD_HASH_SHA, 'myAttribute');
-        $password=Zend_Ldap_Attribute::getAttribute($data, 'myAttribute', 0);
-        $this->assertNotNull($password);
-    }
-
-    public function testSetAttributeWithObject()
-    {
-        $data=array();
-        $object=new stdClass();
-        $object->a=1;
-        $object->b=1.23;
-        $object->c='string';
-        Zend_Ldap_Attribute::setAttribute($data, 'object', $object);
-        $this->assertEquals(serialize($object), $data['object'][0]);
-    }
-
-    public function testSetAttributeWithFilestream()
-    {
-        $data=array();
-        $stream=fopen(dirname(__FILE__) . '/_files/AttributeTest.input.txt', 'r');
-        Zend_Ldap_Attribute::setAttribute($data, 'file', $stream);
-        fclose($stream);
-        $this->assertEquals('String from file', $data['file'][0]);
-    }
-
-    public function testSetDateTimeValueLocal()
-    {
-        $ts=mktime(12, 30, 30, 6, 25, 2008);
-        $data=array();
+    }
+
+    public function testGetAttributeArray()
+    {
+        $data=array('uid' => array('value'));
+        $value=Zend_Ldap_Attribute::getAttribute($data, 'uid');
+        $this->assertType('array', $value);
+        $this->assertEquals(1, count($value));
+        $this->assertContains('value', $value);
+    }
+
+    public function testSimpleSetAttribute()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(1, count($data['uid']));
+        $this->assertContains('new', $data['uid']);
+    }
+
+    public function testSimpleOverwriteAttribute()
+    {
+        $data=array('uid' => array('old'));
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', false);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(1, count($data['uid']));
+        $this->assertContains('new', $data['uid']);
+    }
+
+    public function testSimpleAppendAttribute()
+    {
+        $data=array('uid' => array('old'));
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', 'new', true);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(2, count($data['uid']));
+        $this->assertContains('old', $data['uid']);
+        $this->assertContains('new', $data['uid']);
+        $this->assertEquals('old', $data['uid'][0]);
+        $this->assertEquals('new', $data['uid'][1]);
+    }
+
+    public function testBooleanAttributeHandling()
+    {
+        $data=array(
+            'p1_true' => array('TRUE'),
+            'p1_false' => array('FALSE')
+        );
+        Zend_Ldap_Attribute::setAttribute($data, 'p2_true', true);
+        Zend_Ldap_Attribute::setAttribute($data, 'p2_false', false);
+        $this->assertEquals('TRUE', $data['p2_true'][0]);
+        $this->assertEquals('FALSE', $data['p2_false'][0]);
+        $this->assertEquals(true, Zend_Ldap_Attribute::getAttribute($data, 'p1_true', 0));
+        $this->assertEquals(false, Zend_Ldap_Attribute::getAttribute($data, 'p1_false', 0));
+    }
+
+    public function testArraySetAttribute()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(2, count($data['uid']));
+        $this->assertContains('new1', $data['uid']);
+        $this->assertContains('new2', $data['uid']);
+        $this->assertEquals('new1', $data['uid'][0]);
+        $this->assertEquals('new2', $data['uid'][1]);
+    }
+
+    public function testArrayOverwriteAttribute()
+    {
+        $data=array('uid' => array('old'));
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), false);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(2, count($data['uid']));
+        $this->assertContains('new1', $data['uid']);
+        $this->assertContains('new2', $data['uid']);
+        $this->assertEquals('new1', $data['uid'][0]);
+        $this->assertEquals('new2', $data['uid'][1]);
+    }
+
+    public function testArrayAppendAttribute()
+    {
+        $data=array('uid' => array('old'));
+        Zend_Ldap_Attribute::setAttribute($data, 'uid', array('new1', 'new2'), true);
+        $this->assertArrayHasKey('uid', $data);
+        $this->assertType('array', $data['uid']);
+        $this->assertEquals(3, count($data['uid']));
+        $this->assertContains('old', $data['uid']);
+        $this->assertContains('new1', $data['uid']);
+        $this->assertContains('new2', $data['uid']);
+        $this->assertEquals('old', $data['uid'][0]);
+        $this->assertEquals('new1', $data['uid'][1]);
+        $this->assertEquals('new2', $data['uid'][2]);
+    }
+
+    public function testPasswordSettingSHA()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd', Zend_Ldap_Attribute::PASSWORD_HASH_SHA);
+        $password=Zend_Ldap_Attribute::getAttribute($data, 'userPassword', 0);
+        $this->assertEquals('{SHA}vi3X+3ptD4ulrdErXo+3W72mRyE=', $password);
+    }
+
+    public function testPasswordSettingMD5()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd', Zend_Ldap_Attribute::PASSWORD_HASH_MD5);
+        $password=Zend_Ldap_Attribute::getAttribute($data, 'userPassword', 0);
+        $this->assertEquals('{MD5}bJuLJ96h3bhF+WqiVnxnVA==', $password);
+    }
+
+    public function testPasswordSettingUnicodePwd()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setPassword($data, 'new', Zend_Ldap_Attribute::PASSWORD_UNICODEPWD);
+        $password=Zend_Ldap_Attribute::getAttribute($data, 'unicodePwd', 0);
+        $this->assertEquals("\x22\x00\x6E\x00\x65\x00\x77\x00\x22\x00", $password);
+    }
+
+    public function testPasswordSettingCustomAttribute()
+    {
+        $data=array();
+        Zend_Ldap_Attribute::setPassword($data, 'pa$$w0rd',
+            Zend_Ldap_Attribute::PASSWORD_HASH_SHA, 'myAttribute');
+        $password=Zend_Ldap_Attribute::getAttribute($data, 'myAttribute', 0);
+        $this->assertNotNull($password);
+    }
+
+    public function testSetAttributeWithObject()
+    {
+        $data=array();
+        $object=new stdClass();
+        $object->a=1;
+        $object->b=1.23;
+        $object->c='string';
+        Zend_Ldap_Attribute::setAttribute($data, 'object', $object);
+        $this->assertEquals(serialize($object), $data['object'][0]);
+    }
+
+    public function testSetAttributeWithFilestream()
+    {
+        $data=array();
+        $stream=fopen(dirname(__FILE__) . '/_files/AttributeTest.input.txt', 'r');
+        Zend_Ldap_Attribute::setAttribute($data, 'file', $stream);
+        fclose($stream);
+        $this->assertEquals('String from file', $data['file'][0]);
+    }
+
+    public function testSetDateTimeValueLocal()
+    {
+        $ts=mktime(12, 30, 30, 6, 25, 2008);
+        $data=array();
         Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
-        $this->_assertLocalDateTimeString($ts, $data['ts'][0]);
-    }
-
-    public function testSetDateTimeValueUtc()
-    {
-        $ts=mktime(12, 30, 30, 6, 25, 2008);
-        $data=array();
-        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, true);
-        $this->_assertUtcDateTimeString($ts, $data['ts'][0]);
-    }
-
-    public function testSetDateTimeValueLocalArray()
-    {
-        $ts=array();
-        $ts[]=mktime(12, 30, 30, 6, 25, 2008);
-        $ts[]=mktime(1, 25, 30, 1, 2, 2008);
-        $data=array();
+        $this->_assertLocalDateTimeString($ts, $data['ts'][0]);
+    }
+
+    public function testSetDateTimeValueUtc()
+    {
+        $ts=mktime(12, 30, 30, 6, 25, 2008);
+        $data=array();
+        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, true);
+        $this->_assertUtcDateTimeString($ts, $data['ts'][0]);
+    }
+
+    public function testSetDateTimeValueLocalArray()
+    {
+        $ts=array();
+        $ts[]=mktime(12, 30, 30, 6, 25, 2008);
+        $ts[]=mktime(1, 25, 30, 1, 2, 2008);
+        $data=array();
         Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
         $this->_assertLocalDateTimeString($ts[0], $data['ts'][0]);
-        $this->_assertLocalDateTimeString($ts[1], $data['ts'][1]);
-    }
-
-    public function testSetDateTimeValueIllegal()
-    {
-        $ts='dummy';
-        $data=array();
-        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
-        $this->assertEquals(0, count($data['ts']));
-    }
-
-    public function testGetDateTimeValueFromLocal()
-    {
-        $ts=mktime(12, 30, 30, 6, 25, 2008);
-        $data=array();
-        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
-        $this->_assertLocalDateTimeString($ts, $data['ts'][0]);
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
-        $this->assertEquals($ts, $retTs);
-    }
-
-    public function testGetDateTimeValueFromUtc()
-    {
-        $ts=mktime(12, 30, 30, 6, 25, 2008);
-        $data=array();
-        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, true);
-        $this->_assertUtcDateTimeString($ts, $data['ts'][0]);
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
-        $this->assertEquals($ts, $retTs);
-    }
-
-    public function testGetDateTimeValueFromArray()
-    {
-        $ts=array();
-        $ts[]=mktime(12, 30, 30, 6, 25, 2008);
-        $ts[]=mktime(1, 25, 30, 1, 2, 2008);
-        $data=array();
-        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
+        $this->_assertLocalDateTimeString($ts[1], $data['ts'][1]);
+    }
+
+    public function testSetDateTimeValueIllegal()
+    {
+        $ts='dummy';
+        $data=array();
+        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
+        $this->assertEquals(0, count($data['ts']));
+    }
+
+    public function testGetDateTimeValueFromLocal()
+    {
+        $ts=mktime(12, 30, 30, 6, 25, 2008);
+        $data=array();
+        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
+        $this->_assertLocalDateTimeString($ts, $data['ts'][0]);
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
+        $this->assertEquals($ts, $retTs);
+    }
+
+    public function testGetDateTimeValueFromUtc()
+    {
+        $ts=mktime(12, 30, 30, 6, 25, 2008);
+        $data=array();
+        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, true);
+        $this->_assertUtcDateTimeString($ts, $data['ts'][0]);
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
+        $this->assertEquals($ts, $retTs);
+    }
+
+    public function testGetDateTimeValueFromArray()
+    {
+        $ts=array();
+        $ts[]=mktime(12, 30, 30, 6, 25, 2008);
+        $ts[]=mktime(1, 25, 30, 1, 2, 2008);
+        $data=array();
+        Zend_Ldap_Attribute::setDateTimeAttribute($data, 'ts', $ts, false);
         $this->_assertLocalDateTimeString($ts[0], $data['ts'][0]);
-        $this->_assertLocalDateTimeString($ts[1], $data['ts'][1]);
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts');
-        $this->assertEquals($ts[0], $retTs[0]);
-        $this->assertEquals($ts[1], $retTs[1]);
-    }
-
-    public function testGetDateTimeValueIllegal()
-    {
-        $data=array('ts' => array('dummy'));
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
-        $this->assertNull($retTs);
-    }
-
-    public function testGetDateTimeValueNegativeOffet()
-    {
-        $data=array('ts' => array('20080612143045-0700'));
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
-        $tsCompare=gmmktime(21, 30, 45, 6, 12, 2008);
-        $this->assertEquals($tsCompare, $retTs);
-    }
-
-    public function testGetDateTimeValueNegativeOffet2()
-    {
-        $data=array('ts' => array('20080612143045-0715'));
-        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
-        $tsCompare=gmmktime(21, 45, 45, 6, 12, 2008);
-        $this->assertEquals($tsCompare, $retTs);
-    }
-
-    public function testRemoveAttributeValueSimple()
-    {
-        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value2');
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(3, count($data['test']));
-        $this->assertContains('value1', $data['test']);
-        $this->assertContains('value3', $data['test']);
-        $this->assertNotContains('value2', $data['test']);
-    }
-
-    public function testRemoveAttributeValueArray()
-    {
-        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value2'));
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(2, count($data['test']));
-        $this->assertContains('value3', $data['test']);
-        $this->assertNotContains('value1', $data['test']);
-        $this->assertNotContains('value2', $data['test']);
-    }
-
-    public function testRemoveAttributeMultipleValueSimple()
-    {
-        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value3');
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(2, count($data['test']));
-        $this->assertContains('value1', $data['test']);
-        $this->assertContains('value2', $data['test']);
-        $this->assertNotContains('value3', $data['test']);
-    }
-
-    public function testRemoveAttributeMultipleValueArray()
-    {
-        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value3'));
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(1, count($data['test']));
-        $this->assertContains('value2', $data['test']);
-        $this->assertNotContains('value1', $data['test']);
-        $this->assertNotContains('value3', $data['test']);
-    }
-
-    public function testRemoveAttributeValueBoolean()
-    {
-        $data=array('test' => array('TRUE', 'FALSE', 'TRUE', 'FALSE'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', false);
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(2, count($data['test']));
-        $this->assertContains('TRUE', $data['test']);
-        $this->assertNotContains('FALSE', $data['test']);
-    }
-
-    public function testRemoveAttributeValueInteger()
-    {
-        $data=array('test' => array('1', '2', '3', '4'));
-        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array(2, 4));
-        $this->assertArrayHasKey('test', $data);
-        $this->assertType('array', $data['test']);
-        $this->assertEquals(2, count($data['test']));
-        $this->assertContains('1', $data['test']);
-        $this->assertContains('3', $data['test']);
-        $this->assertNotContains('2', $data['test']);
-        $this->assertNotContains('4', $data['test']);
-    }
-
-    public function testConvertFromLdapValue()
-    {
-        $this->assertEquals(true, Zend_Ldap_Attribute::convertFromLdapValue('TRUE'));
-        $this->assertEquals(false, Zend_Ldap_Attribute::convertFromLdapValue('FALSE'));
-    }
-
-    public function testConvertToLdapValue()
-    {
-        $this->assertEquals('string', Zend_Ldap_Attribute::convertToLdapValue('string'));
-        $this->assertEquals('1', Zend_Ldap_Attribute::convertToLdapValue(1));
-        $this->assertEquals('TRUE', Zend_Ldap_Attribute::convertToLdapValue(true));
-    }
-
-    public function testConvertFromLdapDateTimeValue()
-    {
-        $ldap='20080625123030+0200';
+        $this->_assertLocalDateTimeString($ts[1], $data['ts'][1]);
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts');
+        $this->assertEquals($ts[0], $retTs[0]);
+        $this->assertEquals($ts[1], $retTs[1]);
+    }
+
+    public function testGetDateTimeValueIllegal()
+    {
+        $data=array('ts' => array('dummy'));
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
+        $this->assertNull($retTs);
+    }
+
+    public function testGetDateTimeValueNegativeOffet()
+    {
+        $data=array('ts' => array('20080612143045-0700'));
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
+        $tsCompare=gmmktime(21, 30, 45, 6, 12, 2008);
+        $this->assertEquals($tsCompare, $retTs);
+    }
+
+    public function testGetDateTimeValueNegativeOffet2()
+    {
+        $data=array('ts' => array('20080612143045-0715'));
+        $retTs=Zend_Ldap_Attribute::getDateTimeAttribute($data, 'ts', 0);
+        $tsCompare=gmmktime(21, 45, 45, 6, 12, 2008);
+        $this->assertEquals($tsCompare, $retTs);
+    }
+
+    public function testRemoveAttributeValueSimple()
+    {
+        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value2');
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(3, count($data['test']));
+        $this->assertContains('value1', $data['test']);
+        $this->assertContains('value3', $data['test']);
+        $this->assertNotContains('value2', $data['test']);
+    }
+
+    public function testRemoveAttributeValueArray()
+    {
+        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value2'));
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(2, count($data['test']));
+        $this->assertContains('value3', $data['test']);
+        $this->assertNotContains('value1', $data['test']);
+        $this->assertNotContains('value2', $data['test']);
+    }
+
+    public function testRemoveAttributeMultipleValueSimple()
+    {
+        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', 'value3');
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(2, count($data['test']));
+        $this->assertContains('value1', $data['test']);
+        $this->assertContains('value2', $data['test']);
+        $this->assertNotContains('value3', $data['test']);
+    }
+
+    public function testRemoveAttributeMultipleValueArray()
+    {
+        $data=array('test' => array('value1', 'value2', 'value3', 'value3'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array('value1', 'value3'));
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(1, count($data['test']));
+        $this->assertContains('value2', $data['test']);
+        $this->assertNotContains('value1', $data['test']);
+        $this->assertNotContains('value3', $data['test']);
+    }
+
+    public function testRemoveAttributeValueBoolean()
+    {
+        $data=array('test' => array('TRUE', 'FALSE', 'TRUE', 'FALSE'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', false);
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(2, count($data['test']));
+        $this->assertContains('TRUE', $data['test']);
+        $this->assertNotContains('FALSE', $data['test']);
+    }
+
+    public function testRemoveAttributeValueInteger()
+    {
+        $data=array('test' => array('1', '2', '3', '4'));
+        Zend_Ldap_Attribute::removeFromAttribute($data, 'test', array(2, 4));
+        $this->assertArrayHasKey('test', $data);
+        $this->assertType('array', $data['test']);
+        $this->assertEquals(2, count($data['test']));
+        $this->assertContains('1', $data['test']);
+        $this->assertContains('3', $data['test']);
+        $this->assertNotContains('2', $data['test']);
+        $this->assertNotContains('4', $data['test']);
+    }
+
+    public function testConvertFromLdapValue()
+    {
+        $this->assertEquals(true, Zend_Ldap_Attribute::convertFromLdapValue('TRUE'));
+        $this->assertEquals(false, Zend_Ldap_Attribute::convertFromLdapValue('FALSE'));
+    }
+
+    public function testConvertToLdapValue()
+    {
+        $this->assertEquals('string', Zend_Ldap_Attribute::convertToLdapValue('string'));
+        $this->assertEquals('1', Zend_Ldap_Attribute::convertToLdapValue(1));
+        $this->assertEquals('TRUE', Zend_Ldap_Attribute::convertToLdapValue(true));
+    }
+
+    public function testConvertFromLdapDateTimeValue()
+    {
+        $ldap='20080625123030+0200';
         $this->assertEquals(gmmktime(10, 30, 30, 6, 25, 2008),
-            Zend_Ldap_Attribute::convertFromLdapDateTimeValue($ldap));
-    }
-
-    public function testConvertToLdapDateTimeValue()
-    {
-        $ts=mktime(12, 30, 30, 6, 25, 2008);
-        $this->_assertLocalDateTimeString($ts, Zend_Ldap_Attribute::convertToLdapDateTimeValue($ts));
+            Zend_Ldap_Attribute::convertFromLdapDateTimeValue($ldap));
+    }
+
+    public function testConvertToLdapDateTimeValue()
+    {
+        $ts=mktime(12, 30, 30, 6, 25, 2008);
+        $this->_assertLocalDateTimeString($ts, Zend_Ldap_Attribute::convertToLdapDateTimeValue($ts));
     }
 
     public function testRemoveDuplicates()
@@ -472,59 +472,60 @@ class Zend_Ldap_AttributeTest extends PHPUnit_Framework_TestCase
             array(true, false)));
         $this->assertFalse(Zend_Ldap_Attribute::attributeHasValue($data, 'boolean1',
             array(true, false)));
-    }
-
-    public function testPasswordGenerationSSHA()
-    {
-        $password = 'pa$$w0rd';
-        $ssha = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SSHA);
-        $encoded = substr($ssha, strpos($ssha, '}'));
-        $binary  = base64_decode($encoded);
-        $this->assertEquals(24, strlen($binary));
-        $hash    = substr($binary, 0, 20);
-        $salt    = substr($binary, 20);
-        $this->assertEquals(4, strlen($salt));
-        $this->assertEquals(sha1($password . $salt, true), $hash);
-    }
-
-    public function testPasswordGenerationSHA()
-    {
-        $password = 'pa$$w0rd';
-        $sha = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SHA);
-        $encoded = substr($sha, strpos($sha, '}'));
-        $binary  = base64_decode($encoded);
-        $this->assertEquals(20, strlen($binary));
-        $this->assertEquals(sha1($password, true), $binary);
-    }
-
-    public function testPasswordGenerationSMD5()
-    {
-        $password = 'pa$$w0rd';
-        $smd5 = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SMD5);
-        $encoded = substr($smd5, strpos($smd5, '}'));
-        $binary  = base64_decode($encoded);
-        $this->assertEquals(20, strlen($binary));
-        $hash    = substr($binary, 0, 16);
-        $salt    = substr($binary, 16);
-        $this->assertEquals(4, strlen($salt));
-        $this->assertEquals(md5($password . $salt, true), $hash);
-    }
-
-    public function testPasswordGenerationMD5()
-    {
-        $password = 'pa$$w0rd';
-        $md5 = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_MD5);
-        $encoded = substr($md5, strpos($md5, '}'));
-        $binary  = base64_decode($encoded);
-        $this->assertEquals(16, strlen($binary));
-        $this->assertEquals(md5($password, true), $binary);
-    }
-
-    public function testPasswordGenerationUnicodePwd()
-    {
-        $password = 'new';
-        $unicodePwd = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_UNICODEPWD);
-        $this->assertEquals(10, strlen($unicodePwd));
-        $this->assertEquals("\x22\x00\x6E\x00\x65\x00\x77\x00\x22\x00", $unicodePwd);
-    }
-}
+    }
+
+    public function testPasswordGenerationSSHA()
+    {
+        $password = 'pa$$w0rd';
+        $ssha = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SSHA);
+        $encoded = substr($ssha, strpos($ssha, '}'));
+        $binary  = base64_decode($encoded);
+        $this->assertEquals(24, strlen($binary));
+        $hash    = substr($binary, 0, 20);
+        $salt    = substr($binary, 20);
+        $this->assertEquals(4, strlen($salt));
+        $this->assertEquals(sha1($password . $salt, true), $hash);
+    }
+
+    public function testPasswordGenerationSHA()
+    {
+        $password = 'pa$$w0rd';
+        $sha = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SHA);
+        $encoded = substr($sha, strpos($sha, '}'));
+        $binary  = base64_decode($encoded);
+        $this->assertEquals(20, strlen($binary));
+        $this->assertEquals(sha1($password, true), $binary);
+    }
+
+    public function testPasswordGenerationSMD5()
+    {
+        $password = 'pa$$w0rd';
+        $smd5 = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_SMD5);
+        $encoded = substr($smd5, strpos($smd5, '}'));
+        $binary  = base64_decode($encoded);
+        $this->assertEquals(20, strlen($binary));
+        $hash    = substr($binary, 0, 16);
+        $salt    = substr($binary, 16);
+        $this->assertEquals(4, strlen($salt));
+        $this->assertEquals(md5($password . $salt, true), $hash);
+    }
+
+    public function testPasswordGenerationMD5()
+    {
+        $password = 'pa$$w0rd';
+        $md5 = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_HASH_MD5);
+        $encoded = substr($md5, strpos($md5, '}'));
+        $binary  = base64_decode($encoded);
+        $this->assertEquals(16, strlen($binary));
+        $this->assertEquals(md5($password, true), $binary);
+    }
+
+    public function testPasswordGenerationUnicodePwd()
+    {
+        $password = 'new';
+        $unicodePwd = Zend_Ldap_Attribute::createPassword($password, Zend_Ldap_Attribute::PASSWORD_UNICODEPWD);
+        $this->assertEquals(10, strlen($unicodePwd));
+        $this->assertEquals("\x22\x00\x6E\x00\x65\x00\x77\x00\x22\x00", $unicodePwd);
+    }
+}
+

+ 5 - 4
tests/Zend/Ldap/ConverterTest.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -33,10 +33,10 @@ require_once 'Zend/Ldap/Converter.php';
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Ldap
  */
-
 class Zend_Ldap_ConverterTest extends PHPUnit_Framework_TestCase
 {
     public function testAsc2hex32()
@@ -63,4 +63,5 @@ class Zend_Ldap_ConverterTest extends PHPUnit_Framework_TestCase
             'hijklmnopqrstuvwxyz{|}~';
         $this->assertEquals($expected, Zend_Ldap_Converter::hex32ToAsc($str));
     }
-}
+}
+

+ 4 - 2
tests/Zend/Tool/AllTests.php

@@ -17,7 +17,7 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * @version    $Id $
  */
 
 /**
@@ -38,6 +38,7 @@ require_once 'Zend/Tool/Project/AllTests.php';
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Tool
  */
 class Zend_Tool_AllTests
 {
@@ -57,4 +58,5 @@ class Zend_Tool_AllTests
 
 if (PHPUnit_MAIN_METHOD == 'Zend_Tool_AllTests::main') {
     Zend_Tool_AllTests::main();
-}
+}
+

+ 5 - 1
tests/Zend/View/Helper/CycleTest.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_View
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2006 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -40,6 +40,10 @@ require_once 'Zend/View/Helper/Cycle.php';
  * @category   Zend
  * @package    Zend_View
  * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_View
+ * @group      Zend_View_Helper
  */
 class Zend_View_Helper_CycleTest extends PHPUnit_Framework_TestCase
 {