* implement interlace filter

* add functional and unit test
* move functional tests (DataManager and FilterManager) to subfolders

Author: wodka

Imagine/Filter/Loader/InterlaceFilterLoader.php

@@ -12,11 +12,11 @@ class InterlaceFilterLoader implements LoaderInterface
     public function load(ImageInterface $image, array $options = array())
     {
         $mode = ImageInterface::INTERLACE_LINE;
-        if (empty($options['mode']) {
+        if (!empty($options['mode'])) {
             $mode = $options['mode'];
         }
 
-        $image->interlace(ImageInterface::INTERLACE_LINE);
+        $image->interlace($mode);
 
         return $image;
     }

Tests/Functional/Imagine/DataManagerTest.php Tests/Functional/Imagine/Data/DataManagerTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Liip\ImagineBundle\Tests\Functional\Imagine;
+namespace Liip\ImagineBundle\Tests\Functional\Imagine\Data;
 
 use Liip\ImagineBundle\Tests\Functional\WebTestCase;
 

Tests/Functional/Imagine/FilterManagerTest.php Tests/Functional/Imagine/Filter/FilterManagerTest.php

@@ -1,5 +1,5 @@
 <?php
-namespace Liip\ImagineBundle\Tests\Functional\Imagine;
+namespace Liip\ImagineBundle\Tests\Functional\Imagine\Filter;
 
 use Liip\ImagineBundle\Tests\Functional\WebTestCase;
 

Tests/Functional/Imagine/Filter/Loader/InterlaceFilterLoaderTest.php

@@ -0,0 +1,16 @@
+<?php
+namespace Liip\ImagineBundle\Tests\Functional\Imagine\Filter\Loader;
+
+use Liip\ImagineBundle\Tests\Functional\WebTestCase;
+
+class InterlaceFilterLoaderTest extends WebTestCase
+{
+    public function testCouldBeGetFromContainerAsService()
+    {
+        $this->createClient();
+        $service = self::$kernel->getContainer()->get('liip_imagine.filter.loader.interlace');
+
+        $this->assertInstanceOf('Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader', $service);
+    }
+}
+

Tests/Imagine/Filter/Loader/InterlaceFilterLoaderTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Liip\ImagineBundle\Tests\Filter;
+
+use Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader;
+use Liip\ImagineBundle\Tests\AbstractTest;
+
+/**
+ * @covers Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader
+ */
+class InterlaceFilterLoaderTest extends AbstractTest
+{
+    public function testLoad()
+    {
+        $loader = new InterlaceFilterLoader();
+
+        $image = $this->getMockImage();
+        $image
+            ->expects($this->once())
+            ->method('interlace')
+            ->with('TEST')
+        ;
+
+        $result = $loader->load($image, array('mode' => 'TEST'));
+
+        $this->assertInstanceOf('Imagine\Image\ImageInterface', $result);
+    }
+}