Merge branch 'phpunit'

16 files changed, 122 insertions, 175 deletions

diff --git a/tests/apps.php b/tests/apps.php
new file mode 100644
index 00000000000..3e27b81df61
--- /dev/null
+++ b/tests/apps.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+function loadDirectory($path) {
+	if ($dh = opendir($path)) {
+		while ($name = readdir($dh)) {
+			if ($name[0] !== '.') {
+				$file = $path . '/' . $name;
+				if (is_dir($file)) {
+					loadDirectory($file);
+				} elseif (substr($name, -4, 4) === '.php') {
+					require_once $file;
+				}
+			}
+		}
+	}
+}
+
+function getSubclasses($parentClassName) {
+	$classes = array();
+	foreach (get_declared_classes() as $className) {
+		if (is_subclass_of($className, $parentClassName))
+			$classes[] = $className;
+	}
+
+	return $classes;
+}
+
+$apps = OC_App::getEnabledApps();
+
+foreach ($apps as $app) {
+	$dir = OC_App::getAppPath($app);
+	if (is_dir($dir . '/tests')) {
+		loadDirectory($dir . '/tests');
+	}
+}
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/data/data.tar.gz b/tests/data/data.tar.gz
new file mode 100644
index 00000000000..39f2cdada02
--- /dev/null
+++ b/tests/data/data.tar.gz
diff --git a/tests/data/data.zip b/tests/data/data.zip
new file mode 100644
index 00000000000..eccef53eb4e
--- /dev/null
+++ b/tests/data/data.zip
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/archive.php b/tests/lib/archive.php
index 565c314cb8c..04ae722aea7 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -22,46 +22,46 @@ abstract class Test_Archive extends UnitTestCase {
 	 * @return OC_Archive
 	 */
 	abstract protected function getNew();
-	
+
 	public function testGetFiles() {
 		$this->instance=$this->getExisting();
 		$allFiles=$this->instance->getFiles();
 		$expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt');
 		$this->assertEqual(4,count($allFiles),'only found '.count($allFiles).' out of 4 expected files');
 		foreach($expected as $file) {
-			$this->assertNotIdentical(false,array_search($file,$allFiles),'cant find '.$file.' in archive');
+			$this->assertContains($file, $allFiles, 'cant find '.  $file . ' in archive');
 			$this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive');
 		}
 		$this->assertFalse($this->instance->fileExists('non/existing/file'));
-		
+
 		$rootContent=$this->instance->getFolder('');
 		$expected=array('lorem.txt','logo-wide.png','dir/');
 		$this->assertEqual(3,count($rootContent));
 		foreach($expected as $file) {
-			$this->assertNotIdentical(false,array_search($file,$rootContent),'cant find '.$file.' in archive');
+			$this->assertContains($file, $rootContent, 'cant find '.  $file . ' in archive');
 		}
 
 		$dirContent=$this->instance->getFolder('dir/');
 		$expected=array('lorem.txt');
 		$this->assertEqual(1,count($dirContent));
 		foreach($expected as $file) {
-			$this->assertNotIdentical(false,array_search($file,$dirContent),'cant find '.$file.' in archive');
+			$this->assertContains($file, $dirContent, 'cant find '.  $file . ' in archive');
 		}
 	}
-	
+
 	public function testContent() {
 		$this->instance=$this->getExisting();
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt'));
-		
+
 		$tmpFile=OCP\Files::tmpFile('.txt');
 		$this->instance->extractFile('lorem.txt',$tmpFile);
 		$this->assertEqual(file_get_contents($textFile),file_get_contents($tmpFile));
 	}
 
 	public function testWrite() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
 		$this->assertEqual(0,count($this->instance->getFiles()));
@@ -69,14 +69,14 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertEqual(1,count($this->instance->getFiles()));
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
 		$this->assertFalse($this->instance->fileExists('lorem.txt/'));
-		
+
 		$this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt'));
 		$this->instance->addFile('lorem.txt','foobar');
 		$this->assertEqual('foobar',$this->instance->getFile('lorem.txt'));
 	}
 
 	public function testReadStream() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getExisting();
 		$fh=$this->instance->getStream('lorem.txt','r');
 		$this->assertTrue($fh);
