aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/public
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-10 23:30:38 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-19 14:53:59 +0100
commit6202ca33ba76a38b4aea8774018d661f919fa464 (patch)
treea108c8631dad790bc8c3fc175c9c330d18c54ad2 /tests/lib/public
parentcb3a598cdb238f9ce74dce80ef9e59cdfc531a4f (diff)
downloadnextcloud-server-6202ca33ba76a38b4aea8774018d661f919fa464.tar.gz
nextcloud-server-6202ca33ba76a38b4aea8774018d661f919fa464.zip
Make remaining files extend the test base
Diffstat (limited to 'tests/lib/public')
-rw-r--r--tests/lib/public/contacts.php11
-rw-r--r--tests/lib/public/ocpconfig.php5
2 files changed, 5 insertions, 11 deletions
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index d6008876a00..151e98d3905 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,17 +19,12 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-class Test_Contacts extends PHPUnit_Framework_TestCase
-{
-
- public function setUp() {
-
+class Test_Contacts extends \Test\TestCase {
+ protected function setUp() {
+ parent::setUp();
OCP\Contacts::clear();
}
- public function tearDown() {
- }
-
public function testDisabledIfEmpty() {
// pretty simple
$this->assertFalse(OCP\Contacts::isEnabled());
diff --git a/tests/lib/public/ocpconfig.php b/tests/lib/public/ocpconfig.php
index 43a9ca625ee..947d2b3c9ef 100644
--- a/tests/lib/public/ocpconfig.php
+++ b/tests/lib/public/ocpconfig.php
@@ -19,12 +19,11 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-class Test_OCPConfig extends PHPUnit_Framework_TestCase
-{
+class Test_OCPConfig extends \Test\TestCase {
public function testSetAppValueIfSetToNull() {
- $key = uniqid("key-");
+ $key = $this->getUniqueID('key-');
$result = \OCP\Config::setAppValue('unit-test', $key, null);
$this->assertTrue($result);