Fix Module\ModuleList\LoaderTest and add assertions for new Resolver functionality

Author: joshdifabio

lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php

@@ -40,6 +40,21 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
      */
     private $parser;
 
+    /*
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resolver;
+
+    /*
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $driver;
+
+    /**
+     * @var \Magento\Framework\Module\ModuleList\Loader
+     */
+    private $loader;
+
     protected function setUp()
     {
         $this->filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
@@ -50,34 +65,44 @@ protected function setUp()
             ->willReturn($this->dir);
         $this->converter = $this->getMock('Magento\Framework\Module\Declaration\Converter\Dom', [], [], '', false);
         $this->parser = $this->getMock('Magento\Framework\Xml\Parser', [], [], '', false);
+        $this->parser->expects($this->once())->method('initErrorHandler');
+        $this->resolver = $this->getMock('Magento\Framework\Module\Dir\ResolverInterface', [], [], '', false, false);
+        $this->driver = $this->getMock('Magento\Framework\Filesystem\DriverInterface', [], [], '', false, false);
+        $this->loader = new Loader($this->filesystem, $this->converter, $this->parser, $this->resolver, $this->driver);
     }
 
     public function testLoad()
     {
-        $fixture = [
+        $fixtures = [
             'a' => ['name' => 'a', 'sequence' => []],    // a is on its own
-            'b' => ['name' => 'b', 'sequence' => ['c']], // b is after c
-            'c' => ['name' => 'c', 'sequence' => ['a']], // c is after a
-            // so expected sequence is a -> c -> b
+            'b' => ['name' => 'b', 'sequence' => ['d']], // b is after c
+            'c' => ['name' => 'c', 'sequence' => ['e']], // c is after e
+            'd' => ['name' => 'd', 'sequence' => ['c']], // d is after c
+            'e' => ['name' => 'e', 'sequence' => ['a']], // e is after a
+            // so expected sequence is a -> e -> c -> d -> b
         ];
         $this->dir->expects($this->once())->method('search')->willReturn(['a', 'b', 'c']);
+        $this->resolver->expects($this->once())->method('getModulePaths')->willReturn(['/path/to/d', '/path/to/e']);
         $this->dir->expects($this->exactly(3))->method('readFile')->will($this->returnValueMap([
             ['a', null, null, self::$sampleXml],
             ['b', null, null, self::$sampleXml],
             ['c', null, null, self::$sampleXml],
         ]));
-        $this->converter->expects($this->at(0))->method('convert')->willReturn(['a' => $fixture['a']]);
-        $this->converter->expects($this->at(1))->method('convert')->willReturn(['b' => $fixture['b']]);
-        $this->converter->expects($this->at(2))->method('convert')->willReturn(['c' => $fixture['c']]);
-        $this->parser->expects($this->once())->method('initErrorHandler');
+        $this->driver->expects($this->exactly(2))->method('fileGetContents')->will($this->returnValueMap([
+            ['/path/to/d', null, null, self::$sampleXml],
+            ['/path/to/e', null, null, self::$sampleXml],
+        ]));
+        $index = 0;
+        foreach ($fixtures as $name => $fixture) {
+            $this->converter->expects($this->at($index++))->method('convert')->willReturn([$name => $fixture]);
+        }
         $this->parser->expects($this->atLeastOnce())->method('loadXML');
         $this->parser->expects($this->atLeastOnce())->method('getDom');
-        $object = new Loader($this->filesystem, $this->converter, $this->parser);
-        $result = $object->load();
-        $this->assertSame(['a', 'c', 'b'], array_keys($result));
-        $this->assertSame($fixture['a'], $result['a']);
-        $this->assertSame($fixture['b'], $result['b']);
-        $this->assertSame($fixture['c'], $result['c']);
+        $result = $this->loader->load();
+        $this->assertSame(['a', 'e', 'c', 'd', 'b'], array_keys($result));
+        foreach ($fixtures as $name => $fixture) {
+            $this->assertSame($fixture, $result[$name]);
+        }
     }
 
     /**
@@ -97,7 +122,7 @@ public function testLoadCircular()
         ]));
         $this->converter->expects($this->at(0))->method('convert')->willReturn(['a' => $fixture['a']]);
         $this->converter->expects($this->at(1))->method('convert')->willReturn(['b' => $fixture['b']]);
-        $object = new Loader($this->filesystem, $this->converter, $this->parser);
-        $object->load();
+        $this->resolver->expects($this->once())->method('getModulePaths')->willReturn([]);
+        $this->loader->load();
     }
 }