initual phpunit support

7 files changed, 25 insertions, 16 deletions

diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 9ada0accc21..49a56d147d3 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -13,7 +13,9 @@ abstract class Test_Cache extends UnitTestCase {
 	protected $instance;
 
 	public function tearDown() {
-		$this->instance->clear();
+		if($this->instance){
+			$this->instance->clear();
+		}
 	}
 
 	function testSimple() {
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
index 34ea968cd54..ae562a11df2 100644
--- a/tests/lib/cache/apc.php
+++ b/tests/lib/cache/apc.php
@@ -21,11 +21,11 @@
 */
 
 class Test_Cache_APC extends Test_Cache {
-	function skip() {
-		$this->skipUnless(function_exists('apc_store'));
-	}
-
 	public function setUp() {
+		if(!function_exists('apc_store')){
+			$this->markTestSkipped('The apc extension is not available.');
+			return;
+		}
 		$this->instance=new OC_Cache_APC();
 	}
 
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index 85cc2d8b3c6..934a5dd2fe2 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -21,11 +21,11 @@
 */
 
 class Test_Cache_XCache extends Test_Cache {
-	function skip() {
-		$this->skipUnless(function_exists('xcache_get'));
-	}
-
 	public function setUp() {
+		if(!function_exists('xcache_get')){
+			$this->markTestSkipped('The xcache extension is not available.');
+			return;
+		}
 		$this->instance=new OC_Cache_XCache();
 	}
 
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 3f7bb7b62dc..4431abe83c7 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -216,7 +216,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
 		$result=$this->instance->search('logo');
 		$this->assertEqual(2,count($result));
-		$this->assertNotIdentical(false,array_search('/logo-wide.svg',$result));
-		$this->assertNotIdentical(false,array_search('/logo-wide.png',$result));
+		$this->assertContains('/logo-wide.svg',$result);
+		$this->assertContains('/logo-wide.png',$result);
 	}
 }
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 4239033551d..315471e8555 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -24,7 +24,7 @@ class Test_Filesystem extends UnitTestCase {
 	/**
 	 * @var array tmpDirs
 	 */
-	private $tmpDirs;
+	private $tmpDirs=array();
 
 	/**
 	 * @return array
@@ -73,7 +73,12 @@ class Test_Filesystem extends UnitTestCase {
 	}
 
 	public function testHooks() {
-		$user = OC_User::getUser();
+		if(OC_User::isLoggedIn()){
+			$user = OC_User::getUser();
+		}else{
+			$user=uniqid();
+			OC_Filesystem::init('/'.$user.'/files');
+		}
 		OC_Hook::clear('OC_Filesystem');
 		OC_Hook::connect('OC_Filesystem', 'post_write', $this, 'dummyHook');
 
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b2fecdc8bf7..df91a27c6e1 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -61,8 +61,10 @@ class Test_Share extends UnitTestCase {
 		$query->execute(array('test'));
 	}
 
+	/**
+	 * @expectedException Exception
+	 */
 	public function testShareInvalidShareType() {
-		$this->expectException(new Exception('Share type foobar is not valid for test.txt'));
 		OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\Share::PERMISSION_READ);
 	}
 
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 5d6fe8da826..46838ff9754 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -28,7 +28,7 @@ class Test_StreamWrappers extends UnitTestCase {
 		$result=array();
 		while($file=readdir($dh)) {
 			$result[]=$file;
-			$this->assertNotIdentical(false,array_search($file,$items));
+			$this->assertContains($file, $items);
 		}
 		$this->assertEqual(count($items),count($result));
 	}
@@ -75,4 +75,4 @@ class Test_StreamWrappers extends UnitTestCase {
 	public static function closeCallBack($path) {
 		throw new Exception($path);
 	}
-}
\ No newline at end of file
+}