move to new testing structure

electricjones · Mar 11, 2016 · 0f1ad1a · 0f1ad1a
1 parent d6f4f90
commit 0f1ad1a
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 51 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit bootstrap="tests/bootstrap.php"
          backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"

diff --git a/tests/CustomizedManagerTest.php b/tests/CustomizedManagerTest.php
diff --git a/tests/Integration/Managers/CustomizedManagerTest.php b/tests/Integration/Managers/CustomizedManagerTest.php
@@ -0,0 +1,17 @@
+<?php
+namespace Michaels\Manager\Test\Integration\Managers;
+
+use Michaels\Manager\Manager;
+use Michaels\Manager\Test\Scenarios\InitManagerScenario;
+use Michaels\Manager\Test\Scenarios\ManagesItemsScenario;
+use Michaels\Manager\Test\Stubs\CustomizedManagerStub;
+
+/**
+ * Tests customized implementations of Manager.
+ * Does NOT test ManagesItemsTrait api.
+ */
+class CustomizedManagerTest extends \PHPUnit_Framework_TestCase {
+
+    use ManagesItemsScenario, InitManagerScenario; // Pull in all the tests for ManagesItemsTrait, for integration testing
+}
+
diff --git a/tests/Integration/Managers/ManagerTest.php b/tests/Integration/Managers/ManagerTest.php
@@ -0,0 +1,14 @@
+<?php
+namespace Michaels\Manager\Test\Managers\Integration;
+
+use Michaels\Manager\Test\Scenarios\InitManagerScenario;
+use Michaels\Manager\Test\Scenarios\ManagesItemsScenario;
+
+/**
+ * Tests customized implementations of Manager.
+ * Does NOT test ManagesItemsTrait api.
+ */
+class ManagerTest extends \PHPUnit_Framework_TestCase
+{
+    use ManagesItemsScenario, InitManagerScenario; // Pull in all the tests for ManagesItemsTrait, for integration testing
+}
diff --git a/tests/ManagerTest.php → tests/Scenarios/InitManagerScenario.php b/tests/ManagerTest.php → tests/Scenarios/InitManagerScenario.php
@@ -1,14 +1,13 @@
 <?php
-namespace Michaels\Manager\Test;
-
+namespace Michaels\Manager\Test\Scenarios;
 use Michaels\Manager\Manager;
 
 /**
- * Tests customized implementations of Manager.
+ * Tests Array Access, JSON, and Iterator for Manager.
  * Does NOT test ManagesItemsTrait api.
  */
