Removed direct inclusion of data files

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(

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
      *

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()) {

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));
 

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";
     }
 
     /**