Merge pull request #4227 from owncloud/fixing-testGetById-master

implement a platform independent version of basename

lib/files/cache/cache.php

@@ -200,7 +200,7 @@ class Cache {
 
 			$data['path'] = $file;
 			$data['parent'] = $this->getParentId($file);
-			$data['name'] = basename($file);
+			$data['name'] = \OC_Util::basename($file);
 			$data['encrypted'] = isset($data['encrypted']) ? ((int)$data['encrypted']) : 0;
 
 			list($queryParts, $params) = $this->buildParts($data);

lib/util.php

@@ -894,4 +894,11 @@ class OC_Util {
 
 		return $value;
 	}
+
+	public static function basename($file)
+	{
+		$file = rtrim($file, '/');
+		$t = explode('/', $file);
+		return array_pop($t);
+	}
 }

tests/lib/util.php

@@ -8,12 +8,9 @@
 
 class Test_Util extends PHPUnit_Framework_TestCase {
 
-	// Constructor
-	function Test_Util() {
+	function testFormatDate() {
 		date_default_timezone_set("UTC");
-	}
 
-	function testFormatDate() {
 		$result = OC_Util::formatDate(1350129205);
 		$expected = 'October 13, 2012 11:53';
 		$this->assertEquals($expected, $result);
@@ -61,8 +58,28 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		OC_Config::deleteKey('mail_domain');
 	}
 
-  function testGetInstanceIdGeneratesValidId() {
-    OC_Config::deleteKey('instanceid');
-    $this->assertStringStartsWith('oc', OC_Util::getInstanceId());
-  }
+	function testGetInstanceIdGeneratesValidId() {
+		OC_Config::deleteKey('instanceid');
+		$this->assertStringStartsWith('oc', OC_Util::getInstanceId());
+	}
+
+	/**
+	 * @dataProvider baseNameProvider
+	 */
+	public function testBaseName($expected, $file)
+	{
+		$base = \OC_Util::basename($file);
+		$this->assertEquals($expected, $base);
+	}
+
+	public function baseNameProvider()
+	{
+		return array(
+			array('public_html', '/home/user/public_html/'),
+			array('public_html', '/home/user/public_html'),
+			array('', '/'),
+			array('public_html', 'public_html'),
+			array('442aa682de2a64db1e010f50e60fd9c9', 'local::C:\Users\ADMINI~1\AppData\Local\Temp\2/442aa682de2a64db1e010f50e60fd9c9/')
+		);
+	}
 }