Merge pull request #298 from havvg/1.4

fix AbstractCommandTest avoiding SplFileInfo mocks
This commit is contained in:
Toni Uebernickel 2014-11-01 15:58:51 +01:00
commit 5af07d37fc
3 changed files with 20 additions and 28 deletions

View file

@ -306,7 +306,9 @@ abstract class AbstractCommand extends ContainerAwareCommand
}
/**
* @param \Symfony\Component\HttpKernel\Bundle\BundleInterface
* @param \Symfony\Component\HttpKernel\Bundle\BundleInterface $bundle
*
* @return array
*/
protected function getSchemasFromBundle(BundleInterface $bundle)
{

View file

@ -20,6 +20,9 @@ use Symfony\Component\HttpKernel\KernelInterface;
*/
class AbstractCommandTest extends TestCase
{
/**
* @var TestableAbstractCommand
*/
protected $command;
public function setUp()
@ -40,6 +43,9 @@ class AbstractCommandTest extends TestCase
public function testTransformToLogicalName()
{
$bundleDir = realpath(__DIR__ . '/../Fixtures/src/My/SuperBundle');
$filename = 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'a-schema.xml';
$bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
$bundle
->expects($this->once())
@ -48,47 +54,30 @@ class AbstractCommandTest extends TestCase
$bundle
->expects($this->once())
->method('getPath')
->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'));
$schema = $this
->getMockBuilder('\SplFileInfo')
->disableOriginalConstructor()
->getMock();
$schema
->expects($this->once())
->method('getRealPath')
->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'
. DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'my-schema.xml'));
$expected = '@MySuperBundle/Resources/config/my-schema.xml';
->will($this->returnValue($bundleDir));
$schema = new \SplFileInfo($bundleDir . DIRECTORY_SEPARATOR . $filename);
$expected = '@MySuperBundle/Resources/config/a-schema.xml';
$this->assertEquals($expected, $this->command->transformToLogicalName($schema, $bundle));
}
public function testTransformToLogicalNameWithSubDir()
{
$bundleDir = realpath(__DIR__ . '/../Fixtures/src/My/ThirdBundle');
$filename = 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'propel' . DIRECTORY_SEPARATOR . 'schema.xml';
$bundle = $this->getMock('Symfony\Component\HttpKernel\Bundle\BundleInterface');
$bundle
->expects($this->once())
->method('getName')
->will($this->returnValue('MySuperBundle'));
->will($this->returnValue('MyThirdBundle'));
$bundle
->expects($this->once())
->method('getPath')
->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'));
$schema = $this
->getMockBuilder('\SplFileInfo')
->disableOriginalConstructor()
->getMock();
$schema
->expects($this->once())
->method('getRealPath')
->will($this->returnValue('/Users/foo/project/src/My/SuperBundle'
. DIRECTORY_SEPARATOR . 'Resources' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'propel/my-schema.xml'));
$expected = '@MySuperBundle/Resources/config/propel/my-schema.xml';
->will($this->returnValue($bundleDir));
$schema = new \SplFileInfo($bundleDir . DIRECTORY_SEPARATOR . $filename);
$expected = '@MyThirdBundle/Resources/config/propel/schema.xml';
$this->assertEquals($expected, $this->command->transformToLogicalName($schema, $bundle));
}

View file

@ -0,0 +1 @@
This is a schema.xml