From 5c35a0a4fb69c7241d69a45d220a7a5056afdba2 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 28 Sep 2012 16:17:18 +0200 Subject: [PATCH] Cleanup $registry use --- .../Phrasea/Application/OverviewTest.php | 1 - .../Alchemy/Phrasea/Application/SetupTest.php | 8 ++----- .../Core/ServiceBuilder/OrmBuilderTest.php | 2 -- tests/Feed/Feed_AdapterTest.php | 21 ++++++++----------- tests/Feed/Feed_AggregateTest.php | 21 ++++++++----------- ...WebTestCaseAuthenticatedAbstract.class.inc | 6 ++---- tests/Session/Session_LoggerTest.php | 6 ++---- .../Permalink/media_Permalink_AdapterTest.php | 5 ++--- 8 files changed, 26 insertions(+), 44 deletions(-) diff --git a/tests/Alchemy/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Phrasea/Application/OverviewTest.php index 8c623fb0e2..54b2a42717 100644 --- a/tests/Alchemy/Phrasea/Application/OverviewTest.php +++ b/tests/Alchemy/Phrasea/Application/OverviewTest.php @@ -8,7 +8,6 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract { function testDatafilesRouteAuthenticated() { - $registry = self::$DI['app']['phraseanet.registry']; $crawler = self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/'); $response = self::$DI['client']->getResponse(); diff --git a/tests/Alchemy/Phrasea/Application/SetupTest.php b/tests/Alchemy/Phrasea/Application/SetupTest.php index ccdf3a091e..eaf86683d4 100644 --- a/tests/Alchemy/Phrasea/Application/SetupTest.php +++ b/tests/Alchemy/Phrasea/Application/SetupTest.php @@ -45,10 +45,8 @@ class ApplicationSetupTest extends PhraseanetWebTestCaseAbstract 'GV_pdftotext', ); - $registry = self::$DI['app']['phraseanet.registry']; - foreach ($params as $param) { - $this->registry[$param] = $registry->get($param); + $this->registry[$param] = self::$DI['app']['phraseanet.registry']->get($param); } } @@ -57,10 +55,8 @@ class ApplicationSetupTest extends PhraseanetWebTestCaseAbstract $this->temporaryReInstall(); self::$DI['app']['phraseanet.appbox']->set_connection($this->connection); - $registry = self::$DI['app']['phraseanet.registry']; - foreach ($this->registry as $param => $value) { - $registry->set($param, $value, \registry::TYPE_STRING); + self::$DI['app']['phraseanet.registry']->set($param, $value, \registry::TYPE_STRING); } parent::tearDown(); diff --git a/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php b/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php index 3bbf1088c3..1e5fe61c62 100644 --- a/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php +++ b/tests/Alchemy/Phrasea/Core/ServiceBuilder/OrmBuilderTest.php @@ -25,8 +25,6 @@ class OrmBuilderTest extends PhraseanetPHPUnitAbstract public function testCreate() { - $registry = $this->getMock("\RegistryInterface"); - $configuration = new ParameterBag( array("type" => "Orm\\Doctrine", "options" => array( "debug" => false diff --git a/tests/Feed/Feed_AdapterTest.php b/tests/Feed/Feed_AdapterTest.php index 4459771fd5..9b2dd763b7 100644 --- a/tests/Feed/Feed_AdapterTest.php +++ b/tests/Feed/Feed_AdapterTest.php @@ -206,33 +206,30 @@ class Feed_AdapterTest extends PhraseanetPHPUnitAuthenticatedAbstract public function testGet_homepage_link() { self::$object->set_public(false); - $registry = self::$DI['app']['phraseanet.registry']; - $link = self::$object->get_homepage_link($registry, Feed_Adapter::FORMAT_ATOM); + $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); $this->assertNull($link); self::$object->set_public(true); - $link = self::$object->get_homepage_link($registry, Feed_Adapter::FORMAT_ATOM); + $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); $this->assertInstanceOf('Feed_Link', $link); } public function testGet_user_link() { - $registry = self::$DI['app']['phraseanet.registry']; - - $link = self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM); + $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM); $supposed = '/feeds\/userfeed\/([a-zA-Z0-9]{12})\/' . self::$object->get_id() . '\/atom\//'; $atom = $link->get_href(); - $this->assertRegExp($supposed, str_replace($registry->get('GV_ServerName'), '', $atom)); - $this->assertEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); + $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $atom)); + $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); + $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertNotEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); + $this->assertNotEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); - $link = self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_RSS); + $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS); $supposed = '/feeds\/userfeed\/([a-zA-Z0-9]{12})\/' . self::$object->get_id() . '\/rss\//'; - $this->assertRegExp($supposed, str_replace($registry->get('GV_ServerName'), '', $link->get_href())); + $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $link->get_href())); } public function testGet_title() diff --git a/tests/Feed/Feed_AggregateTest.php b/tests/Feed/Feed_AggregateTest.php index 5910fdf70d..82bbc5892d 100644 --- a/tests/Feed/Feed_AggregateTest.php +++ b/tests/Feed/Feed_AggregateTest.php @@ -56,30 +56,27 @@ class Feed_AggregateTest extends PhraseanetPHPUnitAuthenticatedAbstract public function testGet_homepage_link() { - $registry = self::$DI['app']['phraseanet.registry']; - $link = self::$object->get_homepage_link($registry, Feed_Adapter::FORMAT_ATOM); + $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); $this->assertInstanceOf('Feed_Link', $link); - $this->assertEquals($registry->get('GV_ServerName') . 'feeds/aggregated/atom/', $link->get_href()); + $this->assertEquals(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/aggregated/atom/', $link->get_href()); } public function testGet_user_link() { - $registry = self::$DI['app']['phraseanet.registry']; - - $link = self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM); + $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM); $supposed = '/feeds\/userfeed\/aggregated\/([a-zA-Z0-9]{12})\/atom\//'; $atom = $link->get_href(); - $this->assertRegExp($supposed, str_replace($registry->get('GV_ServerName'), '', $atom)); - $this->assertEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); + $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $atom)); + $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); + $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertNotEquals($atom, self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); + $this->assertNotEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); - $link = self::$object->get_user_link($registry, self::$DI['user'], Feed_Adapter::FORMAT_RSS); + $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS); $supposed = '/feeds\/userfeed\/aggregated\/([a-zA-Z0-9]{12})\/rss\//'; - $this->assertRegExp($supposed, str_replace($registry->get('GV_ServerName'), '', $link->get_href())); + $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $link->get_href())); } public function testGet_created_on() diff --git a/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc b/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc index 4191f501cd..3887b60350 100644 --- a/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc +++ b/tests/PhraseanetWebTestCaseAuthenticatedAbstract.class.inc @@ -92,8 +92,6 @@ abstract class PhraseanetWebTestCaseAuthenticatedAbstract extends PhraseanetPHPU public function createDatabox() { - $registry = self::$DI['app']['phraseanet.registry']; - $this->createDatabase(); $configuration = self::$DI['app']['phraseanet.configuration']; @@ -102,14 +100,14 @@ abstract class PhraseanetWebTestCaseAuthenticatedAbstract extends PhraseanetPHPU $connexion = $configuration->getConnexion($choosenConnexion); try { - $conn = new \connection_pdo('databox_creation', $connexion->get('host'), $connexion->get('port'), $connexion->get('user'), $connexion->get('password'), 'unit_test_db', array(), $registry); + $conn = new \connection_pdo('databox_creation', $connexion->get('host'), $connexion->get('port'), $connexion->get('user'), $connexion->get('password'), 'unit_test_db', array(), self::$DI['app']['phraseanet.registry']); } catch (\PDOException $e) { $this->markTestSkipped('Could not reach DB'); } $databox = \databox::create( - self::$DI['app'], $conn, new \SplFileInfo($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/fr-simple.xml'), $registry + self::$DI['app'], $conn, new \SplFileInfo(self::$DI['app']['phraseanet.registry']->get('GV_RootPath') . 'lib/conf.d/data_templates/fr-simple.xml'), self::$DI['app']['phraseanet.registry'] ); self::$createdDataboxes[] = $databox; diff --git a/tests/Session/Session_LoggerTest.php b/tests/Session/Session_LoggerTest.php index 5d0909169d..4e45d4e763 100644 --- a/tests/Session/Session_LoggerTest.php +++ b/tests/Session/Session_LoggerTest.php @@ -38,14 +38,12 @@ class Session_LoggerTest extends PhraseanetPHPUnitAbstract $log_id = $this->object->get_id(); $this->assertTrue(is_int($log_id)); - $registry = self::$DI['app']['phraseanet.registry']; - $sql = 'SELECT id FROM log WHERE sit_session = :ses_id AND usrid = :usr_id AND site = :site'; $params = array( ':ses_id' => self::$DI['app']['session']->get('phrasea_session_id') , ':usr_id' => self::$DI['app']['phraseanet.user']->get_id() - , ':site' => $registry->get('GV_sit') + , ':site' => self::$DI['app']['phraseanet.registry']->get('GV_sit') ); $stmt = $this->databox->get_connection()->prepare($sql); @@ -64,7 +62,7 @@ class Session_LoggerTest extends PhraseanetPHPUnitAbstract $params = array( ':ses_id' => $ses_id , ':usr_id' => $usr_id - , ':site' => $registry->get('GV_sit') + , ':site' => self::$DI['app']['phraseanet.registry']->get('GV_sit') ); $stmt = $this->databox->get_connection()->prepare($sql); diff --git a/tests/media/Permalink/media_Permalink_AdapterTest.php b/tests/media/Permalink/media_Permalink_AdapterTest.php index 50b19adddb..3f7e3150bd 100644 --- a/tests/media/Permalink/media_Permalink_AdapterTest.php +++ b/tests/media/Permalink/media_Permalink_AdapterTest.php @@ -43,11 +43,10 @@ class media_Permalink_AdapterTest extends PhraseanetPHPUnitAbstract public function testGet_url() { - $registry = self::$DI['app']['phraseanet.registry']; - $url = $registry->get('GV_ServerName') . 'permalink/v1/' . static::$object->get_label() . '/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . + $url = self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'permalink/v1/' . static::$object->get_label() . '/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . static::$object->get_token() . '/document/'; - $this->assertEquals($url, static::$object->get_url($registry)); + $this->assertEquals($url, static::$object->get_url(self::$DI['app']['phraseanet.registry'])); } /**