diff --git a/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php index 2a82991fcdbfcb537e40e4c3dc0f6845450d25b6..cd0ed02093055cb02263edc8ef34d223bd20e611 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 41b754f55b9d904f0d793cf9d183cc16ea293f6c..6f8baa28a9e66fa1550cce4dbb93acaccd448c5e 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 751c4ce1abda7eb3f00edb114d4051d5ec7b6721..342e47527f3370739f34f7d307de7e24cca6b005 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 26341502df1789d03486311872a3bb7ee500f365..503ce0dc12ce48a675eea1459edf54ba15ed0e4a 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 6537936bfcc1d83ee8b469fc780917999cdcef23..189b026828bdd0f57f2cdc6747e843c490979a16 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"; } /**