Implemented 1. and 2. of goaop#340

RunOpenCode · Aug 15, 2017 · eb3b72f · eb3b72f
1 parent 49ccd3e
commit eb3b72f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/...s/project/src/ApplicationAspectKernel.php → ...roject/src/Kernel/DefaultAspectKernel.php b/...s/project/src/ApplicationAspectKernel.php → ...roject/src/Kernel/DefaultAspectKernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Go\Tests\TestProject;
+namespace Go\Tests\TestProject\Kernel;
 
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
@@ -9,7 +9,7 @@
 use Go\Tests\TestProject\Aspect\LoggingAspect;
 use Psr\Log\NullLogger;
 
-class ApplicationAspectKernel extends AspectKernel
+class DefaultAspectKernel extends AspectKernel
 {
     /**
      * Configure an AspectContainer with advisors, aspects and pointcuts

diff --git a/tests/Fixtures/project/web/configuration.php b/tests/Fixtures/project/web/configuration.php
@@ -0,0 +1,14 @@
+<?php
+
+return array(
+
+    'default' => array(
+        'kernel' => \Go\Tests\TestProject\Kernel\DefaultAspectKernel::class,
+        'appDir' => __DIR__ . '/../',
+        'debug' => true,
+        'cacheDir'  => __DIR__ . '/../var/cache/aspect',
+        'includePaths' => array(
+            __DIR__ . '/../src/'
+        )
+    ),
+);
diff --git a/tests/Fixtures/project/web/index.php b/tests/Fixtures/project/web/index.php
@@ -2,14 +2,8 @@
 
 include_once __DIR__ . '/../../../../vendor/autoload.php';
 
-use Go\Tests\TestProject\ApplicationAspectKernel;
+$configuration = ($env = getenv('GO_AOP_CONFIGURATION')) ? $env : 'default' ;
+$settings = require __DIR__.'/configuration.php';
 
-$applicationAspectKernel = ApplicationAspectKernel::getInstance();
-$applicationAspectKernel->init(array(
-    'appDir' => __DIR__ . '/../',
-    'debug' => true,
-    'cacheDir'  => __DIR__ . '/../var/cache/aspect',
-    'includePaths' => array(
-        __DIR__ . '/../src/'
-    )
-));
+$applicationAspectKernel = $settings[$configuration]['kernel']::getInstance();
+$applicationAspectKernel->init($settings[$configuration]);
diff --git a/tests/Go/Console/Command/DebugAspectCommandTest.php b/tests/Go/Console/Command/DebugAspectCommandTest.php
@@ -16,7 +16,7 @@ public function testItDisplaysAspectsDebugInfo()
         $output = self::exec('debug:aspect');
 
         $expected = [
-            'Go\Tests\TestProject\ApplicationAspectKernel has following enabled aspects',
+            'Go\Tests\TestProject\Kernel\DefaultAspectKernel has following enabled aspects',
             'Go\Tests\TestProject\Aspect\LoggingAspect',
             'Go\Tests\TestProject\Aspect\LoggingAspect->beforeMethod'
         ];

diff --git a/tests/Go/Functional/BaseFunctionalTest.php b/tests/Go/Functional/BaseFunctionalTest.php
@@ -22,14 +22,17 @@ protected static function clearCache()
         }
     }
 
-    protected static function warmUp()
+    protected static function warmUp($configuration = null)
     {
-        return self::exec('cache:warmup:aop');
+        return self::exec('cache:warmup:aop', '', $configuration);
     }
 
-    protected static function exec($command, $args = '')
+    protected static function exec($command, $args = '', $configuration = null)
     {
-        $commandStatement = sprintf('php %s %s %s %s',
+        $configuration = ($configuration) ? sprintf('GO_AOP_CONFIGURATION=%s ', $configuration) : '';
+
+        $commandStatement = sprintf('%sphp %s %s %s %s',
+            $configuration,
             self::$consolePath,
             $command,
             self::$frontControllerPath,
@@ -40,7 +43,7 @@ protected static function exec($command, $args = '')
 
         $process->run();
 
-        self::assertTrue($process->isSuccessful(), sprintf('Unable to execute "%s" command.', $command));
+        self::assertTrue($process->isSuccessful(), sprintf('Unable to execute "%s" command, got output: "%s".', $command, $process->getOutput()));
 
         return $process->getOutput();
     }