merge master into filesystem

4 files changed, 262 insertions, 58 deletions

diff --git a/tests/lib/geo.php b/tests/lib/geo.php
new file mode 100644
index 00000000000..2b3599ab9b9
--- /dev/null
+++ b/tests/lib/geo.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2012 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Geo extends UnitTestCase {
+	function testTimezone() {
+		$result = OC_Geo::timezone(3,3);
+		$expected = 'Africa/Porto-Novo';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Geo::timezone(-3,-3333);
+		$expected = 'Pacific/Enderbury';
+		$this->assertEquals($result, $expected);
+	}
+}
\ No newline at end of file
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
new file mode 100644
index 00000000000..cfb9a799579
--- /dev/null
+++ b/tests/lib/helper.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright (c) 2012 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Helper extends UnitTestCase {
+
+	function testHumanFileSize() {
+		$result = OC_Helper::humanFileSize(0);
+		$expected = '0 B';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::humanFileSize(1024);
+		$expected = '1 kB';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::humanFileSize(10000000);
+		$expected = '9.5 MB';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::humanFileSize(500000000000);
+		$expected = '465.7 GB';
+		$this->assertEquals($result, $expected);
+	}
+
+	function testComputerFileSize() {
+		$result = OC_Helper::computerFileSize("0 B");
+		$expected = '0.0';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::computerFileSize("1 kB");
+		$expected = '1024.0';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::computerFileSize("9.5 MB");
+		$expected = '9961472.0';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::computerFileSize("465.7 GB");
+		$expected = '500041567436.8';
+		$this->assertEquals($result, $expected);
+	}
+
+	function testGetMimeType() {
+		$dir=OC::$SERVERROOT.'/tests/data';
+		$result = OC_Helper::getMimeType($dir."/");
+		$expected = 'httpd/unix-directory';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::getMimeType($dir."/data.tar.gz");
+		$expected = 'application/x-gzip';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::getMimeType($dir."/data.zip");
+		$expected = 'application/zip';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::getMimeType($dir."/logo-wide.svg");
+		$expected = 'image/svg+xml';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::getMimeType($dir."/logo-wide.png");
+		$expected = 'image/png';
+		$this->assertEquals($result, $expected);
+	}
+
+	function testGetStringMimeType() {
+		$result = OC_Helper::getStringMimeType("/data/data.tar.gz");
+		$expected = 'text/plain; charset=us-ascii';
+		$this->assertEquals($result, $expected);
+	}
+
+	function testIssubdirectory() {
+		$result = OC_Helper::issubdirectory("./data/", "/anotherDirectory/");
+		$this->assertFalse($result);
+
+		$result = OC_Helper::issubdirectory("./data/", "./data/");
+		$this->assertTrue($result);
+
+		mkdir("data/TestSubdirectory", 0777);
+		$result = OC_Helper::issubdirectory("data/TestSubdirectory/", "data");
+		rmdir("data/TestSubdirectory");
+		$this->assertTrue($result);
+	}
+
+	function testMb_array_change_key_case() {
+		$arrayStart = array(
+			"Foo" => "bar",
+			"Bar" => "foo",
+			);
+		$arrayResult = array(
+			"foo" => "bar",
+			"bar" => "foo",
+			);
+		$result = OC_Helper::mb_array_change_key_case($arrayStart);
+		$expected = $arrayResult;
+		$this->assertEquals($result, $expected);
+
+		$arrayStart = array(
+			"foo" => "bar",
+			"bar" => "foo",
+			);
+		$arrayResult = array(
+			"FOO" => "bar",
+			"BAR" => "foo",
+			);
+		$result = OC_Helper::mb_array_change_key_case($arrayStart, MB_CASE_UPPER);
+		$expected = $arrayResult;
+		$this->assertEquals($result, $expected);	
+	}
+
+	function testMb_substr_replace() {
+		$result = OC_Helper::mb_substr_replace("This  is a teststring", "string", 5);
+		$expected = "This string is a teststring";
+		$this->assertEquals($result, $expected);
+	}
+
+	function testMb_str_replace() {
+		$result = OC_Helper::mb_str_replace("teststring", "string", "This is a teststring");
+		$expected = "This is a string";
+		$this->assertEquals($result, $expected);
+	}
+
+	function testRecursiveArraySearch() {
+		$haystack = array(
+			"Foo" => "own",
+			"Bar" => "Cloud",
+			);
+
+		$result = OC_Helper::recursiveArraySearch($haystack, "own");
+		$expected = "Foo";
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Helper::recursiveArraySearch($haystack, "NotFound");
+		$this->assertFalse($result);
+	}
+}
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 7f6784f8df7..3cad3a28680 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -33,10 +33,10 @@ class Test_Share extends UnitTestCase {
 	public function setUp() {
 		OC_User::clearBackends();
 		OC_User::useBackend('dummy');
-		$this->user1 = uniqid('user_');
-		$this->user2 = uniqid('user_');
-		$this->user3 = uniqid('user_');
-		$this->user4 = uniqid('user_');
+		$this->user1 = uniqid('user1_');
+		$this->user2 = uniqid('user2_');
+		$this->user3 = uniqid('user3_');
+		$this->user4 = uniqid('user4_');
 		OC_User::createUser($this->user1, 'pass');
 		OC_User::createUser($this->user2, 'pass');
 		OC_User::createUser($this->user3, 'pass');
@@ -66,7 +66,7 @@ class Test_Share extends UnitTestCase {
 		try {
 			OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 	}
 
@@ -76,43 +76,43 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::getItemsSharedWith('foobar');
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::getItemSharedWith('foobar', 'test.txt');
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::getItemSharedWithBySource('foobar', 'test.txt');
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::getItemShared('foobar', 'test.txt');
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::unshare('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
 			OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_UPDATE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 	}
 
@@ -123,28 +123,28 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		$message = 'Sharing test.txt failed, because the user foobar does not exist';
 		try {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
 		try {
 			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Valid share
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
-		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		
 		// Attempt to share again
 		OC_User::setUserId($this->user1);
@@ -153,7 +153,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Attempt to share back
@@ -163,7 +163,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Unshare
@@ -178,7 +178,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Owner grants share and update permission 
@@ -192,15 +192,15 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Valid reshare
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
-		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		OC_User::setUserId($this->user3);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		
 		// Attempt to escalate permissions
 		OC_User::setUserId($this->user2);
@@ -209,22 +209,22 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Remove update permission
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		
 		// Remove share permission
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
 		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
 		
@@ -248,7 +248,7 @@ class Test_Share extends UnitTestCase {
 
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
-		$this->assertEqual(count($to_test), 2);
+		$this->assertEquals(2, count($to_test));
 		$this->assertTrue(in_array('test.txt', $to_test));
 		$this->assertTrue(in_array('test1.txt', $to_test));
 
@@ -256,7 +256,7 @@ class Test_Share extends UnitTestCase {
 		OC_User::setUserId($this->user1);
 		OC_User::deleteUser($this->user1);
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
+		$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 	}
 
 	public function testShareWithGroup() {
@@ -266,7 +266,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		$policy = OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
 		OC_Appconfig::setValue('core', 'shareapi_share_policy', 'groups_only');
@@ -275,17 +275,17 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		OC_Appconfig::setValue('core', 'shareapi_share_policy', $policy);
 		
 		// Valid share
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ));
-		$this->assertEqual(OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		OC_User::setUserId($this->user3);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		
 		// Attempt to share again
 		OC_User::setUserId($this->user1);
@@ -294,7 +294,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Attempt to share back to owner of group share
@@ -304,7 +304,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Attempt to share back to group
@@ -313,7 +313,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Attempt to share back to member of group
@@ -322,7 +322,7 @@ class Test_Share extends UnitTestCase {
 			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\Share::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
-			$this->assertEqual($exception->getMessage(), $message);
+			$this->assertEquals($message, $exception->getMessage());
 		}
 		
 		// Unshare
@@ -333,76 +333,76 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		
 		// Valid reshare
 		OC_User::setUserId($this->user2);
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ));
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Unshare from user only
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		$this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Valid share with same person - group then user
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		
 		// Unshare from group only
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS), array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE));
+		$this->assertEquals(array(OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		
 		// Attempt user specific target conflict
 		OC_User::setUserId($this->user3);
 		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
-		$this->assertEqual(count($to_test), 2);
+		$this->assertEquals(2, count($to_test));
 		$this->assertTrue(in_array('test.txt', $to_test));
 		$this->assertTrue(in_array('test1.txt', $to_test));
 		
 		// Valid reshare 
 		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
+		$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Remove user from group
 		OC_Group::removeFromGroup($this->user2, $this->group1);
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		$this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Add user to group
 		OC_Group::addToGroup($this->user4, $this->group1);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Unshare from self
 		$this->assertTrue(OCP\Share::unshareFromSelf('test', 'test.txt'));
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		$this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		OC_User::setUserId($this->user2);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		
 		// Remove group
 		OC_Group::deleteGroup($this->group1);
 		OC_User::setUserId($this->user4);
-		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		$this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 		OC_User::setUserId($this->user3);
-		$this->assertEqual(OCP\Share::getItemsShared('test'), array());
+		$this->assertEquals(array(), OCP\Share::getItemsShared('test'));
 	}
 
 }
diff --git a/tests/lib/util.php b/tests/lib/util.php
new file mode 100644
index 00000000000..23fe2903613
--- /dev/null
+++ b/tests/lib/util.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright (c) 2012 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Util extends UnitTestCase {
+
+	// Constructor
+	function Test_Util() {
+		date_default_timezone_set("UTC"); 
+	}
+
+	function testFormatDate() {
+		$result = OC_Util::formatDate(1350129205);
+		$expected = 'October 13, 2012, 11:53';
+		$this->assertEquals($result, $expected);
+
+		$result = OC_Util::formatDate(1102831200, true);
+		$expected = 'December 12, 2004';
+		$this->assertEquals($result, $expected);
+	}
+
+	function testCallRegister() {
+		$result = strlen(OC_Util::callRegister());
+		$this->assertEquals($result, 20);
+	}
+
+	function testSanitizeHTML() {
+		$badString = "<script>alert('Hacked!');</script>";
+		$result = OC_Util::sanitizeHTML($badString);
+		$this->assertEquals($result, "&lt;script&gt;alert(&#039;Hacked!&#039;);&lt;/script&gt;");
+
+		$goodString = "This is an harmless string.";
+		$result = OC_Util::sanitizeHTML($goodString);
+		$this->assertEquals($result, "This is an harmless string.");
+	} 
+
+	function testGenerate_random_bytes() {
+		$result = strlen(OC_Util::generate_random_bytes(59));
+		$this->assertEquals($result, 59);
+	} 
+}
\ No newline at end of file