From 6708a431479b8e1d2d59fd4580afb9f941b99ea1 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 31 Dec 2014 14:39:06 +1300
Subject: [PATCH] Removed direct inclusion of data files
---
.../TranslationWriter/Validate/CoreTranslationsTest.php | 6 ------
.../Test/Unit/TranslationWriter/WriterTest.php | 7 -------
tests/PHPUnit/Framework/Fixture.php | 3 ---
tests/PHPUnit/Unit/CommonTest.php | 4 ----
tests/PHPUnit/Unit/UrlHelperTest.php | 1 -
5 files changed, 21 deletions(-)
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
index 2a82991fcd..cd0ed02093 100644
--- a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
@@ -15,12 +15,6 @@ use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
*/
class CoreTranslationsTest extends \PHPUnit_Framework_TestCase
{
- public function setUp()
- {
- include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
- include PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
- }
-
public function getFilterTestDataValid()
{
return array(
diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
index 41b754f55b..6f8baa28a9 100644
--- a/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
@@ -21,13 +21,6 @@ use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
*/
class WriterTest extends \PHPUnit_Framework_TestCase
{
- public function setUp()
- {
- parent::setUp();
- include PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php';
- include PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
- }
-
/**
* @group Core
*
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 751c4ce1ab..342e47527f 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -189,10 +189,7 @@ class Fixture extends \PHPUnit_Framework_Assert
include "DataFiles/SearchEngines.php";
include "DataFiles/Socials.php";
- include "DataFiles/Languages.php";
- include "DataFiles/Countries.php";
include "DataFiles/Currencies.php";
- include "DataFiles/LanguageToCountry.php";
include "DataFiles/Providers.php";
if (!$this->isFixtureSetUp()) {
diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
index 26341502df..503ce0dc12 100644
--- a/tests/PHPUnit/Unit/CommonTest.php
+++ b/tests/PHPUnit/Unit/CommonTest.php
@@ -359,8 +359,6 @@ class CommonTest extends PHPUnit_Framework_TestCase
*/
public function testExtractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $expected)
{
- include 'DataFiles/LanguageToCountry.php';
-
$this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, true));
$this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, false));
}
@@ -385,8 +383,6 @@ class CommonTest extends PHPUnit_Framework_TestCase
*/
public function testExtractCountryCodeFromBrowserLanguageInfer($browserLanguage, $validCountries, $expected, $expectedInfer)
{
- include "DataFiles/LanguageToCountry.php";
-
// do not infer country from language
$this->assertEquals($expected, Common::extractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $enableLanguageToCountryGuess = false));
diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
index 6537936bfc..189b026828 100644
--- a/tests/PHPUnit/Unit/UrlHelperTest.php
+++ b/tests/PHPUnit/Unit/UrlHelperTest.php
@@ -193,7 +193,6 @@ class UrlHelperTest extends \PHPUnit_Framework_TestCase
private function includeDataFilesForSearchEngineTest()
{
include "DataFiles/SearchEngines.php";
- include "DataFiles/Countries.php";
}
/**
--
GitLab