-class ManagerTest extends \PHPUnit_Framework_TestCase {
-
+trait InitManagerScenario
+{
     public function test_init_manager()
     {
         $expectedItems = ['one' => 1, 'two' => 2];

diff --git a/tests/Bags/FileBagTest.php → tests/Unit/Bags/FileBagTest.php b/tests/Bags/FileBagTest.php → tests/Unit/Bags/FileBagTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test;
+namespace Michaels\Manager\Test\Unit\Bags;
 
 use Michaels\Manager\Bags\FileBag;
 use Michaels\Manager\Test\Utilities\FileBagTestTrait;
@@ -32,7 +32,7 @@ class FileBagTest extends \PHPUnit_Framework_TestCase
      */
     public function setup()
     {
-        $this->goodTestFileDirectory = realpath(__DIR__ . '/../Fixtures/FilesWithGoodExtensions');
+        $this->goodTestFileDirectory = realpath($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodExtensions');
 
         $this->goodTestFileObjects = $this->setFilesToSplInfoObjects($this->goodTestFileDirectory);
         $this->badTestFileObjects = $this->setFilesToBadObjects();

diff --git a/tests/Decoders/JsonDecoderTest.php → tests/Unit/Decoders/JsonDecoderTest.php b/tests/Decoders/JsonDecoderTest.php → tests/Unit/Decoders/JsonDecoderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test;
+namespace Michaels\Manager\Test\Unit\Decoders;
 
 use Michaels\Manager\Decoders\JsonDecoder;
 

diff --git a/tests/Decoders/PhpDecoderTest.php → tests/Unit/Decoders/PhpDecoderTest.php b/tests/Decoders/PhpDecoderTest.php → tests/Unit/Decoders/PhpDecoderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test;
+namespace Michaels\Manager\Test\Unit\Decoders;
 
 use Michaels\Manager\Decoders\PhpDecoder;
 

diff --git a/tests/Decoders/YamlDecoderTest.php → tests/Unit/Decoders/YamlDecoderTest.php b/tests/Decoders/YamlDecoderTest.php → tests/Unit/Decoders/YamlDecoderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test;
+namespace Michaels\Manager\Test\Unit\Decoders;
 
 use Michaels\Manager\Decoders\YamlDecoder;
 use Symfony\Component\Yaml\Yaml;

diff --git a/tests/FileLoaderTest.php → tests/Unit/FileLoaderTest.php b/tests/FileLoaderTest.php → tests/Unit/FileLoaderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test;
+namespace Michaels\Manager\Test\Unit;
 
 use Michaels\Manager\Manager;
 use Michaels\Manager\FileLoader;
@@ -12,6 +12,8 @@ class FileLoaderTest extends \PHPUnit_Framework_TestCase
     use FileBagTestTrait;
 
     protected $testData;
+
+    /** @var  FileLoader */
     private $fileLoader;
 
     private $defaultArray = [];
@@ -43,15 +45,15 @@ public function setup()
 
     public function test_adding_files_as_array()
     {
-        $goodTestFileDirectory = realpath(__DIR__ . '/Fixtures/FilesWithGoodData');
+        $goodTestFileDirectory = realpath($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData');
         $goodFiles =  $this->setFilesToSplInfoObjects($goodTestFileDirectory);
         $this->fileLoader->addFiles($goodFiles);
         $this->assertEquals($this->defaultArray, $this->fileLoader->process());
     }
 
     public function test_adding_file_bag()
     {
-        $goodTestFileDirectory = realpath(__DIR__ . '/Fixtures/FilesWithGoodData');
+        $goodTestFileDirectory = realpath($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData');
         $goodFiles =  $this->setFilesToSplInfoObjects($goodTestFileDirectory);
         $fileBag = new FileBag($goodFiles);
         $this->fileLoader->addFiles($fileBag);
@@ -61,8 +63,8 @@ public function test_adding_file_bag()
 
     public function test_adding_a_custom_decoder_and_processing()
     {
-        $goodTestFileDirectory = realpath(__DIR__ . '/Fixtures/FilesWithGoodData');
-        $goodCustomFileDirectory = realpath(__DIR__ . '/Fixtures/CustomFileWithGoodData');
+        $goodTestFileDirectory = realpath($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData');
+        $goodCustomFileDirectory = realpath($GLOBALS['test_config']['test_dir'] . '/Fixtures/CustomFileWithGoodData');
         $goodFiles =  $this->setFilesToSplInfoObjects($goodTestFileDirectory);
         $goodCustomFile = $this->setFilesToSplInfoObjects($goodCustomFileDirectory);
         $goodFiles = array_merge($goodFiles, $goodCustomFile);
@@ -150,8 +152,8 @@ public function test_using_explicit_namespaces()
     {
         $fileLoader = new FileLoader();
         $fileLoader->addFiles([
-            new \SplFileInfo(__DIR__.'/Fixtures/FilesWithGoodData/jsonConfig.json'),
-            [new \SplFileInfo(__DIR__.'/Fixtures/FilesWithGoodData/phpConfig.php'), 'customNs']
+            new \SplFileInfo($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData/jsonConfig.json'),
+            [new \SplFileInfo($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData/phpConfig.php'), 'customNs']
         ]);
 
         $expected['jsonConfig'] = $this->testData;
@@ -166,9 +168,9 @@ public function test_loading_files_as_a_path()
     {
         $fileLoader = new FileLoader();
         $fileLoader->addFiles([
-            __DIR__.'/Fixtures/FilesWithGoodData/yamlConfig.yaml',
-            [__DIR__.'/Fixtures/FilesWithGoodData/phpConfig.php', 'customNs'],
-            new \SplFileInfo(__DIR__.'/Fixtures/FilesWithGoodData/jsonConfig.json'),
+            $GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData/yamlConfig.yaml',
+            [$GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData/phpConfig.php', 'customNs'],
+            new \SplFileInfo($GLOBALS['test_config']['test_dir'] . '/Fixtures/FilesWithGoodData/jsonConfig.json'),
         ]);
 
         $expected['yamlConfig'] = $this->testData;

diff --git a/tests/Traits/ArrayableTest.php → tests/Unit/Traits/ArrayableTest.php b/tests/Traits/ArrayableTest.php → tests/Unit/Traits/ArrayableTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 use Michaels\Manager\Test\Scenarios\ArrayableScenario;
 
 /**

diff --git a/tests/Traits/ChainNestedItemsTest.php → tests/Unit/Traits/ChainNestedItemsTest.php b/tests/Traits/ChainNestedItemsTest.php → tests/Unit/Traits/ChainNestedItemsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 
 use Michaels\Manager\Test\Scenarios\ChainsNestedItemsScenario;
 

diff --git a/tests/Traits/CollectionTest.php → tests/Unit/Traits/CollectionTest.php b/tests/Traits/CollectionTest.php → tests/Unit/Traits/CollectionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 
 use Michaels\Manager\Test\Scenarios\CollectionScenario;
 

diff --git a/tests/Traits/LoadsFilesTest.php → tests/Unit/Traits/LoadsFilesTest.php b/tests/Traits/LoadsFilesTest.php → tests/Unit/Traits/LoadsFilesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 
 use Michaels\Manager\Test\Scenarios\LoadsFilesScenario;
 

diff --git a/tests/Traits/ManagesIocTest.php → tests/Unit/Traits/ManagesIocTest.php b/tests/Traits/ManagesIocTest.php → tests/Unit/Traits/ManagesIocTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 
 use Michaels\Manager\Test\Scenarios\ManagesIocScenario;
 

diff --git a/tests/Traits/ManagesItemsTest.php → tests/Unit/Traits/ManagesItemsTest.php b/tests/Traits/ManagesItemsTest.php → tests/Unit/Traits/ManagesItemsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Michaels\Manager\Test\Traits;
+namespace Michaels\Manager\Test\Unit\Traits;
 
 use Michaels\Manager\Test\Scenarios\ManagesIocScenario;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once __DIR__ . "/../vendor/autoload.php";
+
+$GLOBALS['test_config'] = [
+    'test_dir' => __DIR__,
+];