strip whitespace from the beginning and end of the display name to avoid empty display names

1 files changed, 46 insertions, 0 deletions

diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index 3f90432c6b0..7a1db861c98 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -32,6 +32,28 @@ class User extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('Foo', $user->getDisplayName());
 	}
 
+	/**
+	 * if the display name contain whitespaces only, we expect the uid as result
+	 */
+	public function testDisplayNameEmpty() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Backend');
+		$backend->expects($this->once())
+			->method('getDisplayName')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue('  '));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+			->will($this->returnValue(true));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals('foo', $user->getDisplayName());
+	}
+
 	public function testDisplayNameNotSupported() {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
@@ -305,6 +327,30 @@ class User extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('Foo',$user->getDisplayName());
 	}
 
+	/**
+	 * don't allow display names containing whitespaces only
+	 */
+	public function testSetDisplayNameEmpty() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Database');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->setDisplayName(' '));
+		$this->assertEquals('foo',$user->getDisplayName());
+	}
+
 	public function testSetDisplayNameNotSupported() {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend