Refactor asket_adapter

This commit is contained in:
Romain Neutron
2011-12-28 20:04:39 +01:00
parent bfa8e851c6
commit 646db61ca7
39 changed files with 749 additions and 3623 deletions

View File

@@ -71,24 +71,13 @@ class Bridge_Application extends PhraseanetWebTestCaseAuthenticatedAbstract
$accounts = Bridge_Account::get_accounts_by_user($appbox, self::$user);
$usr_id = self::$user->get_id();
try
{
$basket_coll = new basketCollection($appbox, $usr_id);
$baskets = $basket_coll->get_baskets();
if (count($baskets["baskets"]) > 0)
{
$basket = array_shift($baskets["baskets"]);
$crawler = $this->client->request('POST', '/bridge/manager/', array('ssel' => $basket->get_ssel_id()));
$pageContent = $this->client->getResponse()->getContent();
$this->assertNotContains("Oups ! something went wrong !", $pageContent);
$this->assertEquals(count($accounts) + 2, $crawler->filter('form')->count());
$this->assertTrue($this->client->getResponse()->isOk());
}
}
catch (Exception $e)
{
}
$basket = $this->insertOneBasket();
$crawler = $this->client->request('POST', '/bridge/manager/', array('ssel' => $basket->getId()));
$pageContent = $this->client->getResponse()->getContent();
$this->assertNotContains("Oups ! something went wrong !", $pageContent);
$this->assertEquals(count($accounts) + 2, $crawler->filter('form')->count());
$this->assertTrue($this->client->getResponse()->isOk());
}
public function testLogin()

View File

@@ -1058,6 +1058,77 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
$this->fail('Fail load one Basket : ' . $e->getMessage());
}
}
/**
*
* @return \Entities\BasketElement
*/
protected function insertOneBasketElement()
{
$basket = $this->insertOneBasket();
$basketElement = new \Entities\BasketElement();
$basketElement->setRecord(self::$record_1);
$basketElement->setBasket($basket);
$basket->addBasketElement($basketElement);
$em = self::$core->getEntityManager();
$em->persist($basketElement);
$em->merge($basket);
$em->flush();
return $basketElement;
}
/**
*
* @return \Entities\Basket
*/
protected function insertOneValidationBasket()
{
$em = self::$core->getEntityManager();
$basketElement = $this->insertOneBasketElement();
$basket = $basketElement->getBasket();
$Validation = new Entities\ValidationSession();
$Validation->setBasket($basket);
$Validation->setInitiator(self::$user);
$basket->setValidation($Validation);
$em->persist($Validation);
$em->merge($basket);
$Participant = new Entities\ValidationParticipant();
$Participant->setUser(self::$user);
$Participant->setCanAgree(true);
$Participant->setCanSeeOthers(true);
$Validation->addValidationParticipant($Participant);
$Participant->setSession($Validation);
$em->persist($Participant);
$em->merge($Validation);
$Data = new Entities\ValidationData();
$Data->setBasketElement($basketElement);
$Data->setParticipant($Participant);
$basketElement->addValidationData($Data);
$em->persist($Data);
$em->merge($basketElement);
$em->flush();
return $basket;
}
/**
* Create a new basket with current auhtenticated user as owner

View File

@@ -397,7 +397,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
$em->persist($Basket);
$em->flush();
$ssel_id = $basket->getId();
$ssel_id = $Basket->getId();
$request = new Request(array(), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json'));
$result = $this->object->delete_basket($request, $ssel_id);
@@ -422,12 +422,11 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$baskets = $basket_coll->get_baskets();
$basket = array_pop($baskets['baskets']);
$basket = $this->insertOneBasket();
$request = new Request(array(), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json'));
$result = $this->object->get_basket($request, $basket->get_ssel_id());
$result = $this->object->get_basket($request, $basket->getId());
$this->assertEquals(200, $result->get_http_code());
$this->assertEquals('application/json', $result->get_content_type());
$this->assertTrue(is_object(json_decode($result->format())));
@@ -437,36 +436,38 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$baskets = $basket_coll->get_baskets();
$basket = array_pop($baskets['baskets']);
$basket = $this->insertOneBasket();
$request = new Request(array(), array(), array('name' => 'PROUTO'), array(), array(), array('HTTP_Accept' => 'application/json'));
$result = $this->object->set_basket_title($request, $basket->get_ssel_id());
$result = $this->object->set_basket_title($request, $basket->getId());
$this->assertEquals(200, $result->get_http_code());
$this->assertEquals('application/json', $result->get_content_type());
$this->assertTrue(is_object(json_decode($result->format())));
$basket = basket_adapter::getInstance($appbox, $basket->get_ssel_id(), $usr_id);
$this->assertEquals('PROUTO', $basket->get_name());
self::$core->getEntityManager()->refresh($basket);
$this->assertEquals('PROUTO', $basket->getName());
}
public function testSet_basket_description()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$baskets = $basket_coll->get_baskets();
$basket = array_pop($baskets['baskets']);
$basket = $this->insertOneBasket();
$request = new Request(array(), array(), array('description' => 'une belle description'), array(), array(), array('HTTP_Accept' => 'application/json'));
$result = $this->object->set_basket_description($request, $basket->get_ssel_id());
$result = $this->object->set_basket_description($request, $basket->getId());
$this->assertEquals(200, $result->get_http_code());
$this->assertEquals('application/json', $result->get_content_type());
$this->assertTrue(is_object(json_decode($result->format())));
$basket = basket_adapter::getInstance($appbox, $basket->get_ssel_id(), $usr_id);
$this->assertEquals('une belle description', $basket->get_description());
$em = self::$core->getEntityManager();
/* @var $em \Doctrine\ORM\EntityManager */
$em->refresh($basket);
$this->assertEquals('une belle description', $basket->getDescription());
}
public function testSearch_publications()

