From 2d75a3694a5b7b58fbaaf200d7f533d73427536f Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 13 Apr 2012 15:44:46 +0200
Subject: [PATCH] Fix tests to fit the latest interfaces

---
 tests/src/FFMpeg/BinaryTest.php               | 22 -------------------
 .../FFMpeg/Format/DefaultAudioFormatTest.php  |  2 +-
 .../FFMpeg/Format/DefaultVideoFormatTest.php  |  4 ++--
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/tests/src/FFMpeg/BinaryTest.php b/tests/src/FFMpeg/BinaryTest.php
index 04bc7b9..76b7c5c 100644
--- a/tests/src/FFMpeg/BinaryTest.php
+++ b/tests/src/FFMpeg/BinaryTest.php
@@ -36,23 +36,6 @@ class BinaryTest extends \PHPUnit_Framework_TestCase
         BinaryTesterWrongBinary::load();
     }
 
-    /**
-     * @covers FFMpeg\Binary::run
-     */
-    public function testRun()
-    {
-        BinaryTester::runner('php --version');
-    }
-
-    /**
-     * @covers FFMpeg\Binary::run
-     * @expectedException \RuntimeException
-     */
-    public function testRunFail()
-    {
-        BinaryTester::runner('aphp -version');
-    }
-
 }
 
 class BinaryTester extends Binary
@@ -63,11 +46,6 @@ class BinaryTester extends Binary
         return 'php';
     }
 
-    public static function runner($command, $bypass_errors = false)
-    {
-        return self::run($command, $bypass_errors);
-    }
-
 }
 
 class BinaryTesterWrongBinary extends Binary
diff --git a/tests/src/FFMpeg/Format/DefaultAudioFormatTest.php b/tests/src/FFMpeg/Format/DefaultAudioFormatTest.php
index af8f74e..c568bf4 100644
--- a/tests/src/FFMpeg/Format/DefaultAudioFormatTest.php
+++ b/tests/src/FFMpeg/Format/DefaultAudioFormatTest.php
@@ -122,7 +122,7 @@ class DefaultAudioFormatTester extends DefaultAudioFormat
 
     protected $audioCodec = 'audiocodec1';
 
-    protected function getAvailableAudioCodecs()
+    public function getAvailableAudioCodecs()
     {
         return array('audiocodec1', 'audiocodec2', 'audiocodec3');
     }
diff --git a/tests/src/FFMpeg/Format/DefaultVideoFormatTest.php b/tests/src/FFMpeg/Format/DefaultVideoFormatTest.php
index b4ce102..e5a2f35 100644
--- a/tests/src/FFMpeg/Format/DefaultVideoFormatTest.php
+++ b/tests/src/FFMpeg/Format/DefaultVideoFormatTest.php
@@ -193,12 +193,12 @@ class DefaultVideoFormatTester extends DefaultVideoFormat
     protected $audioCodec = 'audiocodec1';
     protected $videoCodec = 'videocodec2';
 
-    protected function getAvailableAudioCodecs()
+    public function getAvailableAudioCodecs()
     {
         return array('audiocodec1', 'audiocodec2', 'audiocodec3');
     }
 
-    protected function getAvailableVideoCodecs()
+    public function getAvailableVideoCodecs()
     {
         return array('videocodec1', 'videocodec2');
     }