initual phpunit support

10 files changed, 57 insertions, 118 deletions

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000000..73c6e395299
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,26 @@
+<?php
+
+require_once __DIR__.'/../lib/base.php';
+
+if(!class_exists('PHPUnit_Framework_TestCase')){
+	require_once('PHPUnit/Autoload.php');
+}
+
+//SimpleTest compatibility
+abstract class UnitTestCase extends PHPUnit_Framework_TestCase{
+	function assertEqual($expected, $actual, $string=''){
+		$this->assertEquals($expected, $actual, $string);
+	}
+
+	function assertNotEqual($expected, $actual, $string=''){
+		$this->assertNotEquals($expected, $actual, $string);
+	}
+
+	static function assertTrue($actual, $string=''){
+		parent::assertTrue((bool)$actual, $string);
+	}
+
+	static function assertFalse($actual, $string=''){
+		parent::assertFalse((bool)$actual, $string);
+	}
+}
diff --git a/tests/index.php b/tests/index.php
deleted file mode 100644
index 82a61c281fd..00000000000
--- a/tests/index.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-//to run only specific tests, use the test parameter to specify an app or 'lib'. e.g. http://localhost/owncloud/tests/?test=user_external
-
-require_once '../lib/base.php';
-require_once 'simpletest/unit_tester.php';
-require_once 'simpletest/mock_objects.php';
-require_once 'simpletest/collector.php';
-require_once 'simpletest/default_reporter.php';
-
-$testSuiteName="ownCloud Unit Test Suite";
-
-// prepare the reporter
-if(OC::$CLI) {
-	$reporter=new TextReporter;
-	$test=isset($_SERVER['argv'][1])?$_SERVER['argv'][1]:false;
-	if($test=='xml') {
-		$reporter= new XmlReporter;
-		$test=false;
-
-		if(isset($_SERVER['argv'][2])) {
-			$testSuiteName=$testSuiteName." (".$_SERVER['argv'][2].")";
-		}
-	}
-}else{
-	$reporter=new HtmlReporter;
-	$test=isset($_GET['test'])?$_GET['test']:false;
-}
-
-// test suite instance
-$testSuite=new TestSuite($testSuiteName);
-
-//load core test cases
-loadTests(dirname(__FILE__), $testSuite, $test, 'lib');
-
-//load app test cases
-
-//
-// TODO: define a list of apps to be enabled + enable them
-//
-
-$apps=OC_App::getEnabledApps();
-foreach($apps as $app) {
-	$testDir=OC_App::getAppPath($app).'/tests';
-	if(is_dir($testDir)) {
-		loadTests($testDir, $testSuite, $test, $app);
-	}
-}
-
-// run the suite
-if($testSuite->getSize()>0) {
-	$testSuite->run($reporter);
-}
-
-// helper below
-function loadTests($dir,$testSuite, $test, $app) {
-	$root=($app=='lib')?OC::$SERVERROOT.'/tests/lib/':OC_App::getAppPath($app).'/tests/';
-	if($dh=opendir($dir)) {
-		while($name=readdir($dh)) {
-			if($name[0]!='.') {//no hidden files, '.' or '..'
-				$file=$dir.'/'.$name;
-				if(is_dir($file)) {
-					loadTests($file, $testSuite, $test, $app);
-				}elseif(substr($file,-4)=='.php' and $file!=__FILE__) {
-					$name=$app.'/'.getTestName($file,$root);
-					if($test===false or $test==$name or substr($name,0,strlen($test))==$test) {
-						$extractor = new SimpleFileLoader();
-						$loadedSuite=$extractor->load($file);
-						if ($loadedSuite->getSize() > 0)
-							$testSuite->add($loadedSuite);
-					}
-				}
-			}
-		}
-	}
-}
-
-function getTestName($file,$root) {
-// 	//TODO: get better test names
-	$file=substr($file,strlen($root));
-	return substr($file,0,-4);//strip .php
-}
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
+}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 00000000000..93b781bca44
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="bootstrap.php">
+	<testsuite name='ownCloud'>
+		<directory suffix='.php'>lib/</directory>
+	</testsuite>
+</phpunit>