fix testes

lib/unitTest/Alchemy/Phrasea/Core/Configuration/ConfigurationTest.php

@@ -58,14 +58,13 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
     $this->assertEquals('prod', $configuration->getEnvironnement());
     $this->assertTrue($configuration->isInstalled());
     $this->assertInstanceOf(
-            'Alchemy\Phrasea\Core\Configuration\Parameter'
+            '\Symfony\Component\DependencyInjection\ParameterBag\ParameterBag'
             , $configuration->getConfiguration()
     );
     $this->assertFalse($configuration->isDebug());
-    $this->assertFalse($configuration->displayErrors());
+    $this->assertFalse($configuration->isDisplayingErrors());
     $this->assertFalse($configuration->isMaintained());
     $this->assertTrue(is_array($configuration->getPhraseanet()->all()));
-//    $this->assertTrue(is_array($configuration->getDoctrine()->all()));
   }
 
   public function testInstalled()
@@ -83,10 +82,17 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     $configuration = new PhraseaCore\Configuration($handler);
     $configuration->setEnvironnement('prod');
-    
+
     $this->assertFalse($configuration->isInstalled());
-    $this->assertTrue(is_array($configuration->getPhraseanet()->all()));
+    try
-//    $this->assertTrue(is_array($configuration->getDoctrine()->all()));
+    {
+      $configuration->getPhraseanet();
+      $this->fail("should raise an exception because application is not yet installed");
+    }
+    catch (\Exception $e)
+    {
+      
+    }
   }
 
   public function testGetAvailableLogger()
@@ -96,14 +102,14 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     $configuration = new PhraseaCore\Configuration($handler);
     $configuration->setEnvironnement('prod');
-    
+
     $availableLogger = $configuration->getAvailableDoctrineLogger();
-    
+
     $this->assertTrue(is_array($availableLogger));
     $this->assertContains('monolog', $availableLogger);
     $this->assertContains('echo', $availableLogger);
   }
-  
+
   public function testGetHandler()
   {
     $spec = $this->getMock('\Alchemy\Phrasea\Core\Configuration\Application');
@@ -111,10 +117,10 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     $configuration = new PhraseaCore\Configuration($handler);
     $configuration->setEnvironnement('prod');
-    
+
     $this->assertInstanceOf('\Alchemy\Phrasea\Core\Configuration\Handler', $configuration->getConfigurationHandler());
   }
-  
+
   public function testSetHandler()
   {
     $spec = $this->getMock('\Alchemy\Phrasea\Core\Configuration\Application');
@@ -122,9 +128,9 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     $configuration = new PhraseaCore\Configuration($handler);
     $configuration->setEnvironnement('prod');
-    
+
     $spec2 = $this->getMock('\Alchemy\Phrasea\Core\Configuration\Application');
-    
+
     $spec2->expects($this->any())
             ->method('getConfigurationFile')
             ->will(
@@ -132,11 +138,11 @@ class ConfigurationTest extends PhraseanetPHPUnitAuthenticatedAbstract
                             'test'
                     )
     );
-    
+
     $newHandler = new Configuration\Handler($spec2, new Configuration\Parser\Yaml());
-    
+
     $configuration->setConfigurationHandler($newHandler);
-    
+
     $this->assertEquals('test', $configuration->getConfigurationHandler()->getSpecification()->getConfigurationFile());
   }
 

lib/unitTest/Bridge/Bridge_datas.inc

@@ -2,6 +2,11 @@
 
 require_once dirname(__FILE__) . '/../../bootstrap.php';
 
+$new_include_path = __DIR__ . "/../../vendor/" . PATH_SEPARATOR . get_include_path();
+set_include_path($new_include_path);
+
+require_once __DIR__ . "/../../vendor/Phlickr/Api.php";
+
 /*
  * This file is part of Phraseanet
  *

lib/unitTest/PhraseanetPHPUnitAbstract.class.inc

@@ -11,19 +11,21 @@
 
 require_once __DIR__ . "/../../lib/classes/bootstrap.class.php";
 
+use Silex\WebTestCase;
+use Symfony\Component\HttpKernel\Client;
+use Symfony\Component\HttpFoundation\Response;
+use Doctrine\Common\DataFixtures\Loader;
+use PhraseaFixture\Basket as MyFixture;
+
 /**
  * 
  * @package
  * @license     http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link        www.phraseanet.com
  */
+
 bootstrap::execute('test');
 
-use Silex\WebTestCase;
-use Symfony\Component\HttpKernel\Client;
-use Symfony\Component\HttpFoundation\Response;
-use Doctrine\Common\DataFixtures\Loader;
-use PhraseaFixture\Basket as MyFixture;
 
 abstract class PhraseanetPHPUnitAbstract extends WebTestCase
 {
@@ -394,7 +396,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
       self::$time_start = microtime(true);
       echo "\033[1;35m\n==Start==\033[0;37m\r\n";
     }
-    
+
     self::updateTablesSchema();
 
     self::createSetOfUserTests();
@@ -730,8 +732,22 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase
    */
   protected function resetTwig()
   {
-    $serviceTwig = new \Alchemy\Phrasea\Core\Service\Twig(array());
+    $handler = new \Alchemy\Phrasea\Core\Configuration\Handler(
-    $this->app['Core']["Twig"] = $serviceTwig->getTwig();
+                    new \Alchemy\Phrasea\Core\Configuration\Application(),
+                    new \Alchemy\Phrasea\Core\Configuration\Parser\Yaml()
+    );
+    $configuration = new \Alchemy\Phrasea\Core\Configuration($handler);
+
+    $serviceName = $configuration->getTemplating();
+    $confService = $configuration->getService($serviceName);
+
+    $templateService = \Alchemy\Phrasea\Core\ServiceBuilder::build(
+                    $serviceName
+                    , \Alchemy\Phrasea\Core\ServiceBuilder::TEMPLATE_ENGINE
+                    , $confService->get("type")
+                    , $confService->get("options")
+    );
+    $this->app['Core']["Twig"] = $templateService->getService();
   }
 
   /**