From 5928cb71aef09aaec624842d9910b7f30a891ed2 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 18 Apr 2013 17:11:35 +0200
Subject: [PATCH] Fix unit tests

---
 lib/Alchemy/Phrasea/Application.php             |  8 ++++++++
 templates/web/common/thumbnail.html.twig        |  2 +-
 tests/Alchemy/Tests/Phrasea/Border/FileTest.php | 15 ++++++++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 74f12b394a..03318b7ea6 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -326,6 +326,7 @@ class Application extends SilexApplication
         // symfony locale is set on 16 priority, let's override it
         $this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'addLocale'), 17);
         $this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'addLocale'), 15);
+        $this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'removePhraseanetLocale'), 14);
 
         $this['dispatcher']->addListener(KernelEvents::REQUEST, array($this, 'initSession'), 254);
         $this['dispatcher']->addListener(KernelEvents::RESPONSE, array($this, 'addUTF8Charset'), -128);
@@ -426,6 +427,13 @@ class Application extends SilexApplication
         $event->setResponse($response);
     }
 
+    public function removePhraseanetLocale(GetResponseEvent $event)
+    {
+        if (isset($this['phraseanet.locale'])) {
+            unset($this['phraseanet.locale']);
+        }
+    }
+
     public function addLocale(GetResponseEvent $event)
     {
         if (isset($this['phraseanet.locale'])) {
diff --git a/templates/web/common/thumbnail.html.twig b/templates/web/common/thumbnail.html.twig
index 1646171024..5255400833 100644
--- a/templates/web/common/thumbnail.html.twig
+++ b/templates/web/common/thumbnail.html.twig
@@ -60,7 +60,7 @@
           <script type="text/javascript">
             flowplayer("preview{{random}}",
               {src:"/include/jslibs/flowplayer/flowplayer-3.2.12.swf", wmode: "transparent"},
-              {clip:{url:"{{url|urlencode}}",autoPlay: true,autoBuffering:true,provider: "h264streaming",scaling:"fit"},
+              {clip:{url:"{{url|url_encode}}",autoPlay: true,autoBuffering:true,provider: "h264streaming",scaling:"fit"},
               onError:function(code,message){getNewVideoToken({{thumbnail.get_sbas_id() ~'_'~thumbnail.get_record_id()}}, this);},
               plugins: {h264streaming: {url: "/include/jslibs/flowplayer/flowplayer.pseudostreaming-3.2.9.swf"}}
               });
diff --git a/tests/Alchemy/Tests/Phrasea/Border/FileTest.php b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php
index c74f76d9fa..40e124da51 100644
--- a/tests/Alchemy/Tests/Phrasea/Border/FileTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Border/FileTest.php
@@ -194,18 +194,23 @@ class FileTest extends \PhraseanetPHPUnitAbstract
     {
         $media = self::$DI['app']['mediavorus']->guess($this->filename);
         $file1 = new File(self::$DI['app'], $media, self::$DI['collection']);
-
         $file2 = File::buildFromPathfile($this->filename, self::$DI['collection'], self::$DI['app']);
 
-        $this->assertEquals($file1, $file2);
+        $this->assertBorderFileEquals($file1, $file2);
 
         $media = self::$DI['app']['mediavorus']->guess($this->filename);
         $file3 = new File(self::$DI['app'], $media, self::$DI['collection'], 'coco lapin');
-
         $file4 = File::buildFromPathfile($this->filename, self::$DI['collection'], self::$DI['app'], 'coco lapin');
 
-        $this->assertEquals($file3, $file4);
-        $this->assertNotEquals($file1, $file4);
+        $this->assertBorderFileEquals($file3, $file4);
+    }
+
+    private function assertBorderFileEquals($file1, $file2)
+    {
+        $this->assertEquals($file1->getType(), $file2->getType());
+        $this->assertEquals($file1->getCollection(), $file2->getCollection());
+        $this->assertEquals($file1->getMD5(), $file2->getMD5());
+        $this->assertEquals($file1->getOriginalName(), $file2->getOriginalName());
     }
 
     /**