fix tests

ixocreate · Apr 20, 2021 · b554772 · b554772
1 parent b8a1286
commit b554772
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/Console/ConsoleApplication.php b/src/Console/ConsoleApplication.php
@@ -38,22 +38,22 @@ public function __construct(string $bootstrapDirectory, string $applicationCache
     {
         $this->bootstrapDirectory = $bootstrapDirectory;
         $this->applicationCacheDirectory = $applicationCacheDirectory;
-    }
 
-    /**
-     * @throws \Exception
-     * @codeCoverageIgnore
-     */
-    public function run(): void
-    {
         //TODO make a proper short syntax check (for grouped input options)
         if (isset($_SERVER['argv']) &&
             \is_array($_SERVER['argv']) &&
             (\array_search('-d', $_SERVER['argv'], true) !== false || \array_search('--development', $_SERVER['argv'], true) !== false)
         ) {
             $this->isDevelopment = true;
         }
+    }
 
+    /**
+     * @throws \Exception
+     * @codeCoverageIgnore
+     */
+    public function run(): void
+    {
         $serviceManager = (new ApplicationBootstrap())->bootstrap(
             $this->bootstrapDirectory,
             $this->applicationCacheDirectory,

diff --git a/tests/src/ApplicationBootstrapTest.php b/tests/src/ApplicationBootstrapTest.php
@@ -36,19 +36,20 @@ protected function tearDown(): void
 
     protected function setUp(): void
     {
-        $this->vfsCache = vfsStream::setup('cache');
+        $this->vfsCache = vfsStream::setup('data');
     }
 
     public function testMinimalBootstrap()
     {
         $application = $this->createMock(ApplicationInterface::class);
 
-        $vfsBootstrap = vfsStream::setup('bootstrap');
+        \mkdir($this->vfsCache->url() . '/bootstrap');
+        \mkdir($this->vfsCache->url() . '/cache');
 
         $bootstrap = new ApplicationBootstrap();
-        $serviceManager = $bootstrap->bootstrap($vfsBootstrap->url(), $this->vfsCache->url(), $application, new BootstrapFactory());
+        $serviceManager = $bootstrap->bootstrap($this->vfsCache->url() . '/bootstrap', $this->vfsCache->url() . '/cache/', $application, new BootstrapFactory());
 
-        $this->assertFalse($this->vfsCache->hasChildren());
+        $this->assertTrue($this->vfsCache->getChild('cache')->hasChildren());
 
         $this->assertInstanceOf(ServiceManager::class, $serviceManager);
         $this->assertInstanceOf(ApplicationConfig::class, $serviceManager->get(ApplicationConfig::class));
@@ -125,7 +126,7 @@ public function testPackageBoot()
         $bootstrap = new ApplicationBootstrap();
         $serviceManager = $bootstrap->bootstrap(
             $vfsBootstrap->url() . '/',
-            $this->vfsCache->url() . '/',
+            $vfsBootstrap->url() . '/',
             $application,
             $bootstrapFactoryMock
         );

diff --git a/tests/src/Console/ConsoleApplicationTest.php b/tests/src/Console/ConsoleApplicationTest.php
@@ -17,15 +17,14 @@ class ConsoleApplicationTest extends TestCase
 {
     public function testConfigure()
     {
-        $application = new ConsoleApplication('/bootstrap');
-
         $_SERVER['argv'] = ['-d'];
         $configurator = $this->createMock(ApplicationConfigurator::class);
         $configurator->expects($this->once())
             ->method('setDevelopment')
             ->willReturnCallback(function ($param) {
                 $this->assertTrue($param);
             });
+        $application = new ConsoleApplication('/bootstrap');
         $application->configure($configurator);
 
         $_SERVER['argv'] = ['--development'];
@@ -35,29 +34,31 @@ public function testConfigure()
             ->willReturnCallback(function ($param) {
                 $this->assertTrue($param);
             });
+        $application = new ConsoleApplication('/bootstrap');
         $application->configure($configurator);
     }
 
     public function testEmptyConfigure()
     {
-        $application = new ConsoleApplication('/bootstrap');
-
         unset($_SERVER['argv']);
         $configurator = $this->createMock(ApplicationConfigurator::class);
         $configurator->expects($this->never())
             ->method('setDevelopment');
+        $application = new ConsoleApplication('/bootstrap');
         $application->configure($configurator);
 
         $_SERVER['argv'] = 'string';
         $configurator = $this->createMock(ApplicationConfigurator::class);
         $configurator->expects($this->never())
             ->method('setDevelopment');
+        $application = new ConsoleApplication('/bootstrap');
         $application->configure($configurator);
 
         $_SERVER['argv'] = ['string'];
         $configurator = $this->createMock(ApplicationConfigurator::class);
         $configurator->expects($this->never())
             ->method('setDevelopment');
+        $application = new ConsoleApplication('/bootstrap');
         $application->configure($configurator);
     }
 }