@@ -85,7 +85,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),$content);
 	}
 	public function testWriteStream() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getNew();
 		$fh=$this->instance->getStream('lorem.txt','w');
 		$source=fopen($dir.'/lorem.txt','r');
@@ -107,7 +107,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertFalse($this->instance->fileExists('/test/'));
 	}
 	public function testExtract() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getExisting();
 		$tmpDir=OCP\Files::tmpFolder();
 		$this->instance->extract($tmpDir);
@@ -118,7 +118,7 @@ abstract class Test_Archive extends UnitTestCase {
 		OCP\Files::rmdirr($tmpDir);
 	}
 	public function testMoveRemove() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
 		$this->instance->addFile('lorem.txt',$textFile);
@@ -131,7 +131,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertFalse($this->instance->fileExists('target.txt'));
 	}
 	public function testRecursive() {
-		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
+		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getNew();
 		$this->instance->addRecursive('/dir',$dir);
 		$this->assertTrue($this->instance->fileExists('/dir/lorem.txt'));
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 2595b7cb195..51de004813a 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -8,17 +8,13 @@
 
 require_once 'archive.php';
 
-if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) {
-	class Test_Archive_TAR extends Test_Archive{
-		protected function getExisting() {
-			$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
-			return new OC_Archive_TAR($dir.'/data.tar.gz');
-		}
+class Test_Archive_TAR extends Test_Archive {
+	protected function getExisting() {
+		$dir = OC::$SERVERROOT . '/tests/data';
+		return new OC_Archive_TAR($dir . '/data.tar.gz');
+	}
 
-		protected function getNew() {
-			return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
-		}
+	protected function getNew() {
+		return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
 	}
-}else{
-	abstract class Test_Archive_TAR extends Test_Archive{}
 }
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index a7682e34180..adddf81ee1b 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -8,17 +8,13 @@
 
 require_once 'archive.php';
 
-if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) {
-	class Test_Archive_ZIP extends Test_Archive{
-		protected function getExisting() {
-			$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
-			return new OC_Archive_ZIP($dir.'/data.zip');
-		}
+class Test_Archive_ZIP extends Test_Archive {
+	protected function getExisting() {
+		$dir = OC::$SERVERROOT . '/tests/data';
+		return new OC_Archive_ZIP($dir . '/data.zip');
+	}
 
-		protected function getNew() {
-			return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
-		}
+	protected function getNew() {
+		return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
 	}
-}else{
-	abstract class Test_Archive_ZIP extends Test_Archive{}
 }
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 9ada0accc21..08653d4a310 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() {
@@ -64,16 +66,4 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertFalse($this->instance->hasKey('2_value1'));
 		$this->assertFalse($this->instance->hasKey('3_value1'));
 	}
-
-	function testTTL() {
-		$value='foobar';
-		$this->instance->set('value1',$value,1);
-		$value2='foobar';
-		$this->instance->set('value2',$value2);
-		sleep(2);
-		$this->assertFalse($this->instance->hasKey('value1'));
-		$this->assertNull($this->instance->get('value1'));
-		$this->assertTrue($this->instance->hasKey('value2'));
-		$this->assertEqual($value2,$this->instance->get('value2'));
-	}
 }
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
index 34ea968cd54..0e0edcf58f3 100644
--- a/tests/lib/cache/apc.php
+++ b/tests/lib/cache/apc.php
@@ -21,16 +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();
 	}
-
-	function testTTL() {
-		// ttl doesn't work correctly in the same request
-		// see https://bugs.php.net/bug.php?id=58084
-	}
 }
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index 85cc2d8b3c6..c081036a31f 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -21,15 +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();
 	}
-
-	function testTTL() {
-		// ttl doesn't work correctly in the same request
-	}
 }
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 101da0d1ada..ae780bee85a 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -218,7 +218,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 a13b80cc5c1..e22b3f1c0d8 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
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index f0b5f120584..48d0270cc57 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..4a2d68a3e47
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="bootstrap.php">
+	<testsuite name='ownCloud'>
+		<directory suffix='.php'>lib/</directory>
+		<file>apps.php</file>
+	</testsuite>
+</phpunit>