View File

@@ -795,8 +795,6 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
{
$this->evaluateGoodBasket($basket);
$this->assertEquals('un Joli Nom', $basket->name);
$basket_obj = basket_adapter::getInstance($appbox, $basket->ssel_id, $appbox->get_session()->get_usr_id());
$basket_obj->delete();
}
}
@@ -804,180 +802,132 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$route = '/baskets/' . $basket->getId() . '/content/?oauth_token=' . self::$token;
$found = false;
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$crawler = $this->client->request('GET', $route);
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket_elements", $content->response);
foreach ($content->response->basket_elements as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
$this->evaluateGoodBasket($basket_str);
$this->assertEquals(count($basket->getElements()), count((array) $basket_str->basket_elements));
foreach ($basket_str->basket_elements as $basket_element)
{
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/content/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$crawler = $this->client->request('GET', $route);
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket_elements", $content->response);
foreach ($content->response->basket_elements as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals(count($basket->get_elements()), count((array) $basket_str->basket_elements));
foreach ($basket_str->basket_elements as $basket_element)
{
$this->assertObjectHasAttribute('basket_element_id', $basket_element);
$this->assertObjectHasAttribute('order', $basket_element);
$this->assertObjectHasAttribute('record', $basket_element);
$this->assertObjectHasAttribute('validation_item', $basket_element);
$this->assertTrue(is_bool($basket_element->validation_item));
$this->assertTrue(is_int($basket_element->order));
$this->assertTrue(is_int($basket_element->basket_element_id));
$this->evaluateGoodRecord($basket_element->record);
}
}
$this->assertObjectHasAttribute('basket_element_id', $basket_element);
$this->assertObjectHasAttribute('order', $basket_element);
$this->assertObjectHasAttribute('record', $basket_element);
$this->assertObjectHasAttribute('validation_item', $basket_element);
$this->assertTrue(is_bool($basket_element->validation_item));
$this->assertTrue(is_int($basket_element->order));
$this->assertTrue(is_int($basket_element->basket_element_id));
$this->evaluateGoodRecord($basket_element->record);
}
}
if (!$found)
$this->markTestSkipped('Unable to test basket set title');
}
public function testSetBasketTitle()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$route = '/baskets/' . $basket->getId() . '/setname/?oauth_token=' . self::$token;
$found = false;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$crawler = $this->client->request('POST', $route, array('name' => 'un Joli Nom'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
{
$this->evaluateGoodBasket($basket_str);
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/setname/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('name' => 'un Joli Nom'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->name, 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<i>un Joli Nom<i>'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->name, 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<strong>aéaa'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->name, 'aéaa');
}
break;
}
$this->assertEquals($basket_str->name, 'un Joli Nom');
}
if (!$found)
$this->markTestSkipped('Unable to test basket set title');
$crawler = $this->client->request('POST', $route, array('name' => '<i>un Joli Nom<i>'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->name, 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<strong>aéaa'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->name, 'aéaa');
}
}
public function testSetBasketDescription()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$route = '/baskets/' . $basket->getId() . '/setdescription/?oauth_token=' . self::$token;
$found = false;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$crawler = $this->client->request('POST', $route, array('description' => 'une belle desc'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
{
$this->evaluateGoodBasket($basket_str);
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/setdescription/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('description' => 'une belle desc'));
$content = json_decode($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaJson200($content);
$this->assertEquals(1, count((array) $content->response));
$this->assertObjectHasAttribute("basket", $content->response);
foreach ($content->response->basket as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str->description, 'une belle desc');
}
break;
}
$this->assertEquals($basket_str->description, 'une belle desc');
}
if (!$found)
$this->markTestSkipped('Unable to test basket set description');
}
public function testDeleteBasket()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket = $this->insertOneBasket();
$basket2 = $this->insertOneBasket();
$basket = basket_adapter::create($appbox, 'test suppression panier', User_Adapter::getInstance($usr_id, $appbox));
$route = '/baskets/' . $basket->get_ssel_id() . '/delete/?oauth_token=' . self::$token;
$route = '/baskets/' . $basket->getId() . '/delete/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
@@ -988,9 +938,16 @@ class API_V1_test_adapter extends PhraseanetWebTestCaseAbstract
$this->evaluateMetaJson200($content);
$this->assertObjectHasAttribute("baskets", $content->response);
$found = false;
foreach ($content->response->baskets as $basket)
{
$this->evaluateGoodBasket($basket);
$found = true;
}
if(!$found)
{
$this->fail('There should be a basket left');
}
}

