Convert tests namespace.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Feb 12, 2017 · cc2d3a2 · cc2d3a2
1 parent 03cc27a
commit cc2d3a2
Show file tree

Hide file tree

Showing 14 changed files with 127 additions and 62 deletions.
diff --git a/composer.json b/composer.json
@@ -16,6 +16,11 @@
             "Orchestra\\Testbench\\" : "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Orchestra\\Testbench\\Tests\\" : "tests/"
+        }
+    },
     "require": {
         "php": ">=5.5.0",
         "laravel/framework": "~5.1.27",

diff --git a/tests/BehatFeatureContextTest.php b/tests/BehatFeatureContextTest.php
@@ -1,6 +1,8 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
 
-use Orchestra\Testbench\BehatFeatureContext;
+namespace Orchestra\Testbench\Tests;
+
+use Orchestra\Testbench\Tests\Stubs\FeatureContext;
 
 class BehatFeatureContextTest extends \PHPUnit_Framework_TestCase
 {
@@ -11,7 +13,7 @@ class BehatFeatureContextTest extends \PHPUnit_Framework_TestCase
      */
     public function testCreateApplicationMethod()
     {
-        $stub = new StubFeatureContext([]);
+        $stub = new FeatureContext([]);
         $app = $stub->createApplication();
 
         $this->assertInstanceOf('\Orchestra\Testbench\TestCaseInterface', $stub);
@@ -21,8 +23,3 @@ public function testCreateApplicationMethod()
         $this->assertInstanceOf('\Illuminate\Config\Repository', $app['config']);
     }
 }
-
-class StubFeatureContext extends BehatFeatureContext
-{
-    //
-}
diff --git a/tests/DatabaseFixtureTest.php b/tests/DatabaseFixtureTest.php
@@ -1,6 +1,10 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
 
-class DatabaseFixtureTest extends \Orchestra\Testbench\TestCase
+namespace Orchestra\Testbench\Tests;
+
+use Orchestra\Testbench\TestCase;
+
+class DatabaseFixtureTest extends TestCase
 {
     /**
      * Setup the test environment.

diff --git a/tests/DefaultConfigurationTest.php b/tests/DefaultConfigurationTest.php
@@ -1,6 +1,10 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
 
-class DefaultConfigurationTest extends \Orchestra\Testbench\TestCase
+namespace Orchestra\Testbench\Tests;
+
+use Orchestra\Testbench\TestCase;
+
+class DefaultConfigurationTest extends TestCase
 {
     /**
      * `cache.default` value is set to array.

diff --git a/tests/Integrations/AggregateServiceProviderTest.php b/tests/Integrations/AggregateServiceProviderTest.php
@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\Integrations\TestCase;
+<?php
+
+namespace Orchestra\Testbench\Tests\Integrations;
 
 use Orchestra\Testbench\TestCase;
 use Illuminate\Support\ServiceProvider;
@@ -16,7 +18,7 @@ class AggregateServiceProviderTest extends TestCase
     protected function getPackageProviders($app)
     {
         return [
-            'Orchestra\Testbench\Integrations\TestCase\ParentService',
+            'Orchestra\Testbench\Tests\Stubs\ParentServiceProvider',
         ];
     }
 
@@ -36,36 +38,3 @@ public function testServiceIsAvailable()
         $this->assertTrue($this->app->make('child.deferred.loaded'));
     }
 }
-
-class ParentService extends AggregateServiceProvider
-{
-    protected $providers = [
-        'Orchestra\Testbench\Integrations\TestCase\ChildService',
-        'Orchestra\Testbench\Integrations\TestCase\DeferredChildService',
-    ];
-
-    public function register()
-    {
-        parent::register();
-
-        $this->app['parent.loaded'] = true;
-    }
-}
-
-class ChildService extends ServiceProvider
-{
-    public function register()
-    {
-        $this->app['child.loaded'] = true;
-    }
-}
-
-class DeferredChildService extends ServiceProvider
-{
-    protected $defer = true;
-
-    public function register()
-    {
-        $this->app['child.deferred.loaded'] = true;
-    }
-}
diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -1,8 +1,11 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\Tests;
 
 use Illuminate\Routing\Router;
+use Orchestra\Testbench\TestCase;
 
-class RouteTest extends \Orchestra\Testbench\TestCase
+class RouteTest extends TestCase
 {
     /**
      * Define environment setup.
@@ -31,7 +34,7 @@ protected function getEnvironmentSetUp($app)
             })->name('boss.bye');
         });
 
-        $app['router']->resource('foo', 'Orchestra\Testbench\TestCase\FooController');
+        $app['router']->resource('foo', 'Orchestra\Testbench\Tests\Stubs\Controller');
     }
 
     /**
@@ -105,10 +108,10 @@ public function testGetPrefixedRoutesViaNameRoute()
      */
     public function testGetFooIndexRouteUsingAction()
     {
-        $crawler = $this->action('GET', '\Orchestra\Testbench\TestCase\FooController@index');
+        $crawler = $this->action('GET', '\Orchestra\Testbench\Tests\Stubs\Controller@index');
 
         $this->assertResponseOk();
-        $this->assertEquals('FooController@index', $crawler->getContent());
+        $this->assertEquals('Controller@index', $crawler->getContent());
     }
 
     /**
@@ -121,14 +124,6 @@ public function testGetFooIndexRouteUsingCall()
         $crawler = $this->call('GET', 'foo');
 
         $this->assertResponseOk();
-        $this->assertEquals('FooController@index', $crawler->getContent());
-    }
-}
-
-class FooController extends \Illuminate\Routing\Controller
-{
-    public function index()
-    {
-        return 'FooController@index';
+        $this->assertEquals('Controller@index', $crawler->getContent());
     }
 }
diff --git a/tests/Stubs/ChildServiceProvider.php b/tests/Stubs/ChildServiceProvider.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+class ChildServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        $this->app['child.loaded'] = true;
+    }
+}
diff --git a/tests/Stubs/Controller.php b/tests/Stubs/Controller.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+class Controller extends \Illuminate\Routing\Controller
+{
+    public function index()
+    {
+        return 'Controller@index';
+    }
+}
diff --git a/tests/Stubs/DeferredChildServiceProvider.php b/tests/Stubs/DeferredChildServiceProvider.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+class DeferredChildServiceProvider extends ServiceProvider
+{
+    protected $defer = true;
+
+    public function register()
+    {
+        $this->app['child.deferred.loaded'] = true;
+    }
+}
diff --git a/tests/Stubs/FeatureContext.php b/tests/Stubs/FeatureContext.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+use Orchestra\Testbench\BehatFeatureContext;
+
+class FeatureContext extends BehatFeatureContext
+{
+    //
+}
diff --git a/tests/Stubs/ParentServiceProvider.php b/tests/Stubs/ParentServiceProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+use Illuminate\Support\AggregateServiceProvider;
+
+class ParentServiceProvider extends AggregateServiceProvider
+{
+    protected $providers = [
+        ChildServiceProvider::class,
+        DeferredChildServiceProvider::class,
+    ];
+
+    public function register()
+    {
+        parent::register();
+
+        $this->app['parent.loaded'] = true;
+    }
+}
diff --git a/tests/Stubs/ServiceProvider.php b/tests/Stubs/ServiceProvider.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+class ServiceProvider extends \Illuminate\Support\ServiceProvider
+{
+    public function register()
+    {
+        //
+    }
+
+    public function boot()
+    {
+        //
+    }
+}
diff --git a/tests/Stubs/TestCase.php b/tests/Stubs/TestCase.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Orchestra\Testbench\Tests\Stubs;
+
+class TestCase extends \Orchestra\Testbench\TestCase
+{
+    //
+}
diff --git a/tests/TestCaseTest.php b/tests/TestCaseTest.php
@@ -1,4 +1,6 @@
-<?php namespace Orchestra\Testbench\TestCase;
+<?php
+
+namespace Orchestra\Testbench\Tests;
 
 class TestCaseTest extends \PHPUnit_Framework_TestCase
 {