[Pkg-owncloud-commits] [owncloud] 43/70: add test cases. also split test classes in a file each, looks like only the first class is being executed
David Prévot
taffit at moszumanska.debian.org
Mon Jul 14 17:38:07 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 76b310de9d4421e052fc910ffd26cf05c1b17e2d
Author: Arthur Schiwon <blizzz at owncloud.com>
Date: Tue Jul 8 00:20:46 2014 +0200
add test cases. also split test classes in a file each, looks like only the first class is being executed
---
.../{preferences.php => preferences-singleton.php} | 60 ++++++
tests/lib/preferences.php | 219 ++++++---------------
2 files changed, 122 insertions(+), 157 deletions(-)
diff --git a/tests/lib/preferences.php b/tests/lib/preferences-singleton.php
similarity index 85%
copy from tests/lib/preferences.php
copy to tests/lib/preferences-singleton.php
index d31b025..5204775 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences-singleton.php
@@ -212,6 +212,66 @@ class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
$preferences->setValue('grg', 'bar', 'foo', 'v2');
}
+ public function testSetValueUnchanged() {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'foo')))
+ ->will($this->onConsecutiveCalls(0, 1));
+ $connectionMock->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ 'configvalue' => 'v1',
+ )
+ ));
+ $connectionMock->expects($this->never())
+ ->method('executeUpdate');
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ }
+
+ public function testSetValueUnchanged2() {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(2))
+ ->method('fetchColumn')
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'foo')))
+ ->will($this->onConsecutiveCalls(0, 1));
+ $connectionMock->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ 'configvalue' => 'v1',
+ )
+ ));
+ $connectionMock->expects($this->once())
+ ->method('executeUpdate')
+ ->with($this->equalTo("UPDATE `*PREFIX*preferences` SET `configvalue` = ?"
+ . " WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?"),
+ $this->equalTo(array('v2', 'grg', 'bar', 'foo'))
+ );
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v2');
+ $preferences->setValue('grg', 'bar', 'foo', 'v2');
+ }
+
public function testGetUserValues()
{
$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index d31b025..fe8e3e8 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -7,161 +7,6 @@
* See the COPYING-README file.
*/
-class Test_Preferences extends PHPUnit_Framework_TestCase {
- public static function setUpBeforeClass() {
- $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 static function tearDownAfterClass() {
- $query = \OC_DB::prepare('DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?');
- $query->execute(array('Someuser'));
- $query->execute(array('Anotheruser'));
- $query->execute(array('Anuser'));
- }
-
- public function testGetUsers() {
- $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 testSetValueWithPreCondition() {
- // remove existing key
- $this->assertTrue(\OC_Preferences::deleteKey('Someuser', 'setvalueapp', 'newkey'));
-
- // add new preference with pre-condition should fails
- $this->assertFalse(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'newvalue', 'preCondition'));
- $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();
- $this->assertFalse($row);
-
- // add new preference without pre-condition should insert the new value
- $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);
-
- // wrong pre-condition, value should stay the same
- $this->assertFalse(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'othervalue', 'preCondition'));
- $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);
-
- // correct pre-condition, value should change
- $this->assertTrue(\OC_Preferences::setValue('Someuser', 'setvalueapp', 'newkey', 'othervalue', '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('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, count($result->fetchAll()));
- }
-
- 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, count($result->fetchAll()));
- }
-
- 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, count($result->fetchAll()));
- }
-
- 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, count($result->fetchAll()));
- }
-}
-
class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
public function testGetUsers()
{
@@ -185,10 +30,69 @@ class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
$connectionMock->expects($this->exactly(2))
->method('fetchColumn')
- ->with($this->equalTo('SELECT COUNT(*) FROM `*PREFIX*preferences`'
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'foo')))
+ ->will($this->onConsecutiveCalls(false, 'v1'));
+ $connectionMock->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ 'configvalue' => 'v1',
+ )
+ ));
+ $connectionMock->expects($this->once())
+ ->method('executeUpdate')
+ ->with($this->equalTo("UPDATE `*PREFIX*preferences` SET `configvalue` = ?"
+ . " WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?"),
+ $this->equalTo(array('v2', 'grg', 'bar', 'foo'))
+ );
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v2');
+ }
+
+ public function testSetValueUnchanged() {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(3))
+ ->method('fetchColumn')
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences`'
.' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
$this->equalTo(array('grg', 'bar', 'foo')))
- ->will($this->onConsecutiveCalls(0, 1));
+ ->will($this->onConsecutiveCalls(false, 'v1', 'v1'));
+ $connectionMock->expects($this->once())
+ ->method('insert')
+ ->with($this->equalTo('*PREFIX*preferences'),
+ $this->equalTo(
+ array(
+ 'userid' => 'grg',
+ 'appid' => 'bar',
+ 'configkey' => 'foo',
+ 'configvalue' => 'v1',
+ )
+ ));
+ $connectionMock->expects($this->never())
+ ->method('executeUpdate');
+
+ $preferences = new OC\Preferences($connectionMock);
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ $preferences->setValue('grg', 'bar', 'foo', 'v1');
+ }
+
+ public function testSetValueUnchanged2() {
+ $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
+ $connectionMock->expects($this->exactly(3))
+ ->method('fetchColumn')
+ ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences`'
+ .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'),
+ $this->equalTo(array('grg', 'bar', 'foo')))
+ ->will($this->onConsecutiveCalls(false, 'v1', 'v2'));
$connectionMock->expects($this->once())
->method('insert')
->with($this->equalTo('*PREFIX*preferences'),
@@ -210,6 +114,7 @@ class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
$preferences = new OC\Preferences($connectionMock);
$preferences->setValue('grg', 'bar', 'foo', 'v1');
$preferences->setValue('grg', 'bar', 'foo', 'v2');
+ $preferences->setValue('grg', 'bar', 'foo', 'v2');
}
public function testGetUserValues()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list