From 5c5327bb30ebdf86036dcafb720e20f1b1c55423 Mon Sep 17 00:00:00 2001
From: robocoder <anthon.pang@gmail.com>
Date: Mon, 13 Sep 2010 01:46:21 +0000
Subject: [PATCH] tweaking all the unit tests to also run from the CLI, e.g.,
find plugins -name '*.test.php' -exec php {} \;
git-svn-id: http://dev.piwik.org/svn/trunk@3143 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/DataTable.php | 5 +++++
plugins/Actions/tests/Actions.test.php | 7 ++-----
plugins/AnonymizeIP/tests/AnonymizeIP.test.php | 5 +----
plugins/ExampleAPI/tests/Integration.test.php | 7 ++-----
plugins/LanguagesManager/tests/LanguagesManager.test.php | 5 +----
plugins/Login/tests/Login.test.php | 5 +----
plugins/Referers/tests/Referers.test.php | 5 +----
plugins/SitesManager/tests/SitesManager.test.php | 5 +----
plugins/UserCountry/tests/UserCountry.test.php | 5 +----
plugins/UserSettings/tests/UserSettings.test.php | 5 +----
plugins/UsersManager/tests/UsersManager.test.php | 5 +----
tests/core/API/DocumentationGenerator.test.php | 5 +----
tests/core/ArchiveProcessing.test.php | 5 +----
tests/core/ArchiveProcessing/Day.test.php | 5 +----
tests/core/AssetManager.test.php | 5 +----
tests/core/Common.test.php | 5 +----
tests/core/Config.test.php | 5 +----
tests/core/DataTable.test.php | 5 +----
tests/core/DataTable/Filter/AddSummaryRow.test.php | 5 +----
tests/core/DataTable/Filter/ExcludeLowPopulation.test.php | 7 ++-----
tests/core/DataTable/Filter/Limit.test.php | 5 +----
tests/core/DataTable/Filter/Pattern.test.php | 7 ++-----
tests/core/DataTable/Filter/Sort.test.php | 5 +----
tests/core/DataTable/Renderer.test.php | 5 +----
tests/core/Database.test.php | 5 +----
tests/core/Date.test.php | 5 +----
tests/core/Http.test.php | 5 +----
tests/core/PHP_Related.test.php | 5 +----
tests/core/Period.test.php | 5 +----
tests/core/Piwik.test.php | 5 +----
tests/core/ReleaseCheckList.test.php | 5 +----
tests/core/ScheduledTask.test.php | 7 ++-----
tests/core/ScheduledTime.test.php | 7 ++-----
tests/core/TablePartitioning.test.php | 5 +----
tests/core/Tracker/Action.test.php | 5 +----
tests/core/Tracker/Config.test.php | 5 +----
tests/core/Tracker/Visit.test.php | 5 +----
tests/core/Updater.test.php | 5 +----
tests/core/Url.test.php | 5 +----
tests/core/blank.test.php | 5 +----
tests/integration/Integration.php | 5 +----
tests/integration/Main.test.php | 7 ++-----
42 files changed, 53 insertions(+), 171 deletions(-)
diff --git a/core/DataTable.php b/core/DataTable.php
index fd15f0bdf7..0b39756d7c 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -10,6 +10,11 @@
* @package Piwik
*/
+/**
+ * @see destroy()
+ */
+require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
+
/**
*
* ---- DataTable
diff --git a/plugins/Actions/tests/Actions.test.php b/plugins/Actions/tests/Actions.test.php
index a7f0197334..399b07fc26 100644
--- a/plugins/Actions/tests/Actions.test.php
+++ b/plugins/Actions/tests/Actions.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'Actions/Actions.php';
@@ -93,4 +90,4 @@ class Test_Piwik_Actions_getActionExplodedNames extends Piwik_Actions {
{
return self::getActionExplodedNames($name, $type);
}
-}
\ No newline at end of file
+}
diff --git a/plugins/AnonymizeIP/tests/AnonymizeIP.test.php b/plugins/AnonymizeIP/tests/AnonymizeIP.test.php
index 7afd3e68bc..44bc753234 100644
--- a/plugins/AnonymizeIP/tests/AnonymizeIP.test.php
+++ b/plugins/AnonymizeIP/tests/AnonymizeIP.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
if(!class_exists('Piwik_AnonymizeIP', false))
diff --git a/plugins/ExampleAPI/tests/Integration.test.php b/plugins/ExampleAPI/tests/Integration.test.php
index ca84de2562..7bf7e1d8dd 100644
--- a/plugins/ExampleAPI/tests/Integration.test.php
+++ b/plugins/ExampleAPI/tests/Integration.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once PIWIK_INCLUDE_PATH . '/tests/integration/Integration.php';
@@ -37,4 +34,4 @@ class Test_Piwik_Integration_ExampleAPI extends Test_Integration
$renderers = Piwik_DataTable_Renderer::getRenderers();
$this->callGetApiCompareOutput(__FUNCTION__, $renderers);
}
-}
\ No newline at end of file
+}
diff --git a/plugins/LanguagesManager/tests/LanguagesManager.test.php b/plugins/LanguagesManager/tests/LanguagesManager.test.php
index 2c3ddd4590..4675b69f66 100644
--- a/plugins/LanguagesManager/tests/LanguagesManager.test.php
+++ b/plugins/LanguagesManager/tests/LanguagesManager.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'LanguagesManager/API.php';
diff --git a/plugins/Login/tests/Login.test.php b/plugins/Login/tests/Login.test.php
index e7e25bb992..956b55bca5 100644
--- a/plugins/Login/tests/Login.test.php
+++ b/plugins/Login/tests/Login.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
if(!class_exists('Piwik_Login_Auth', false))
diff --git a/plugins/Referers/tests/Referers.test.php b/plugins/Referers/tests/Referers.test.php
index eb83352fb7..fc3a386273 100644
--- a/plugins/Referers/tests/Referers.test.php
+++ b/plugins/Referers/tests/Referers.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
// require_once 'Referers/API.php';
diff --git a/plugins/SitesManager/tests/SitesManager.test.php b/plugins/SitesManager/tests/SitesManager.test.php
index c7836fc4b9..dcf8849660 100644
--- a/plugins/SitesManager/tests/SitesManager.test.php
+++ b/plugins/SitesManager/tests/SitesManager.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once PIWIK_PATH_TEST_TO_ROOT . '/tests/core/Database.test.php';
diff --git a/plugins/UserCountry/tests/UserCountry.test.php b/plugins/UserCountry/tests/UserCountry.test.php
index 78cbeba6af..fa6b743ec5 100644
--- a/plugins/UserCountry/tests/UserCountry.test.php
+++ b/plugins/UserCountry/tests/UserCountry.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require 'UserCountry/functions.php';
diff --git a/plugins/UserSettings/tests/UserSettings.test.php b/plugins/UserSettings/tests/UserSettings.test.php
index b0df96affc..aae976805b 100644
--- a/plugins/UserSettings/tests/UserSettings.test.php
+++ b/plugins/UserSettings/tests/UserSettings.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
if(!class_exists('Piwik_UserSettings', false))
diff --git a/plugins/UsersManager/tests/UsersManager.test.php b/plugins/UsersManager/tests/UsersManager.test.php
index 5766fe97f7..5b3fa20ee2 100644
--- a/plugins/UsersManager/tests/UsersManager.test.php
+++ b/plugins/UsersManager/tests/UsersManager.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once PIWIK_PATH_TEST_TO_ROOT . '/tests/core/Database.test.php';
diff --git a/tests/core/API/DocumentationGenerator.test.php b/tests/core/API/DocumentationGenerator.test.php
index c832306a74..b6bc4bc508 100644
--- a/tests/core/API/DocumentationGenerator.test.php
+++ b/tests/core/API/DocumentationGenerator.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once "API/DocumentationGenerator.php";
diff --git a/tests/core/ArchiveProcessing.test.php b/tests/core/ArchiveProcessing.test.php
index a395147c29..e019242c3f 100644
--- a/tests/core/ArchiveProcessing.test.php
+++ b/tests/core/ArchiveProcessing.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once "Database.test.php";
diff --git a/tests/core/ArchiveProcessing/Day.test.php b/tests/core/ArchiveProcessing/Day.test.php
index b71678f4ac..a3808265b0 100644
--- a/tests/core/ArchiveProcessing/Day.test.php
+++ b/tests/core/ArchiveProcessing/Day.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once "ArchiveProcessing.php";
diff --git a/tests/core/AssetManager.test.php b/tests/core/AssetManager.test.php
index cb04e865ea..58c2c7dbd1 100644
--- a/tests/core/AssetManager.test.php
+++ b/tests/core/AssetManager.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik_AssetManager extends UnitTestCase
diff --git a/tests/core/Common.test.php b/tests/core/Common.test.php
index 347e702cdc..605947fa7e 100644
--- a/tests/core/Common.test.php
+++ b/tests/core/Common.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik_Cookie_Mock_Class {
diff --git a/tests/core/Config.test.php b/tests/core/Config.test.php
index 919630b6d4..3dfa40de23 100644
--- a/tests/core/Config.test.php
+++ b/tests/core/Config.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik_Config extends UnitTestCase
diff --git a/tests/core/DataTable.test.php b/tests/core/DataTable.test.php
index 271535b354..e04ff69f62 100644
--- a/tests/core/DataTable.test.php
+++ b/tests/core/DataTable.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'DataTable.php';
diff --git a/tests/core/DataTable/Filter/AddSummaryRow.test.php b/tests/core/DataTable/Filter/AddSummaryRow.test.php
index 73907ce8a3..151fa9902e 100644
--- a/tests/core/DataTable/Filter/AddSummaryRow.test.php
+++ b/tests/core/DataTable/Filter/AddSummaryRow.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../../tests/config_test.php";
}
require_once 'DataTable.php';
diff --git a/tests/core/DataTable/Filter/ExcludeLowPopulation.test.php b/tests/core/DataTable/Filter/ExcludeLowPopulation.test.php
index 9f02738b86..4ae7c0c2e2 100644
--- a/tests/core/DataTable/Filter/ExcludeLowPopulation.test.php
+++ b/tests/core/DataTable/Filter/ExcludeLowPopulation.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../../tests/config_test.php";
}
require_once 'DataTable.php';
@@ -91,4 +88,4 @@ class Test_Piwik_DataTable_Filter_ExcludeLowPopulation extends UnitTestCase
$this->assertTrue(Piwik_DataTable::isEqual($table, $expectedtable));
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/DataTable/Filter/Limit.test.php b/tests/core/DataTable/Filter/Limit.test.php
index 34060ca546..00969ee3e6 100644
--- a/tests/core/DataTable/Filter/Limit.test.php
+++ b/tests/core/DataTable/Filter/Limit.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../../tests/config_test.php";
}
require_once 'DataTable.php';
diff --git a/tests/core/DataTable/Filter/Pattern.test.php b/tests/core/DataTable/Filter/Pattern.test.php
index 71c902a754..5266a89f9b 100644
--- a/tests/core/DataTable/Filter/Pattern.test.php
+++ b/tests/core/DataTable/Filter/Pattern.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../../tests/config_test.php";
}
require_once 'DataTable.php';
@@ -51,4 +48,4 @@ class Test_Piwik_DataTable_Filter_Pattern extends UnitTestCase
$this->assertEqual($filteredTable->getRows(), $expectedtable->getRows(), "pattern search failed for pattern $pattern");
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/DataTable/Filter/Sort.test.php b/tests/core/DataTable/Filter/Sort.test.php
index 41aaf8286e..8b889fd2f6 100644
--- a/tests/core/DataTable/Filter/Sort.test.php
+++ b/tests/core/DataTable/Filter/Sort.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../../tests/config_test.php";
}
require_once 'DataTable.php';
diff --git a/tests/core/DataTable/Renderer.test.php b/tests/core/DataTable/Renderer.test.php
index c0a88ef2d7..d4d2ac8d6f 100644
--- a/tests/core/DataTable/Renderer.test.php
+++ b/tests/core/DataTable/Renderer.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'DataTable.php';
diff --git a/tests/core/Database.test.php b/tests/core/Database.test.php
index d966ce0a54..71112af18e 100644
--- a/tests/core/Database.test.php
+++ b/tests/core/Database.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
Mock::generate('Piwik_Access');
diff --git a/tests/core/Date.test.php b/tests/core/Date.test.php
index 8621cd4151..5fda8d0b2e 100644
--- a/tests/core/Date.test.php
+++ b/tests/core/Date.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'Date.php';
diff --git a/tests/core/Http.test.php b/tests/core/Http.test.php
index 9ac7daabfd..dd519466c2 100644
--- a/tests/core/Http.test.php
+++ b/tests/core/Http.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik_Http extends UnitTestCase
{
diff --git a/tests/core/PHP_Related.test.php b/tests/core/PHP_Related.test.php
index 727752450a..a89fa300bf 100644
--- a/tests/core/PHP_Related.test.php
+++ b/tests/core/PHP_Related.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
diff --git a/tests/core/Period.test.php b/tests/core/Period.test.php
index b1eabafed6..ce6ed567fa 100644
--- a/tests/core/Period.test.php
+++ b/tests/core/Period.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'Period.php';
diff --git a/tests/core/Piwik.test.php b/tests/core/Piwik.test.php
index 76d1a18c0f..be8bf24132 100644
--- a/tests/core/Piwik.test.php
+++ b/tests/core/Piwik.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik extends UnitTestCase
{
diff --git a/tests/core/ReleaseCheckList.test.php b/tests/core/ReleaseCheckList.test.php
index c703be15b9..ec637f19a9 100644
--- a/tests/core/ReleaseCheckList.test.php
+++ b/tests/core/ReleaseCheckList.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
//Zend_Loader::loadClass('Piwik_');
diff --git a/tests/core/ScheduledTask.test.php b/tests/core/ScheduledTask.test.php
index e5d32275e2..3b5e9d042c 100644
--- a/tests/core/ScheduledTask.test.php
+++ b/tests/core/ScheduledTask.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'ScheduledTask.php';
@@ -31,4 +28,4 @@ class Test_Piwik_ScheduledTask extends UnitTestCase
$scheduledTime = $scheduledTask->getScheduledTime();
$this->assertTrue( get_class($scheduledTime) == "Piwik_ScheduledTime_Hourly" );
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/ScheduledTime.test.php b/tests/core/ScheduledTime.test.php
index c47b706a96..7394c2ba42 100644
--- a/tests/core/ScheduledTime.test.php
+++ b/tests/core/ScheduledTime.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'ScheduledTime.php';
@@ -1271,4 +1268,4 @@ class Test_Piwik_ScheduledTime extends UnitTestCase
$monthlySchedule->setReturnValue('getTime', $this->JANUARY_02_1971_12_10_00);
$this->assertEqual($monthlySchedule->getRescheduledTime(), $this->FEBRUARY_17_1971_09_00_00);
}
-}
\ No newline at end of file
+}
diff --git a/tests/core/TablePartitioning.test.php b/tests/core/TablePartitioning.test.php
index f28dbc09ea..e734ebba3d 100644
--- a/tests/core/TablePartitioning.test.php
+++ b/tests/core/TablePartitioning.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'Database.test.php';
diff --git a/tests/core/Tracker/Action.test.php b/tests/core/Tracker/Action.test.php
index bc2492d6b3..031e61552c 100644
--- a/tests/core/Tracker/Action.test.php
+++ b/tests/core/Tracker/Action.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'Tracker/Action.php';
diff --git a/tests/core/Tracker/Config.test.php b/tests/core/Tracker/Config.test.php
index 75c20dfca4..e1c009a691 100644
--- a/tests/core/Tracker/Config.test.php
+++ b/tests/core/Tracker/Config.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'Tracker/Config.php';
diff --git a/tests/core/Tracker/Visit.test.php b/tests/core/Tracker/Visit.test.php
index 4aff75d73f..611217c952 100644
--- a/tests/core/Tracker/Visit.test.php
+++ b/tests/core/Tracker/Visit.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../../tests/config_test.php";
}
require_once 'Tracker/Visit.php';
diff --git a/tests/core/Updater.test.php b/tests/core/Updater.test.php
index 8dee2b38f7..3dc2017d44 100644
--- a/tests/core/Updater.test.php
+++ b/tests/core/Updater.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once 'Database.test.php';
diff --git a/tests/core/Url.test.php b/tests/core/Url.test.php
index 797ef698aa..e3500f74d7 100644
--- a/tests/core/Url.test.php
+++ b/tests/core/Url.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
require_once "Url.php";
diff --git a/tests/core/blank.test.php b/tests/core/blank.test.php
index bf3ba18e04..dc532e0bab 100644
--- a/tests/core/blank.test.php
+++ b/tests/core/blank.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
class Test_Piwik_Blank extends UnitTestCase
diff --git a/tests/integration/Integration.php b/tests/integration/Integration.php
index 28b1159915..9d83f20836 100644
--- a/tests/integration/Integration.php
+++ b/tests/integration/Integration.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
Mock::generate('Piwik_Access');
diff --git a/tests/integration/Main.test.php b/tests/integration/Main.test.php
index e4ee3f0f45..3963f9e55a 100644
--- a/tests/integration/Main.test.php
+++ b/tests/integration/Main.test.php
@@ -1,10 +1,7 @@
<?php
-if(!defined("PIWIK_PATH_TEST_TO_ROOT")) {
- define('PIWIK_PATH_TEST_TO_ROOT', getcwd().'/../..');
-}
if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
{
- require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
+ require_once dirname(__FILE__)."/../../tests/config_test.php";
}
@@ -246,4 +243,4 @@ class Test_Piwik_Integration_Main extends Test_Integration
$this->callGetApiCompareOutput(__FUNCTION__, 'xml', $idSite = 'all', $dateTime, $periods, $setDateLastN = true);
}
-}
\ No newline at end of file
+}
--
GitLab