Fixing unit tests, includes environment creation/destruction to UnitTestCase base class + ability to override environment in UnitTestCase.

1 files changed, 31 insertions, 2 deletions

diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
index 8e07c39cc7..69347c99c7 100755
--- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
@@ -7,10 +7,12 @@
  */
 
 namespace Piwik\Tests\Framework\TestCase;
+
+use Piwik\Application\Environment;
+use Piwik\Container\StaticContainer;
 use Piwik\EventDispatcher;
 use Piwik\Tests\Framework\Mock\File;
 
-
 /**
  * Base class for Unit tests.
  *
@@ -18,16 +20,43 @@ use Piwik\Tests\Framework\Mock\File;
  */
 abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var Environment
+     */
+    private $environment;
+
     public function setUp()
     {
         parent::setUp();
+
+        $this->environment = new Environment('test', $this->provideContainerConfig());
+        $this->environment->init();
+
         File::reset();
         EventDispatcher::getInstance()->clearAllObservers();
     }
 
     public function tearDown()
     {
-        parent::tearDown();
         File::reset();
+
+        StaticContainer::clearContainer();
+
+        // make sure the global container exists for the next test case that is executed (since logging can be done
+        // before a test sets up an environment)
+        $nextTestEnviornment = new Environment('test');
+        $nextTestEnviornment->init();
+
+        parent::tearDown();
+    }
+
+    /**
+     * TODO
+     *
+     * @return array
+     */
+    protected function provideContainerConfig()
+    {
+        return array();
     }
 }