Fix Module\DirTest and add test for new Resolver functionality

Author: joshdifabio

lib/internal/Magento/Framework/Module/Dir.php

@@ -57,7 +57,8 @@ public function __construct(Filesystem $filesystem, StringHelper $string, Resolv
     public function getDir($moduleName, $type = '')
     {
         if (null === $path = $this->dirResolver->getModulePath($moduleName)) {
-            $path = $this->_string->upperCaseWords($moduleName, '_', '/');
+            $relativePath = $this->_string->upperCaseWords($moduleName, '_', '/');
+            $path = $this->_modulesDirectory->getAbsolutePath($relativePath);
         }
 
         if ($type) {
@@ -67,8 +68,6 @@ public function getDir($moduleName, $type = '')
             $path .= '/' . $type;
         }
 
-        $result = $this->_modulesDirectory->getAbsolutePath($path);
-
-        return $result;
+        return $path;
     }
 }

lib/internal/Magento/Framework/Module/Test/Unit/DirTest.php

@@ -27,6 +27,11 @@ class DirTest extends \PHPUnit_Framework_TestCase
      */
     protected $directoryMock;
 
+    /**
+     * @var \Magento\Framework\Module\Dir\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $dirResolverMock;
+
     protected function setUp()
     {
         $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false, false);
@@ -39,8 +44,14 @@ protected function setUp()
             false
         );
         $this->_stringMock = $this->getMock('Magento\Framework\Stdlib\String', [], [], '', false, false);
-
-        $this->_stringMock->expects($this->once())->method('upperCaseWords')->will($this->returnValue('Test/Module'));
+        $this->dirResolverMock = $this->getMock(
+            'Magento\Framework\Module\Dir\ResolverInterface',
+            [],
+            [],
+            '',
+            false,
+            false
+        );
 
         $this->filesystemMock->expects(
             $this->once()
@@ -50,11 +61,27 @@ protected function setUp()
             $this->returnValue($this->directoryMock)
         );
 
-        $this->_model = new \Magento\Framework\Module\Dir($this->filesystemMock, $this->_stringMock);
+        $this->_model = new \Magento\Framework\Module\Dir(
+            $this->filesystemMock,
+            $this->_stringMock,
+            $this->dirResolverMock
+        );
     }
 
     public function testGetDirModuleRoot()
     {
+        $this->dirResolverMock->expects(
+            $this->once()
+        )->method(
+            'getModulePath'
+        )->with(
+            'Test_Module'
+        )->will(
+            $this->returnValue(null)
+        );
+
+        $this->_stringMock->expects($this->once())->method('upperCaseWords')->will($this->returnValue('Test/Module'));
+
         $this->directoryMock->expects(
             $this->once()
         )->method(
@@ -64,20 +91,39 @@ public function testGetDirModuleRoot()
         )->will(
             $this->returnValue('/Test/Module')
         );
+
         $this->assertEquals('/Test/Module', $this->_model->getDir('Test_Module'));
     }
 
+    public function testGetDirModuleRootFromResolver()
+    {
+        $this->dirResolverMock->expects(
+            $this->once()
+        )->method(
+            'getModulePath'
+        )->with(
+            'Test_Module2'
+        )->will(
+            $this->returnValue('/path/to/module')
+        );
+
+        $this->assertEquals('/path/to/module', $this->_model->getDir('Test_Module2'));
+    }
+
     public function testGetDirModuleSubDir()
     {
+        $this->_stringMock->expects($this->once())->method('upperCaseWords')->will($this->returnValue('Test/Module'));
+
         $this->directoryMock->expects(
             $this->once()
         )->method(
             'getAbsolutePath'
         )->with(
-            'Test/Module/etc'
+            'Test/Module'
         )->will(
-            $this->returnValue('/Test/Module/etc')
+            $this->returnValue('/Test/Module')
         );
+
         $this->assertEquals('/Test/Module/etc', $this->_model->getDir('Test_Module', 'etc'));
     }
 
@@ -87,6 +133,8 @@ public function testGetDirModuleSubDir()
      */
     public function testGetDirModuleSubDirUnknown()
     {
+        $this->_stringMock->expects($this->once())->method('upperCaseWords')->will($this->returnValue('Test/Module'));
+
         $this->_model->getDir('Test_Module', 'unknown');
     }
 }