Use mock RawLogDao instance in PrivacyManagerTest instead of test events. Also allow IntegrationTests to override DI config for tests.

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
index 9f2c5eb688..0b1914d08f 100644
--- a/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/IntegrationTestCase.php
@@ -9,11 +9,11 @@
 namespace Piwik\Tests\Framework\TestCase;
 
 use Piwik\Access;
+use Piwik\Application\Environment;
 use Piwik\Config;
 use Piwik\Db;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Cache as PiwikCache;
-use Piwik\Tests\Framework\Mock\TestConfig;
 
 /**
  * Tests extending IntegrationTestCase are much slower to run: the setUp will
@@ -32,6 +32,8 @@ abstract class IntegrationTestCase extends SystemTestCase
     public static $fixture;
     public static $tableData;
 
+    private $piwikEnvironment;
+
     /**
      * Implementation details:
      *
@@ -86,6 +88,11 @@ abstract class IntegrationTestCase extends SystemTestCase
             self::restoreDbTables(self::$tableData);
         }
 
+        $this->piwikEnvironment = new Environment('test', $this->provideContainerConfig());
+        $this->piwikEnvironment->init();
+
+        Fixture::loadAllPlugins(null, get_class($this));
+
         PiwikCache::getEagerCache()->flushAll();
         PiwikCache::getTransientCache()->flushAll();
     }