From a51af395952b428bfbec03e04991849049f32a5d Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 5 Aug 2013 14:47:14 +0200 Subject: [PATCH 1/2] Add unittests Unittests for: - search/result - util - preferences --- tests/lib/preferences.php | 121 ++++++++++++++++++++++++++++++++++++ tests/lib/search/result.php | 17 +++++ tests/lib/util.php | 30 +++++++++ 3 files changed, 168 insertions(+) create mode 100644 tests/lib/preferences.php create mode 100644 tests/lib/search/result.php diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php new file mode 100644 index 0000000000..d39555aa01 --- /dev/null +++ b/tests/lib/preferences.php @@ -0,0 +1,121 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_Preferences extends PHPUnit_Framework_TestCase { + private function fillDb() { + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)'); + $query->execute(array("Someuser", "someapp", "somekey", "somevalue")); + + $query->execute(array("Someuser", "getusersapp", "somekey", "somevalue")); + $query->execute(array("Anotheruser", "getusersapp", "somekey", "someothervalue")); + $query->execute(array("Anuser", "getusersapp", "somekey", "somevalue")); + + $query->execute(array("Someuser", "getappsapp", "somekey", "somevalue")); + + $query->execute(array("Someuser", "getkeysapp", "firstkey", "somevalue")); + $query->execute(array("Someuser", "getkeysapp", "anotherkey", "somevalue")); + $query->execute(array("Someuser", "getkeysapp", "key-tastic", "somevalue")); + + $query->execute(array("Someuser", "getvalueapp", "key", "a value for a key")); + + $query->execute(array("Deleteuser", "deleteapp", "deletekey", "somevalue")); + $query->execute(array("Deleteuser", "deleteapp", "somekey", "somevalue")); + $query->execute(array("Deleteuser", "someapp", "somekey", "somevalue")); + } + + public function testGetUsers() { + $this->fillDb(); + + $query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`'); + $result = $query->execute(); + $expected = array(); + while ($row = $result->fetchRow()) { + $expected[] = $row['userid']; + } + + $this->assertEquals($expected, \OC_Preferences::getUsers()); + } + + public function testGetApps() { + $query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'); + $result = $query->execute(array('Someuser')); + $expected = array(); + while ($row = $result->fetchRow()) { + $expected[] = $row['appid']; + } + + $this->assertEquals($expected, \OC_Preferences::getApps('Someuser')); + } + + public function testGetKeys() { + $query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'); + $result = $query->execute(array('Someuser', 'getkeysapp')); + $expected = array(); + while ($row = $result->fetchRow()) { + $expected[] = $row['configkey']; + } + + $this->assertEquals($expected, \OC_Preferences::getKeys('Someuser', 'getkeysapp')); + } + + public function testGetValue() { + $this->assertNull(\OC_Preferences::getValue('nonexistant', 'nonexistant', 'nonexistant')); + + $this->assertEquals('default', \OC_Preferences::getValue('nonexistant', 'nonexistant', 'nonexistant', 'default')); + + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'); + $result = $query->execute(array('Someuser', 'getvalueapp', 'key')); + $row = $result->fetchRow(); + $expected = $row['configvalue']; + $this->assertEquals($expected, \OC_Preferences::getValue('Someuser', 'getvalueapp', 'key')); + } + + public function testSetValue() { + $this->assertTrue(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'newvalue')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'); + $result = $query->execute(array('Someuser', 'setvalueapp', 'newkey')); + $row = $result->fetchRow(); + $value = $row['configvalue']; + $this->assertEquals('newvalue', $value); + + $this->assertTrue(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'othervalue')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'); + $result = $query->execute(array('Someuser', 'setvalueapp', 'newkey')); + $row = $result->fetchRow(); + $value = $row['configvalue']; + $this->assertEquals('othervalue', $value); + } + + public function testDeleteKey() { + $this->assertTrue(\OC_Preferences::deleteKey('Deleteuser', 'deleteapp', 'deletekey')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'); + $result = $query->execute(array('Deleteuser', 'deleteapp', 'deletekey')); + $this->assertEquals(0, $result->numRows()); + } + + public function testDeleteApp() { + $this->assertTrue(\OC_Preferences::deleteApp('Deleteuser', 'deleteapp')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'); + $result = $query->execute(array('Deleteuser', 'deleteapp')); + $this->assertEquals(0, $result->numRows()); + } + + public function testDeleteUser() { + $this->assertTrue(\OC_Preferences::deleteUser('Deleteuser')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?'); + $result = $query->execute(array('Deleteuser')); + $this->assertEquals(0, $result->numRows()); + } + + public function testDeleteAppFromAllUsers() { + $this->assertTrue(\OC_Preferences::deleteAppFromAllUsers('someapp')); + $query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `appid` = ?'); + $result = $query->execute(array('someapp')); + $this->assertEquals(0, $result->numRows()); + } +} diff --git a/tests/lib/search/result.php b/tests/lib/search/result.php new file mode 100644 index 0000000000..94a7f76bd1 --- /dev/null +++ b/tests/lib/search/result.php @@ -0,0 +1,17 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_Search_Result extends PHPUnit_Framework_TestCase { + public function testConstruct() { + $result = new \OC_Search_Result("name", "text", "link", "type"); + $this->assertEquals('name', $result->name); + $this->assertEquals('text', $result->text); + $this->assertEquals('link', $result->link); + $this->assertEquals('type', $result->type); + } +} diff --git a/tests/lib/util.php b/tests/lib/util.php index a038538d7e..13aa49c8c6 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -7,6 +7,23 @@ */ class Test_Util extends PHPUnit_Framework_TestCase { + public function testGetVersion() { + $version = \OC_Util::getVersion(); + $this->assertTrue(is_array($version)); + foreach ($version as $num) { + $this->assertTrue(is_int($num)); + } + } + + public function testGetVersionString() { + $version = \OC_Util::getVersionString(); + $this->assertTrue(is_string($version)); + } + + public function testGetEditionString() { + $edition = \OC_Util::getEditionString(); + $this->assertTrue(is_string($edition)); + } function testFormatDate() { date_default_timezone_set("UTC"); @@ -41,6 +58,19 @@ class Test_Util extends PHPUnit_Framework_TestCase { $this->assertEquals("/%C2%A7%23%40test%25%26%5E%C3%A4/-child", $result); } + public function testFileInfoLoaded() { + $expected = function_exists('finfo_open'); + $this->assertEquals($expected, \OC_Util::fileInfoLoaded()); + } + + public function testIsInternetConnectionEnabled() { + \OC_Config::setValue("has_internet_connection", false); + $this->assertFalse(\OC_Util::isInternetConnectionEnabled()); + + \OC_Config::setValue("has_internet_connection", true); + $this->assertTrue(\OC_Util::isInternetConnectionEnabled()); + } + function testGenerate_random_bytes() { $result = strlen(OC_Util::generate_random_bytes(59)); $this->assertEquals(59, $result); From 87ad6771515851bcfd933bf62bbf1bfd78f940f6 Mon Sep 17 00:00:00 2001 From: kondou Date: Mon, 5 Aug 2013 19:38:52 +0200 Subject: [PATCH 2/2] Remove pointless unittest (search/result) --- tests/lib/search/result.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 tests/lib/search/result.php diff --git a/tests/lib/search/result.php b/tests/lib/search/result.php deleted file mode 100644 index 94a7f76bd1..0000000000 --- a/tests/lib/search/result.php +++ /dev/null @@ -1,17 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -class Test_Search_Result extends PHPUnit_Framework_TestCase { - public function testConstruct() { - $result = new \OC_Search_Result("name", "text", "link", "type"); - $this->assertEquals('name', $result->name); - $this->assertEquals('text', $result->text); - $this->assertEquals('link', $result->link); - $this->assertEquals('type', $result->type); - } -}