From e944f39883878ec1982145c2b81d1ed0183c5c7a Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 10 Feb 2012 15:36:45 +0100 Subject: [PATCH] Fix build --- lib/unitTest/api/v1/aplicationTest.php | 10 ++++++++-- lib/unitTest/api/v1/aplicationYamlTest.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/unitTest/api/v1/aplicationTest.php b/lib/unitTest/api/v1/aplicationTest.php index 4e0d0d8bdd..2cd52337e2 100644 --- a/lib/unitTest/api/v1/aplicationTest.php +++ b/lib/unitTest/api/v1/aplicationTest.php @@ -628,7 +628,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract $record = $databox->get_record($record_id); $caption = $record->get_caption(); - $this->assertEquals(count($caption->get_fields()), count($content->response->metadatas)); + $this->assertEquals(count($caption->get_fields()), count(get_object_vars($content->response->metadatas)), 'Retrived metadatas are the same'); foreach ($caption->get_fields() as $field) { @@ -661,6 +661,9 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract $collection = array_shift($databox->get_collections()); $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg'); + if(!$collection instanceof \collection) + $this->fail('unable to find a collection'); + $record = record_adapter::create($collection, $system_file); $record_id = $record->get_record_id(); @@ -725,6 +728,9 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract $collection = array_shift($databox->get_collections()); $system_file = new system_file(dirname(__FILE__) . '/../../testfiles/cestlafete.jpg'); + if(!$collection instanceof \collection) + $this->fail('unable to find a collection'); + $record = record_adapter::create($collection, $system_file); $record_id = $record->get_record_id(); @@ -1194,7 +1200,7 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract $this->assertObjectHasAttribute("metadatas", $content->response); foreach ($content->response->metadatas as $meta) { - $this->assertTrue(is_object($meta->metadatas), 'Un bloc meta est un objet'); + $this->assertTrue(is_object($meta), 'Un bloc meta est un objet'); $this->assertObjectHasAttribute('meta_id', $meta); $this->assertTrue(is_int($meta->meta_id)); $this->assertObjectHasAttribute('meta_structure_id', $meta); diff --git a/lib/unitTest/api/v1/aplicationYamlTest.php b/lib/unitTest/api/v1/aplicationYamlTest.php index 8f18e626c4..9aefae9a6b 100644 --- a/lib/unitTest/api/v1/aplicationYamlTest.php +++ b/lib/unitTest/api/v1/aplicationYamlTest.php @@ -1226,7 +1226,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract $this->assertArrayHasKey("metadatas", $content["response"]); foreach ($content["response"]["metadatas"] as $meta) { - $this->assertTrue(is_array($meta["metadatas"]), 'Un bloc meta est un array'); + $this->assertTrue(is_array($meta), 'Un bloc meta est un array'); $this->assertArrayHasKey('meta_id', $meta); $this->assertTrue(is_int($meta["meta_id"])); $this->assertArrayHasKey('meta_structure_id', $meta);