From 8bb318eb7280e58f666d1ae448ead06728b7674c Mon Sep 17 00:00:00 2001 From: Alexander Fuhr Date: Wed, 12 Nov 2014 17:12:05 +0100 Subject: [PATCH] Update User\Store\DbStoreTest --- .../library/Icinga/User/Store/DbStoreTest.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/test/php/library/Icinga/User/Store/DbStoreTest.php b/test/php/library/Icinga/User/Store/DbStoreTest.php index d98c3fdfc..26f3b6aa0 100644 --- a/test/php/library/Icinga/User/Store/DbStoreTest.php +++ b/test/php/library/Icinga/User/Store/DbStoreTest.php @@ -5,10 +5,10 @@ namespace Tests\Icinga\User\Preferences\Store; use Mockery; -use Exception; use Zend_Config; use Icinga\Test\BaseTestCase; use Icinga\User\Preferences\Store\DbStore; +use Icinga\Exception\NotWritableError; class DatabaseMock { @@ -44,17 +44,17 @@ class FaultyDatabaseMock extends DatabaseMock { public function insert($table, $row) { - throw new Exception(); + throw new NotWritableError(); } public function update($table, $columns, $where) { - throw new Exception(); + throw new NotWritableError(); } public function delete($table, $where) { - throw new Exception(); + throw new NotWritableError(); } } @@ -75,7 +75,7 @@ class DbStoreTest extends BaseTestCase $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array('key' => 'value')) + array('toArray' => array('testsection' => array('key' => 'value'))) ) ); @@ -85,7 +85,7 @@ class DbStoreTest extends BaseTestCase } /** - * @expectedException Icinga\Exception\NotWritableError + * @expectedException \Icinga\Exception\NotWritableError */ public function testWhetherPreferenceInsertionThrowsNotWritableError() { @@ -93,7 +93,7 @@ class DbStoreTest extends BaseTestCase $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array('key' => 'value')) + array('toArray' => array('testsection' => array('key' => 'value'))) ) ); } @@ -102,11 +102,11 @@ class DbStoreTest extends BaseTestCase { $dbMock = new DatabaseMock(); $store = $this->getStore($dbMock); - $store->setPreferences(array('key' => 'value')); + $store->setPreferences(array('testsection' => array('key' => 'value'))); $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array('key' => 'eulav')) + array('toArray' => array('testsection' => array('key' => 'eulav'))) ) ); @@ -116,16 +116,16 @@ class DbStoreTest extends BaseTestCase } /** - * @expectedException Icinga\Exception\NotWritableError + * @expectedException \Icinga\Exception\NotWritableError */ public function testWhetherPreferenceUpdatesThrowNotWritableError() { $store = $this->getStore(new FaultyDatabaseMock()); - $store->setPreferences(array('key' => 'value')); + $store->setPreferences(array('testsection' => array('key' => 'value'))); $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array('key' => 'eulav')) + array('toArray' => array('testsection' => array('key' => 'eulav'))) ) ); } @@ -134,11 +134,11 @@ class DbStoreTest extends BaseTestCase { $dbMock = new DatabaseMock(); $store = $this->getStore($dbMock); - $store->setPreferences(array('key' => 'value')); + $store->setPreferences(array('testsection' => array('key' => 'value'))); $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array()) + array('toArray' => array('testsection' => array())) ) ); @@ -148,16 +148,16 @@ class DbStoreTest extends BaseTestCase } /** - * @expectedException Icinga\Exception\NotWritableError + * @expectedException \Icinga\Exception\NotWritableError */ public function testWhetherPreferenceDeletionThrowsNotWritableError() { $store = $this->getStore(new FaultyDatabaseMock()); - $store->setPreferences(array('key' => 'value')); + $store->setPreferences(array('testsection' => array('key' => 'value'))); $store->save( Mockery::mock( 'Icinga\User\Preferences', - array('toArray' => array()) + array('toArray' => array('testsection' => array('key' => 'foo'))) ) ); }