From de7c69482349a508077541e677ad087634b0eae6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 10 Nov 2014 23:59:31 +0100 Subject: [PATCH] Make all tests extend the new \Test\TestCase --- tests/ftp.php | 5 +++-- tests/imap.php | 6 ++++-- tests/smb.php | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/ftp.php b/tests/ftp.php index 839d7de..a7c45d3 100644 --- a/tests/ftp.php +++ b/tests/ftp.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_User_FTP extends PHPUnit_Framework_TestCase{ +class Test_User_FTP extends \Test\TestCase { /** * @var OC_User_IMAP $instance */ @@ -21,7 +21,8 @@ class Test_User_FTP extends PHPUnit_Framework_TestCase{ $this->skipUnless($config['ftp']['run']); } - function setUp() { + protected function setUp() { + parent::setUp(); $config=$this->getConfig(); $this->instance=new OC_User_FTP($config['ftp']['host']); } diff --git a/tests/imap.php b/tests/imap.php index 938106d..578139e 100644 --- a/tests/imap.php +++ b/tests/imap.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_User_Imap extends PHPUnit_Framework_TestCase{ +class Test_User_Imap extends \Test\TestCase { /** * @var OC_User_IMAP $instance */ @@ -21,7 +21,9 @@ class Test_User_Imap extends PHPUnit_Framework_TestCase{ $this->skipUnless($config['imap']['run']); } - function setUp() { + protected function setUp() { + parent::setUp(); + $config=$this->getConfig(); $this->instance=new OC_User_IMAP($config['imap']['mailbox']); } diff --git a/tests/smb.php b/tests/smb.php index 4894b99..63c0cda 100644 --- a/tests/smb.php +++ b/tests/smb.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -class Test_User_SMB extends PHPUnit_Framework_TestCase{ +class Test_User_SMB extends \Test\TestCase { /** * @var OC_User_IMAP $instance */ @@ -21,7 +21,9 @@ class Test_User_SMB extends PHPUnit_Framework_TestCase{ $this->skipUnless($config['smb']['run']); } - function setUp() { + protected function setUp() { + parent::setUp(); + $config=$this->getConfig(); $this->instance=new OC_User_SMB($config['smb']['host']); }