dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests to fit the latest interfaces

Browse source
This commit is contained in:
Romain Neutron 2012-04-13 15:44:46 +02:00
commit 2d75a3694a
3 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/src/FFMpeg/BinaryTest.php
View file

@ -36,23 +36,6 @@ class BinaryTest extends \PHPUnit_Framework_TestCase
BinaryTesterWrongBinary::load(); 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 class BinaryTester extends Binary
@ -63,11 +46,6 @@ class BinaryTester extends Binary
return 'php'; return 'php';
} }
public static function runner($command, $bypass_errors = false)
{
return self::run($command, $bypass_errors);
}
} }
class BinaryTesterWrongBinary extends Binary class BinaryTesterWrongBinary extends Binary

2
tests/src/FFMpeg/Format/DefaultAudioFormatTest.php
View file

@ -122,7 +122,7 @@ class DefaultAudioFormatTester extends DefaultAudioFormat
protected $audioCodec = 'audiocodec1'; protected $audioCodec = 'audiocodec1';
protected function getAvailableAudioCodecs() public function getAvailableAudioCodecs()
{ {
return array('audiocodec1', 'audiocodec2', 'audiocodec3'); return array('audiocodec1', 'audiocodec2', 'audiocodec3');
} }

4
tests/src/FFMpeg/Format/DefaultVideoFormatTest.php
View file

@ -193,12 +193,12 @@ class DefaultVideoFormatTester extends DefaultVideoFormat
protected $audioCodec = 'audiocodec1'; protected $audioCodec = 'audiocodec1';
protected $videoCodec = 'videocodec2'; protected $videoCodec = 'videocodec2';
protected function getAvailableAudioCodecs() public function getAvailableAudioCodecs()
{ {
return array('audiocodec1', 'audiocodec2', 'audiocodec3'); return array('audiocodec1', 'audiocodec2', 'audiocodec3');
} }
protected function getAvailableVideoCodecs() public function getAvailableVideoCodecs()
{ {
return array('videocodec1', 'videocodec2'); return array('videocodec1', 'videocodec2');
} }