View File

@@ -215,7 +215,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
}
catch (Exception_Databox_FieldNotFound $e)
{
}
$route = '/databoxes/' . $databox_id . '/metadatas/?oauth_token=' . self::$token;
@@ -254,7 +254,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
$this->assertTrue((strlen($metadatas["separator"]) > 0));
$this->assertTrue(is_string($metadatas["thesaurus_branch"]));
$this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE,databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
$this->assertTrue(in_array($metadatas["type"], array(databox_field::TYPE_DATE, databox_field::TYPE_STRING, databox_field::TYPE_NUMBER, databox_field::TYPE_TEXT)));
$this->assertTrue(is_bool($metadatas["indexable"]));
$this->assertTrue(is_bool($metadatas["multivalue"]));
$this->assertTrue(is_bool($metadatas["readonly"]));
@@ -487,7 +487,7 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
$this->assertNotEquals($subdef->get_size(), $headers["download_content_length"]);
break;
case "url" :
$this->assertTrue(strpos($headers['content_type'], $subdef->get_mime()) === 0, 'Verify that header '.$headers['content_type'].' contains subdef mime type '.$subdef->get_mime());
$this->assertTrue(strpos($headers['content_type'], $subdef->get_mime()) === 0, 'Verify that header ' . $headers['content_type'] . ' contains subdef mime type ' . $subdef->get_mime());
$this->assertEquals($subdef->get_size(), $headers["download_content_length"]);
break;
}
@@ -805,189 +805,133 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
{
$this->evaluateGoodBasket($basket);
$this->assertEquals('un Joli Nom', $basket["name"]);
$basket_obj = basket_adapter::getInstance($appbox, $basket["ssel_id"], $appbox->get_session()->get_usr_id());
$basket_obj->delete();
}
}
public function testBasketContent()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$found = false;
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$route = '/baskets/' . $basket->getId() . '/content/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$crawler = $this->client->request('GET', $route, array(), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket_elements", $content["response"]);
foreach ($content["response"]["basket_elements"] as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
$this->evaluateGoodBasket($basket_str);
$this->assertEquals(count($basket->getElements()), count((array) $basket_str["basket_elements"]));
foreach ($basket_str["basket_elements"] as $basket_element)
{
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/content/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE'));
$crawler = $this->client->request('GET', $route, array(), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket_elements", $content["response"]);
foreach ($content["response"]["basket_elements"] as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals(count($basket->get_elements()), count((array) $basket_str["basket_elements"]));
foreach ($basket_str["basket_elements"] as $basket_element)
{
$this->assertArrayHasKey('basket_element_id', $basket_element);
$this->assertArrayHasKey('order', $basket_element);
$this->assertArrayHasKey('record', $basket_element);
$this->assertArrayHasKey('validation_item', $basket_element);
$this->assertTrue(is_bool($basket_element["validation_item"]));
$this->assertTrue(is_int($basket_element["order"]));
$this->assertTrue(is_int($basket_element["basket_element_id"]));
$this->evaluateGoodRecord($basket_element["record"]);
}
}
$this->assertArrayHasKey('basket_element_id', $basket_element);
$this->assertArrayHasKey('order', $basket_element);
$this->assertArrayHasKey('record', $basket_element);
$this->assertArrayHasKey('validation_item', $basket_element);
$this->assertTrue(is_bool($basket_element["validation_item"]));
$this->assertTrue(is_int($basket_element["order"]));
$this->assertTrue(is_int($basket_element["basket_element_id"]));
$this->evaluateGoodRecord($basket_element["record"]);
}
}
if (!$found)
$this->markTestSkipped('Unable to test basket set title');
}
public function testSetBasketTitle()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$found = false;
$route = '/baskets/' . $basket->getId() . '/setname/?oauth_token=' . self::$token;
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('name' => 'un Joli Nom'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
{
$this->evaluateGoodBasket($basket_str);
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/setname/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('name' => 'un Joli Nom'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["name"], 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<i>un Joli Nom<i>'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["name"], 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<strong>aéaa'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["name"], 'aéaa');
}
break;
}
$this->assertEquals($basket_str["name"], 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<i>un Joli Nom<i>'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["name"], 'un Joli Nom');
}
$crawler = $this->client->request('POST', $route, array('name' => '<strong>aéaa'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["name"], 'aéaa');
}
if (!$found)
$this->markTestSkipped('Unable to test basket set title');
}
public function testSetBasketDescription()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$basket = $this->insertOneBasket();
$found = false;
$route = '/baskets/' . $basket->getId() . '/setdescription/?oauth_token=' . self::$token;
foreach ($basket_coll->get_baskets() as $bask_group => $baskets)
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('description' => 'une belle desc'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
if (!in_array($bask_group, array('recept', 'baskets')))
continue;
foreach ($baskets as $basket)
{
$this->evaluateGoodBasket($basket_str);
$found = true;
$route = '/baskets/' . $basket->get_ssel_id() . '/setdescription/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
$crawler = $this->client->request('POST', $route, array('description' => 'une belle desc'), array(), array("HTTP_ACCEPT" => "application/yaml"));
$content = self::$yaml->parse($this->client->getResponse()->getContent());
$this->evaluateResponse200($this->client->getResponse());
$this->evaluateMetaYaml200($content);
$this->assertEquals(1, count((array) $content["response"]));
$this->assertArrayHasKey("basket", $content["response"]);
foreach ($content["response"]["basket"] as $basket_str)
{
$this->evaluateGoodBasket($basket_str);
$this->assertEquals($basket_str["description"], 'une belle desc');
}
break;
}
$this->assertEquals($basket_str["description"], 'une belle desc');
}
if (!$found)
$this->markTestSkipped('Unable to test basket set description');
}
public function testDeleteBasket()
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket = $this->insertOneBasket();
$basket2 = $this->insertOneBasket();
$basket = basket_adapter::create($appbox, 'test suppression panier', User_Adapter::getInstance($usr_id, $appbox));
$route = '/baskets/' . $basket->get_ssel_id() . '/delete/?oauth_token=' . self::$token;
$route = '/baskets/' . $basket->getId() . '/delete/?oauth_token=' . self::$token;
$this->evaluateMethodNotAllowedRoute($route, array('GET', 'PUT', 'DELETE'));
@@ -998,9 +942,16 @@ class API_V1_test_adapterYaml extends PhraseanetWebTestCaseAbstract
$this->evaluateMetaYaml200($content);
$this->assertArrayHasKey("baskets", $content["response"]);
$found = false;
foreach ($content["response"]["baskets"] as $basket)
{
$this->evaluateGoodBasket($basket);
$found = true;
}
if (!$found)
{
$this->fail('There should be a basket left');
}
}

