Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-07 02:35:17 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-07 02:35:17 +0400
commitf3301e8f9f84efce9f698b18d13aff79f5eaf4f1 (patch)
treeb62a83c18e968847221c4570297f410f2f07621a /tests
parent61ac0ef47f14d15a7aad6e43fcce64dabbeff8d0 (diff)
Removed the deprecated Piwik_Config_Compat file and the Piwik::createConfigObject function.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/PHPUnit/Core/DataTable/ArrayTest.php1
-rw-r--r--tests/PHPUnit/Core/IPTest.php1
-rw-r--r--tests/PHPUnit/DatabaseTestCase.php1
-rwxr-xr-xtests/PHPUnit/IntegrationTestCase.php1
-rw-r--r--tests/PHPUnit/proxy/index.php1
-rwxr-xr-xtests/PHPUnit/proxy/piwik.php1
6 files changed, 0 insertions, 6 deletions
diff --git a/tests/PHPUnit/Core/DataTable/ArrayTest.php b/tests/PHPUnit/Core/DataTable/ArrayTest.php
index 015939311a..9be0608b33 100755
--- a/tests/PHPUnit/Core/DataTable/ArrayTest.php
+++ b/tests/PHPUnit/Core/DataTable/ArrayTest.php
@@ -4,7 +4,6 @@ class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase
public function setUp()
{
parent::setUp();
- Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
Piwik_DataTable_Manager::getInstance()->deleteAll();
}
diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php
index d319c2924e..ff7e9ca067 100644
--- a/tests/PHPUnit/Core/IPTest.php
+++ b/tests/PHPUnit/Core/IPTest.php
@@ -580,7 +580,6 @@ class IPTest extends PHPUnit_Framework_TestCase
*/
public function testGetIpFromHeader($description, $test)
{
- Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
$_SERVER['REMOTE_ADDR'] = $test[0];
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index 35a2c8f050..d38aca1d89 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -23,7 +23,6 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
{
parent::setUp();
try {
- Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
$dbConfig = Piwik_Config::getInstance()->database;
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 7cb0228c5c..5f6224124a 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -27,7 +27,6 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
*/
public static function createTestConfig()
{
- Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
}
diff --git a/tests/PHPUnit/proxy/index.php b/tests/PHPUnit/proxy/index.php
index fd59a24554..187aa0c0ae 100644
--- a/tests/PHPUnit/proxy/index.php
+++ b/tests/PHPUnit/proxy/index.php
@@ -24,7 +24,6 @@ class Piwik_FrontController_Test extends Piwik_FrontController
protected function createConfigObject()
{
// Config files forced to use the test database
- Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
}
diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php
index 0be50af23b..841d2bb549 100755
--- a/tests/PHPUnit/proxy/piwik.php
+++ b/tests/PHPUnit/proxy/piwik.php
@@ -22,7 +22,6 @@ require_once PIWIK_INCLUDE_PATH . '/core/Loader.php';
// Config files forced to use the test database
// Note that this also provides security for Piwik installs containing tests files:
// this proxy will not record any data in the production database.
-Piwik::createConfigObject();
Piwik_Config::getInstance()->setTestEnvironment();
Piwik_Config::getInstance()->PluginsInstalled['PluginsInstalled'] = array();
try {