Merge pull request #298 from havvg/1.4

fix AbstractCommandTest avoiding SplFileInfo mocks
propelorm · Nov 1, 2014 · 5af07d3 · 5af07d3
2 parents 68793ac + 5e8668a
commit 5af07d3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
@@ -306,7 +306,9 @@ protected function getFinalSchemas(KernelInterface $kernel, BundleInterface $bun
     }
 
     /**
-     * @param \Symfony\Component\HttpKernel\Bundle\BundleInterface
+     * @param \Symfony\Component\HttpKernel\Bundle\BundleInterface $bundle
+     *
+     * @return array
      */
     protected function getSchemasFromBundle(BundleInterface $bundle)
     {

diff --git a/Tests/Command/AbstractCommandTest.php b/Tests/Command/AbstractCommandTest.php
@@ -20,6 +20,9 @@
  */
 class AbstractCommandTest extends TestCase
 {
+    /**
+     * @var TestableAbstractCommand
+     */
     protected $command;
 
     public function setUp()
@@ -40,6 +43,9 @@ public function testParseDbNameWithoutDbName()
 
     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 @@ public function testTransformToLogicalName()
         $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));
     }
 

diff --git a/Tests/Fixtures/src/My/ThirdBundle/Resources/config/propel/schema.xml b/Tests/Fixtures/src/My/ThirdBundle/Resources/config/propel/schema.xml
@@ -0,0 +1 @@
+This is a schema.xml