View File

@@ -14,6 +14,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
protected $item;
protected $validation_basket;
protected static $need_records = 1;
// protected static $need_subdefs = true;
public function setUp()
@@ -25,16 +26,11 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$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->item = Feed_Entry_Item::create($appbox, $this->entry, self::$record_1);
$basket = basket_adapter::create($appbox, 'bask validation', self::$user);
$basket->push_element(self::$record_1, false, false);
$basket->validation_to_users(self::$user, true, true, true);
$this->validation_basket = $basket;
}
public function tearDown()
{
$this->feed->delete();
// $this->validation_basket->delete();
parent::tearDown();
}
@@ -43,79 +39,21 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
return require dirname(__FILE__) . '/../../Alchemy/Phrasea/Application/Lightbox.php';
}
/**
*
* @return array
*/
protected function get_baskets()
{
$appbox = appbox::get_instance();
$basketcoll = new basketCollection($appbox, self::$user->get_id());
$basket_coll = $basketcoll->get_baskets();
return $basket_coll['baskets'];
}
/**
*
* @return basket_adapter
*/
protected function get_basket()
{
$appbox = appbox::get_instance();
$basketcoll = new basketCollection($appbox, self::$user->get_id());
$basket_coll = $basketcoll->get_baskets();
while(($basket = array_shift($basket_coll['baskets'])))
{
if(!$basket->is_valid())
return $basket;
}
$this->fail('Unable to find a basket');
}
protected function get_validation_basket()
{
return $this->validation_basket;
}
/**
*
* @return basket_element_adapter
*/
protected function get_basket_element()
{
$basket = $this->get_basket();
$basket->push_element(self::$record_1, false, false);
foreach($basket->get_elements() as $basket_element)
{
return $basket_element;
}
}
/**
*
* @return basket_element_adapter
*/
protected function get_validation_basket_element()
{
$basket = $this->get_validation_basket();
foreach($basket->get_elements() as $basket_element)
{
return $basket_element;
}
}
public function testRouteSlash()
{
$baskets = $this->get_baskets();
$n = mt_rand(2, 8);
for ($i = 0; $i != $n; $i++)
{
$basket = $this->insertOneBasket();
}
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->assertEquals($crawler->filter('div.basket_wrapper')->count(), count($baskets));
$this->assertEquals($crawler->filter('div.basket_wrapper')->count(), $n);
$this->set_user_agent(self::USER_AGENT_IE6);
@@ -133,34 +71,34 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
public function testAjaxNoteForm()
{
$basket_element = $this->get_basket_element();
$basket_element = $this->insertOneBasketElement();
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('', trim($this->client->getResponse()->getContent()));
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('', trim($this->client->getResponse()->getContent()));
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/NOTE_FORM/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertNotEquals('', trim($this->client->getResponse()->getContent()));
}
public function testAjaxElement()
{
$basket_element = $this->get_basket_element();
$basket_element = $this->insertOneBasketElement();
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
@@ -176,7 +114,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
@@ -192,7 +130,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/'.$basket_element->get_sselcont_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_BASKET_ELEMENT/' . $basket_element->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertNotEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
}
@@ -201,7 +139,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
{
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/'.$this->entry->get_id().'/'.$this->item->get_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
@@ -217,7 +155,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/'.$this->entry->get_id().'/'.$this->item->get_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
@@ -233,7 +171,7 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/'.$this->entry->get_id().'/'.$this->item->get_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertNotEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
}
@@ -241,46 +179,46 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
public function testValidate()
{
$basket = $this->get_basket();
$basket = $this->insertOneBasket();
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/validate/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/validate/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/validate/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/validate/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/validate/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/validate/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
}
public function testCompare()
{
$basket = $this->get_basket();
$basket = $this->insertOneBasket();
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/compare/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/compare/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/compare/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/compare/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/compare/'.$basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/compare/' . $basket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
}
@@ -289,54 +227,66 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
{
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/feeds/entry/'.$this->entry->get_id().'/');
$crawler = $this->client->request('GET', '/feeds/entry/' . $this->entry->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IE6);
$crawler = $this->client->request('GET', '/feeds/entry/'.$this->entry->get_id().'/');
$crawler = $this->client->request('GET', '/feeds/entry/' . $this->entry->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
$this->set_user_agent(self::USER_AGENT_IPHONE);
$crawler = $this->client->request('GET', '/feeds/entry/'.$this->entry->get_id().'/');
$crawler = $this->client->request('GET', '/feeds/entry/' . $this->entry->get_id() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
}
public function testAjaxReport()
{
$validationBasket = $this->insertOneValidationBasket();
$this->set_user_agent(self::USER_AGENT_FIREFOX8MAC);
$crawler = $this->client->request('GET', '/ajax/LOAD_REPORT/'.$this->validation_basket->get_ssel_id().'/');
$crawler = $this->client->request('GET', '/ajax/LOAD_REPORT/' . $validationBasket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
$this->assertEquals('UTF-8', $this->client->getResponse()->getCharset());
}
public function testAjaxSetNote()
{
$crawler = $this->client->request('POST', '/ajax/SET_NOTE/'.$this->get_basket_element()->get_sselcont_id().'/');
$crawler = $this->client->request('POST', '/ajax/SET_NOTE/' . $this->insertOneBasketElement()->getId() . '/');
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
$crawler = $this->client->request('POST', '/ajax/SET_NOTE/'.$this->get_validation_basket_element()->get_sselcont_id().'/');
$validationBasket = $this->insertOneValidationBasket();
$validationBasketElement = $validationBasket->getElements()->first();
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ',$this->get_validation_basket_element()->get_sselcont_id()));
$crawler = $this->client->request('POST', '/ajax/SET_NOTE/' . $validationBasketElement->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
$this->assertTrue(is_object($datas), 'asserting good json datas');
$this->assertObjectHasAttribute('datas', $datas);
$this->assertObjectHasAttribute('error', $datas);
}
public function testAjaxSetAgreement()
{
$crawler = $this->client->request('POST', '/ajax/SET_ELEMENT_AGREEMENT/'.$this->get_basket_element()->get_sselcont_id().'/');
$basket = $this->insertOneBasket();
$basketElement = $basket->getElements()->first();
$crawler = $this->client->request('POST', '/ajax/SET_ELEMENT_AGREEMENT/' . $basketElement->getId() . '/');
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
$crawler = $this->client->request('POST', '/ajax/SET_ELEMENT_AGREEMENT/'.$this->get_validation_basket_element()->get_sselcont_id().'/');
$validationBasket = $this->insertOneValidationBasket();
$validationBasketElement = $validationBasket->getElements()->first();
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ',$this->get_validation_basket_element()->get_sselcont_id()));
$crawler = $this->client->request('POST', '/ajax/SET_ELEMENT_AGREEMENT/' . $validationBasketElement->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasketElement->getId()));
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());
@@ -344,14 +294,19 @@ class Module_LightboxTest extends PhraseanetWebTestCaseAuthenticatedAbstract
$this->assertObjectHasAttribute('datas', $datas);
$this->assertObjectHasAttribute('error', $datas);
}
public function testAjaxSetRelease()
{
$crawler = $this->client->request('POST', '/ajax/SET_RELEASE/'.$this->get_basket()->get_ssel_id().'/');
$basket = $this->insertOneBasket();
$crawler = $this->client->request('POST', '/ajax/SET_RELEASE/' . $basket->getId() . '/');
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
$crawler = $this->client->request('POST', '/ajax/SET_RELEASE/'.$this->get_validation_basket()->get_ssel_id().'/');
$validationBasket = $this->insertOneValidationBasket();
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ',$this->get_validation_basket()->get_ssel_id()));
$crawler = $this->client->request('POST', '/ajax/SET_RELEASE/' . $validationBasket->getId() . '/');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode(), sprintf('set note to element %s ', $validationBasket->getId()));
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-type'));
$datas = json_decode($this->client->getResponse()->getContent());

View File

@@ -27,10 +27,8 @@ class Module_Prod_Route_TooltipTest extends PhraseanetWebTestCaseAuthenticatedAb
public function testRouteBasket()
{
$appbox = appbox::get_instance();
$basketcoll = new basketCollection($appbox, self::$user->get_id());
$basket_coll = $basketcoll->get_baskets();
$basket = array_shift($basket_coll['baskets']);
$basket = $this->insertOneBasket();
$crawler = $this->client->request('POST', '/tooltip/basket/' . $basket->getId() . '/');
$pageContent = $this->client->getResponse()->getContent();

View File

@@ -473,15 +473,25 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
{
$appbox = appbox::get_instance();
$usr_id = $appbox->get_session()->get_usr_id();
$basket_coll = new basketCollection($appbox, $usr_id);
$baskets = $basket_coll->get_baskets();
$baskets = $baskets['baskets'];
$em = self::$core->getEntityManager();
$basket = array_shift($baskets);
$basket = $this->insertOneBasket();
$this->assertInstanceOf('\Entities\Basket', $basket);
$basket->push_element(self::$record_1, false, false);
/* @var $basket \Entities\Basket */
$basket_element = new \Entities\BasketElement();
$basket_element->setRecord(self::$record_1);
$basket_element->setBasket($basket);
$em->persist($basket_element);
$basket->addBasketElement($basket_element);
$em->merge($basket);
$em->flush();
$found = $sselcont_id = false;
$sbas_id = self::$record_1->get_sbas_id();
@@ -489,7 +499,7 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
foreach (self::$record_1->get_container_baskets() as $c_basket)
{
if ($c_basket->getId() == $basket->get_ssel_id())
if ($c_basket->getId() == $basket->getId())
{
$found = true;
foreach ($c_basket->getElements() as $b_el)
@@ -504,7 +514,6 @@ class record_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
if (!$found)
$this->fail();
$basket->remove_from_ssel($sselcont_id);
}
}