hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 20:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Appbox

Browse Source
This commit is contained in:
Romain Neutron
2012-02-21 16:25:07 +01:00
parent 48cf1af785
commit 0a85cf2c32
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/unitTest/Alchemy/Phrasea/Application/ApiJsonTest.php
View File

@@ -27,7 +27,7 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
parent::setUpBeforeClass(); parent::setUpBeforeClass();
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
self::$application = API_OAuth2_Application::create($appbox, self::$user, 'test API v1'); self::$application = API_OAuth2_Application::create($appbox, self::$user, 'test API v1');
$account = API_OAuth2_Account::load_with_user($appbox, self::$application, self::$user); $account = API_OAuth2_Account::load_with_user($appbox, self::$application, self::$user);
self::$token = $account->get_token()->get_value(); self::$token = $account->get_token()->get_value();
@@ -803,7 +803,7 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
$this->evaluateMetaJson200($content); $this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response)); $this->assertEquals(1, count((array) $content->response));
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$this->assertObjectHasAttribute("basket", $content->response); $this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket) foreach ($content->response->basket as $basket)
@@ -815,7 +815,7 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
public function testBasketContent() public function testBasketContent()
{ {
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$usr_id = $appbox->get_session()->get_usr_id(); $usr_id = $appbox->get_session()->get_usr_id();
$basket = $this->insertOneBasket(); $basket = $this->insertOneBasket();

4
lib/unitTest/Alchemy/Phrasea/Application/ApiYamlTest.php
View File

@@ -34,7 +34,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
{ {
parent::setUpBeforeClass(); parent::setUpBeforeClass();
self::$yaml = new Symfony\Component\Yaml\Parser(); self::$yaml = new Symfony\Component\Yaml\Parser();
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
self::$application = API_OAuth2_Application::create($appbox, self::$user, 'test API v1'); self::$application = API_OAuth2_Application::create($appbox, self::$user, 'test API v1');
$account = API_OAuth2_Account::load_with_user($appbox, self::$application, self::$user); $account = API_OAuth2_Account::load_with_user($appbox, self::$application, self::$user);
self::$token = $account->get_token()->get_value(); self::$token = $account->get_token()->get_value();
@@ -825,7 +825,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
$this->evaluateMetaYaml200($content); $this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"])); $this->assertEquals(1, count((array) $content["response"]));
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$this->assertArrayHasKey("basket", $content["response"]); $this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket) foreach ($content["response"]["basket"] as $basket)

2
lib/unitTest/Alchemy/Phrasea/Application/LightboxTest.php
View File

@@ -23,7 +23,7 @@ class ApplicationLightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
{ {
parent::setUp(); parent::setUp();
$this->client = $this->createClient(); $this->client = $this->createClient();
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$this->feed = Feed_Adapter::create($appbox, self::$user, "salut", 'coucou'); $this->feed = Feed_Adapter::create($appbox, self::$user, "salut", 'coucou');
$publisher = array_shift($this->feed->get_publishers()); $publisher = array_shift($this->feed->get_publishers());
$this->entry = Feed_Entry_Adapter::create($appbox, $this->feed, $publisher, 'title', "sub Titkle", " jean pierre", "jp@test.com"); $this->entry = Feed_Entry_Adapter::create($appbox, $this->feed, $publisher, 'title', "sub Titkle", " jean pierre", "jp@test.com");

12
lib/unitTest/Alchemy/Phrasea/Application/OAuth2Test.php
View File

@@ -42,7 +42,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
, 'website' => 'http://website.com/' , 'website' => 'http://website.com/'
); );
self::$appli = API_OAuth2_Application::create(appbox::get_instance(), self::$user, 'test'); self::$appli = API_OAuth2_Application::create(appbox::get_instance(\bootstrap::getCore()), self::$user, 'test');
self::$appli->set_description('une description') self::$appli->set_description('une description')
->set_redirect_uri('http://callback.com/callback/') ->set_redirect_uri('http://callback.com/callback/')
->set_website('http://website.com/') ->set_website('http://website.com/')
@@ -55,7 +55,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
{ {
parent::tearDownAfterClass(); parent::tearDownAfterClass();
if (self::$appli !== false) if (self::$appli !== false)
self::deleteInsertedRow(appbox::get_instance(), self::$appli); self::deleteInsertedRow(appbox::get_instance(\bootstrap::getCore()), self::$appli);
} }
public function setUp() public function setUp()
@@ -96,7 +96,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
{ {
$sql = "SELECT * FROM api_applications WHERE application_id = :app_id"; $sql = "SELECT * FROM api_applications WHERE application_id = :app_id";
$t = array(":app_id" => $rowId); $t = array(":app_id" => $rowId);
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$conn = $appbox->get_connection(); $conn = $appbox->get_connection();
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute($t); $stmt->execute($t);
@@ -109,13 +109,13 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
{ {
$sql = "SELECT api_account_id FROM api_accounts WHERE application_id = :app_id AND usr_id = :usr_id"; $sql = "SELECT api_account_id FROM api_accounts WHERE application_id = :app_id AND usr_id = :usr_id";
$t = array(":app_id" => self::$appli->get_id(), ":usr_id" => self::$user->get_id()); $t = array(":app_id" => self::$appli->get_id(), ":usr_id" => self::$user->get_id());
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$conn = $appbox->get_connection(); $conn = $appbox->get_connection();
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute($t); $stmt->execute($t);
$row = $stmt->fetch(PDO::FETCH_ASSOC); $row = $stmt->fetch(PDO::FETCH_ASSOC);
return new API_OAuth2_Account(appbox::get_instance(), $row["api_account_id"]); return new API_OAuth2_Account(appbox::get_instance(\bootstrap::getCore()), $row["api_account_id"]);
} }
public function setQueryParameters($parameter, $value) public function setQueryParameters($parameter, $value)
@@ -137,7 +137,7 @@ class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstra
public function testAuthorizeRedirect() public function testAuthorizeRedirect()
{ {
//session off //session off
$apps = API_OAuth2_Application::load_authorized_app_by_user(appbox::get_instance(), self::$user); $apps = API_OAuth2_Application::load_authorized_app_by_user(appbox::get_instance(\bootstrap::getCore()), self::$user);
foreach($apps as $app) foreach($apps as $app)
{ {
if($app->get_client_id() == self::$appli->get_client_id()) if($app->get_client_id() == self::$appli->get_client_id())

6
lib/unitTest/Alchemy/Phrasea/Application/OverviewTest.php
View File

@@ -81,7 +81,7 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
function testDatafilesRouteNotAuthenticated() function testDatafilesRouteNotAuthenticated()
{ {
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$appbox->get_session()->logout(); $appbox->get_session()->logout();
$crawler = $this->client->request('GET', '/datafiles/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/preview/'); $crawler = $this->client->request('GET', '/datafiles/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/preview/');
$response = $this->client->getResponse(); $response = $this->client->getResponse();
@@ -94,14 +94,14 @@ class ApplicationOverviewTest extends PhraseanetWebTestCaseAuthenticatedAbstract
function testPermalinkAuthenticated() function testPermalinkAuthenticated()
{ {
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$this->assertTrue($appbox->get_session()->is_authenticated()); $this->assertTrue($appbox->get_session()->is_authenticated());
$this->get_a_permalink(); $this->get_a_permalink();
} }
function testPermalinkNotAuthenticated() function testPermalinkNotAuthenticated()
{ {
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$appbox->get_session()->logout(); $appbox->get_session()->logout();
$this->assertFalse($appbox->get_session()->is_authenticated()); $this->assertFalse($appbox->get_session()->is_authenticated());
$this->get_a_permalink(); $this->get_a_permalink();

4
lib/unitTest/Alchemy/Phrasea/CoreTest.php
View File

@@ -53,7 +53,7 @@ class CoreTest extends PhraseanetPHPUnitAbstract
public function testIsAuthenticathed() public function testIsAuthenticathed()
{ {
$this->assertFalse(self::$core->isAuthenticated()); $this->assertFalse(self::$core->isAuthenticated());
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session(); $session = $appbox->get_session();
$auth = new Session_Authentication_None(self::$user); $auth = new Session_Authentication_None(self::$user);
$session->authenticate($auth); $session->authenticate($auth);
@@ -63,7 +63,7 @@ class CoreTest extends PhraseanetPHPUnitAbstract
public function testGetAuthenticathed() public function testGetAuthenticathed()
{ {
$appbox = appbox::get_instance(); $appbox = appbox::get_instance(\bootstrap::getCore());
$session = $appbox->get_session(); $session = $appbox->get_session();
$auth = new Session_Authentication_None(self::$user); $auth = new Session_Authentication_None(self::$user);
$session->authenticate($auth); $session->authenticate($auth);