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

Fix unit tests errors

Browse Source
This commit is contained in:
Romain Neutron
2012-05-03 22:58:59 +02:00
parent a5c558bde1
commit adee030454
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Alchemy/Phrasea/Application/ApiJsonTest.php
View File

@@ -43,6 +43,8 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
*/
protected static $adminApplication;
protected static $databoxe_ids = array();
protected static $need_records = 1;
protected static $need_subdefs = true;
public function setUp()
{
@@ -724,13 +726,9 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
{
$this->setToken(self::$token);
$record_id = self::$record_1->get_record_id();
$keys = array_keys(self::$record_1->get_subdefs());
$keys = array_keys($record->get_subdefs());
$record_id = $record->get_record_id();
$route = '/records/' . $databox_id . '/' . $record_id . '/embed/';
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$this->client->request('GET', $route);
@@ -755,7 +753,9 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
public function testRecordsEmbedRouteMime()
{
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/?oauth_token=' . self::$token;
$this->setToken(self::$token);
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->client->request('GET', $route, array('mimes' => array('image/jpg', 'image/jpeg')));
$content = json_decode($this->client->getResponse()->getContent());
@@ -770,7 +770,9 @@ class ApiJsonApplication extends PhraseanetWebTestCaseAbstract
public function testRecordsEmbedRouteDevices()
{
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/?oauth_token=' . self::$token;
$this->setToken(self::$token);
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->client->request('GET', $route, array('devices' => array('nodevice')));
$content = json_decode($this->client->getResponse()->getContent());

13
tests/Alchemy/Phrasea/Application/ApiYamlTest.php
View File

@@ -135,6 +135,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
public function testCheckNativeApp()
{
$this->setToken(self::$token);
$appbox = appbox::get_instance(\bootstrap::getCore());
$registry = $this->getMock('\\registry', array(), array(), '', false);
@@ -156,7 +157,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
$account = API_OAuth2_Account::create($appbox, self::$user, $nativeApp);
$token = $account->get_token()->get_value();
$this->setToken($token);
$this->client->request('GET', '/databoxes/list/?oauth_token=' . $token, array(), array(), array('HTTP_Accept' => 'application/yaml'));
$this->client->request('GET', '/databoxes/list/', array(), array(), array('HTTP_Accept' => 'application/yaml'));
$content = $content = self::$yaml->parse($this->client->getResponse()->getContent());
if (403 != $content["meta"]["http_code"]) {
@@ -733,7 +734,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
$this->setToken(self::$token);
$keys = array_keys(self::$record_1->get_subdefs());
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/?oauth_token=' . self::$token;
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$this->client->request('GET', $route, array(), array(), array("HTTP_ACCEPT" => "application/yaml"));
@@ -758,7 +759,8 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
public function testRecordsEmbedRouteMime()
{
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/?oauth_token=' . self::$token;
$this->setToken(self::$token);
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->client->request('GET', $route, array('mimes' => array('image/jpg', 'image/jpeg')), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
@@ -773,7 +775,8 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
public function testRecordsEmbedRouteDevices()
{
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/?oauth_token=' . self::$token;
$this->setToken(self::$token);
$route = '/records/' . self::$record_1->get_sbas_id() . '/' . self::$record_1->get_record_id() . '/embed/';
$this->client->request('GET', $route, array('devices' => array('nodevice')), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
@@ -866,7 +869,7 @@ class ApiYamlApplication extends PhraseanetWebTestCaseAbstract
}
$code = http_query::getHttpCodeFromUrl($url);
$this->assertEquals(200, $code);
$this->assertEquals(200, $code, sprintf('verification de url %s', $url));
}
public function testRecordsRelatedRoute()

2
tests/module/console/module_console_schedulerStateTest.php
View File

@@ -20,7 +20,7 @@ class module_console_schedulerStateTest extends PHPUnit_Framework_TestCase
$task_manager = new task_manager(appbox::get_instance(\bootstrap::getCore()));
$state = $task_manager->get_scheduler_state();
$sentence = sprintf('Scheduler is %s', $state['state']);
$sentence = sprintf('Scheduler is %s', $state['status']);
$this->assertTrue(strpos($commandTester->getDisplay(), $sentence) !== false);
}