moved definitions of search engines to new repo and converted them to better readable yml format

3 files changed, 0 insertions, 67 deletions

diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index 04c52371da..d66cfdac6e 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -243,7 +243,6 @@ class Fixture extends \PHPUnit_Framework_Assert
             static::fail("TEST INITIALIZATION FAILED: " . $e->getMessage() . "\n" . $e->getTraceAsString());
         }
 
-        include "DataFiles/SearchEngines.php";
         include "DataFiles/Socials.php";
         include "DataFiles/Providers.php";
 
diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
index 8aa85ed550..d8817ec3db 100644
--- a/tests/PHPUnit/Unit/CommonTest.php
+++ b/tests/PHPUnit/Unit/CommonTest.php
@@ -465,39 +465,4 @@ class CommonTest extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals($expected, Common::extractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages), "test with {$browserLanguage} failed, expected {$expected}");
     }
-
-    public function testSearchEnginesDefinedCorrectly()
-    {
-        include "DataFiles/SearchEngines.php";
-
-        $searchEngines = array();
-        foreach ($GLOBALS['Piwik_SearchEngines'] as $host => $info) {
-            if (isset($info[2]) && $info[2] !== false) {
-                $this->assertTrue(strrpos($info[2], "{k}") !== false, $host . " search URL is not defined correctly, must contain the macro {k}");
-            }
-
-            if (!array_key_exists($info[0], $searchEngines)) {
-                $searchEngines[$info[0]] = true;
-
-                $this->assertTrue(strpos($host, '{}') === false, $host . " search URL is the master record and should not contain {}");
-            }
-
-            if (isset($info[3]) && $info[3] !== false) {
-                $this->assertTrue(is_array($info[3]) || is_string($info[3]), $host . ' encoding must be either a string or an array');
-
-                if (is_string($info[3])) {
-                    $this->assertTrue(trim($info[3]) !== '', $host . ' encoding cannot be an empty string');
-                    $this->assertTrue(strpos($info[3], ' ') === false, $host . ' encoding cannot contain spaces');
-
-                }
-
-                if (is_array($info[3])) {
-                    $this->assertTrue(count($info[3]) > 0, $host . ' encodings cannot be an empty array');
-                    $this->assertTrue(strpos(serialize($info[3]), '""') === false, $host . ' encodings in array cannot be empty stringss');
-                    $this->assertTrue(strpos(serialize($info[3]), ' ') === false, $host . ' encodings in array cannot contain spaces');
-                }
-            }
-        }
-    }
-
 }
diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
index e972d20d54..cc15d6eeb1 100644
--- a/tests/PHPUnit/Unit/UrlHelperTest.php
+++ b/tests/PHPUnit/Unit/UrlHelperTest.php
@@ -150,32 +150,6 @@ class UrlHelperTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Dataprovider for testExtractSearchEngineInformationFromUrl
-     */
-    public function getSearchEngineUrls()
-    {
-        return Spyc::YAMLLoad(PIWIK_PATH_TEST_TO_ROOT .'/tests/resources/extractSearchEngineInformationFromUrlTests.yml');
-    }
-
-    /**
-     * @dataProvider getSearchEngineUrls
-     * @group Core
-     */
-    public function testExtractSearchEngineInformationFromUrl($url, $engine, $keywords)
-    {
-        $this->includeDataFilesForSearchEngineTest();
-        $returnedValue = UrlHelper::extractSearchEngineInformationFromUrl($url);
-
-        $exptectedValue = false;
-
-        if (!empty($engine)) {
-            $exptectedValue = array('name' => $engine, 'keywords' => $keywords);
-        }
-
-        $this->assertEquals($exptectedValue, $returnedValue);
-    }
-
-    /**
      * Dataprovider for testGetLossyUrl
      */
     public function getLossyUrls()
@@ -203,11 +177,6 @@ class UrlHelperTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expected, UrlHelper::getLossyUrl($input));
     }
 
-    private function includeDataFilesForSearchEngineTest()
-    {
-        include "DataFiles/SearchEngines.php";
-    }
-
     /**
      * @group Core
      */