Cleanup phpunit configs and PSR-4 autoloading and namespaces for tests

composer.json

@@ -34,13 +34,18 @@
     "require-dev": {
         "sami/sami": "~1.0",
         "silex/silex": "~1.0",
-        "phpunit/phpunit": "~3.7"
+        "phpunit/phpunit": "^4.8"
     },
     "autoload": {
         "psr-0": {
             "FFMpeg": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\FFMpeg\\": "tests"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.6-dev"

phpunit-functional.xml.dist

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="false"
-         bootstrap="tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="FFMpeg Tests Suite">
-            <directory>tests/FFMpeg/Functional</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-      <blacklist>
-        <directory>vendor</directory>
-        <directory>tests</directory>
-      </blacklist>
-    </filter>
-
-</phpunit>
-

phpunit.xml.dist

@@ -12,16 +12,19 @@
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="FFMpeg Tests Suite">
+        <testsuite name="unit">
-            <directory>tests/FFMpeg/Tests</directory>
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="functional">
+            <directory>tests/Functional</directory>
         </testsuite>
     </testsuites>
+
     <filter>
       <blacklist>
         <directory>vendor</directory>
         <directory>tests</directory>
       </blacklist>
     </filter>
-
 </phpunit>
 

tests/Functional/FFProbeTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\FFProbe;
 
@@ -9,7 +9,7 @@ class FFProbeTest extends FunctionalTestCase
     public function testProbeOnFile()
     {
         $ffprobe = FFProbe::create();
-        $this->assertGreaterThan(0, count($ffprobe->streams(__DIR__ . '/../../files/Audio.mp3')));
+        $this->assertGreaterThan(0, count($ffprobe->streams(__DIR__ . '/../files/Audio.mp3')));
     }
 
     /**

tests/Functional/FunctionalTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\FFMpeg;
 

tests/Functional/VideoTranscodeTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\Coordinate\Dimension;
 use FFMpeg\Filters\Video\ResizeFilter;
@@ -18,7 +18,7 @@ class VideoTranscodeTest extends FunctionalTestCase
         }
 
         $ffmpeg = $this->getFFMpeg();
-        $video = $ffmpeg->open(__DIR__ . '/../../files/Test.ogv');
+        $video = $ffmpeg->open(__DIR__ . '/../files/Test.ogv');
 
         $this->assertInstanceOf('FFMpeg\Media\Video', $video);
 
@@ -46,13 +46,13 @@ class VideoTranscodeTest extends FunctionalTestCase
     public function testTranscodeInvalidFile()
     {
         $ffmpeg = $this->getFFMpeg();
-        $ffmpeg->open(__DIR__ . '/../../files/UnknownFileTest.ogv');
+        $ffmpeg->open(__DIR__ . '/../files/UnknownFileTest.ogv');
     }
 
     public function testSaveInvalidForgedVideo()
     {
         $ffmpeg = $this->getFFMpeg();
-        $video = new Video(__DIR__ . '/../../files/UnknownFileTest.ogv', $ffmpeg->getFFMpegDriver(), $ffmpeg->getFFProbe());
+        $video = new Video(__DIR__ . '/../files/UnknownFileTest.ogv', $ffmpeg->getFFMpegDriver(), $ffmpeg->getFFProbe());
 
         $this->setExpectedException('FFMpeg\Exception\RuntimeException');
         $video->save(new X264('libvo_aacenc'), __DIR__ . '/output/output-x264.mp4');
@@ -72,7 +72,7 @@ class VideoTranscodeTest extends FunctionalTestCase
         }
 
         $ffmpeg = $this->getFFMpeg();
-        $video = $ffmpeg->open(__DIR__ . '/../../files/portrait.MOV');
+        $video = $ffmpeg->open(__DIR__ . '/../files/portrait.MOV');
 
         $video->filters()
             ->resize(new Dimension(320, 240), ResizeFilter::RESIZEMODE_INSET)

tests/Unit/Coordinate/AspectRatioTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
 use FFMpeg\Coordinate\Dimension;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\AspectRatio;
 
 class AspectRatioTest extends TestCase

tests/Unit/Coordinate/DimensionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\Dimension;
 
 class DimensionTest extends TestCase

tests/Unit/Coordinate/FrameRateTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class FrameRateTest extends TestCase

tests/Unit/Coordinate/PointTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\Point;
 
 class PointTest extends TestCase

tests/Unit/Coordinate/TimeCodeTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\TimeCode;
 
 class TimeCodeTest extends TestCase

tests/Unit/Driver/FFMpegDriverTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Driver;
+namespace Tests\FFMpeg\Unit\Driver;
 
 use Alchemy\BinaryDriver\Configuration;
 use FFMpeg\Driver\FFMpegDriver;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
 class FFMpegDriverTest extends TestCase

tests/Unit/Driver/FFProbeDriverTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Driver;
+namespace Tests\FFMpeg\Unit\Driver;
 
 use Alchemy\BinaryDriver\Configuration;
 use FFMpeg\Driver\FFProbeDriver;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
 class FFProbeDriverTest extends TestCase

tests/Unit/FFMpegServiceProviderTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFMpegServiceProvider;
 use Silex\Application;

tests/Unit/FFMpegTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFMpeg;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;

tests/Unit/FFProbe/DataMapping/AbstractDataTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\AbstractData;
 
 class AbstractDataTest extends TestCase

tests/Unit/FFProbe/DataMapping/StreamCollectionTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 
 class StreamCollectionTest extends TestCase

tests/Unit/FFProbe/DataMapping/StreamTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
 use FFMpeg\Coordinate\Dimension;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\Stream;
 
 class StreamTest extends TestCase

tests/Unit/FFProbe/MapperTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\Mapper;
 use FFMpeg\FFProbe;
 use FFMpeg\FFProbe\DataMapping\Format;
@@ -31,8 +31,8 @@ class MapperTest extends TestCase
 
     public function provideMappings()
     {
-        $format = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.json'), true);
+        $format = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.json'), true);
-        $streams = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.json'), true);
+        $streams = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.json'), true);
 
         return array(
             array(FFProbe::TYPE_FORMAT, $format, new Format($format['format'])),

tests/Unit/FFProbe/OptionsTesterTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\OptionsTester;
 
 class OptionsTesterTest extends TestCase
@@ -55,7 +55,7 @@ class OptionsTesterTest extends TestCase
 
     public function provideOptions()
     {
-        $data = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/help.raw');
+        $data = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/help.raw');
 
         return array(
             array(true, $data, '-print_format'),

tests/Unit/FFProbe/OutputParserTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\OutputParser;
 use FFMpeg\FFProbe;
 
@@ -28,11 +28,11 @@ class OutputParserTest extends TestCase
 
     public function provideTypeDataAndOutput()
     {
-        $expectedFormat = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.json'), true);
+        $expectedFormat = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.json'), true);
-        $expectedStreams = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.json'), true);
+        $expectedStreams = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.json'), true);
 
-        $rawFormat = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.raw');
+        $rawFormat = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.raw');
-        $rawStreams = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.raw');
+        $rawStreams = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.raw');
 
         return array(
             array(FFProbe::TYPE_FORMAT, $rawFormat, $expectedFormat),

tests/Unit/FFProbeTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFProbe;
 use Symfony\Component\Process\ExecutableFinder;

tests/Unit/Filters/Audio/AudioFiltersTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Audio;
+namespace Tests\FFMpeg\Unit\Filters\Audio;
 
 use FFMpeg\Filters\Audio\AudioFilters;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class AudioFiltersTest extends TestCase
 {

tests/Unit/Filters/Audio/AudioResamplableFilterTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Audio;
+namespace Tests\FFMpeg\Unit\Filters\Audio;
 
 use FFMpeg\Filters\Audio\AudioResamplableFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class AudioResamplableFilterTest extends TestCase
 {

tests/Unit/Filters/FiltersCollectionTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Filters;
+namespace Tests\FFMpeg\Unit\Filters;
 
 use FFMpeg\Filters\FiltersCollection;
 use FFMpeg\Filters\Audio\SimpleFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class FiltersCollectionTest extends TestCase
 {

tests/Unit/Filters/Frame/DisplayRatioFixerFilterTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Frame;
+namespace Tests\FFMpeg\Unit\Filters\Frame;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Frame\DisplayRatioFixerFilter;
 use FFMpeg\Media\Frame;
 use FFMpeg\Coordinate\TimeCode;

tests/Unit/Filters/Frame/FrameFiltersTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Frame;
+namespace Tests\FFMpeg\Unit\Filters\Frame;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Frame\FrameFilters;
 
 class FrameFiltersTest extends TestCase

tests/Unit/Filters/Video/CropFilterTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Coordinate\Dimension;
 use FFMpeg\Coordinate\Point;
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\CropFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class CropFilterTest extends TestCase
 {

tests/Unit/Filters/Video/CustomFilterTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\CustomFilter;
 use FFMpeg\Filters\Video\FrameRateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class CustomFilterTest extends TestCase

tests/Unit/Filters/Video/FrameRateFilterTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\FrameRateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class FrameRateFilterTest extends TestCase

tests/Unit/Filters/Video/ResizeFilterTest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\ResizeFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Coordinate\Dimension;

tests/Unit/Filters/Video/RotateFilterTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\RotateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class RotateFilterTest extends TestCase
 {

tests/Unit/Filters/Video/SynchronizeFilterTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Video\SynchronizeFilter;
 
 class SynchronizeFilterTest extends TestCase

tests/Unit/Filters/Video/VideoFiltersTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Video\VideoFilters;
 use FFMpeg\Filters\Video\ResizeFilter;
 

tests/Unit/Filters/Video/WatermarkFilterTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\RotateFilter;
 use FFMpeg\Filters\Video\WatermarkFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class WatermarkFilterTest extends TestCase
 {
@@ -19,8 +19,8 @@ class WatermarkFilterTest extends TestCase
 
         $format = $this->getMock('FFMpeg\Format\VideoInterface');
 
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png');
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png');
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format));
 
         // check size of video is unchanged
         $this->assertEquals(320, $stream->get('width'));
@@ -33,31 +33,31 @@ class WatermarkFilterTest extends TestCase
         $format = $this->getMock('FFMpeg\Format\VideoInterface');
 
         // test position absolute
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'absolute',
             'x' => 10, 'y' => 5
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'bottom' => 10, 'left' => 5
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'bottom' => 5, 'right' => 4
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'left' => 5, 'top' => 11
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format));
     }
 }

tests/Unit/Format/Audio/AacTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Aac;
 

tests/Unit/Format/Audio/AudioTestCase.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\Audio\DefaultAudio;
 
 abstract class AudioTestCase extends TestCase

tests/Unit/Format/Audio/FlacTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Flac;
 

tests/Unit/Format/Audio/Mp3Test.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Mp3;
 

tests/Unit/Format/Audio/VorbisTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Vorbis;
 

tests/Unit/Format/Audio/WavTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Wav;
 

tests/Unit/Format/ProgressListener/AudioProgressListenerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\ProgressListener;
+namespace Tests\FFMpeg\Unit\Format\ProgressListener;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\ProgressListener\AudioProgressListener;
 use FFMpeg\FFProbe\DataMapping\Format;
 

tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\ProgressListener;
+namespace Tests\FFMpeg\Unit\Format\ProgressListener;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\ProgressListener\VideoProgressListener;
 use FFMpeg\FFProbe\DataMapping\Format;
 

tests/Unit/Format/Video/OggTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\Ogg;
 

tests/Unit/Format/Video/VideoTestCase.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
-use FFMpeg\Tests\Format\Audio\AudioTestCase;
+use Tests\FFMpeg\Unit\Format\Audio\AudioTestCase;
 
 abstract class VideoTestCase extends AudioTestCase
 {

tests/Unit/Format/Video/WMV3Test.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WMV3;
 

tests/Unit/Format/Video/WMVTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WMV;
 

tests/Unit/Format/Video/WebMTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WebM;
 

tests/Unit/Format/Video/X264Test.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\X264;
 

tests/Unit/Media/AbstractMediaTestCase.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 abstract class AbstractMediaTestCase extends TestCase
 {

tests/Unit/Media/AbstractStreamableTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 abstract class AbstractStreamableTestCase extends AbstractMediaTestCase
 {

tests/Unit/Media/AudioProg.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Format\ProgressableInterface;
 use FFMpeg\Format\AudioInterface;

tests/Unit/Media/AudioTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Audio;
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
@@ -218,7 +218,7 @@ class AudioTest extends AbstractStreamableTestCase
 
         $listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface'));
 
-        $progressableFormat = $this->getMockBuilder('FFMpeg\Tests\Media\AudioProg')
+        $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg')
             ->disableOriginalConstructor()->getMock();
         $progressableFormat->expects($this->any())
             ->method('getExtraParams')

tests/Unit/Media/FrameTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Frame;
 

tests/Unit/Media/Prog.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Format\ProgressableInterface;
 use FFMpeg\Format\VideoInterface;

tests/Unit/Media/VideoTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Video;
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
@@ -332,7 +332,7 @@ class VideoTest extends AbstractStreamableTestCase
 
         $listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface'));
 
-        $progressableFormat = $this->getMockBuilder('FFMpeg\Tests\Media\Prog')
+        $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\Prog')
             ->disableOriginalConstructor()->getMock();
         $progressableFormat->expects($this->any())
             ->method('getExtraParams')
@@ -353,7 +353,7 @@ class VideoTest extends AbstractStreamableTestCase
             ->method('getPasses')
             ->will($this->returnValue(2));
 
-        $progressableAudioFormat = $this->getMockBuilder('FFMpeg\Tests\Media\AudioProg')
+        $progressableAudioFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg')
             ->disableOriginalConstructor()->getMock();
         $progressableAudioFormat->expects($this->any())
             ->method('getExtraParams')

tests/Unit/TestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {

tests/bootstrap.php

@@ -1,5 +1,8 @@
 <?php
 
-$loader = require __DIR__.'/../vendor/autoload.php';
+$file = __DIR__ . '/../vendor/autoload.php';
-$loader->add('FFMpeg\Tests', __DIR__);
+if (!file_exists($file)) {
-$loader->add('FFMpeg\Functional', __DIR__);
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
+
+$autoload = require_once $file;