|
|
@@ -588,10 +588,13 @@ class Zend_LocaleTest extends PHPUnit_Framework_TestCase
|
|
|
* expected true
|
|
|
*/
|
|
|
public function testgetBrowser()
|
|
|
- {
|
|
|
+ {
|
|
|
Zend_LocaleTestHelper::resetObject();
|
|
|
$value = new Zend_LocaleTestHelper();
|
|
|
$list = $value->getBrowser();
|
|
|
+ if (empty($list)) {
|
|
|
+ $this->markTestSkipped('Browser autodetection not possible in current environment');
|
|
|
+ }
|
|
|
$this->assertTrue(isset($list['de']));
|
|
|
$this->assertEquals(array('de' => 1, 'en_UK' => 0.5, 'en_US' => 0.5,
|
|
|
'en' => 0.5, 'fr_FR' => 0.2, 'fr' => 0.2), $list);
|
|
|
@@ -609,13 +612,13 @@ class Zend_LocaleTest extends PHPUnit_Framework_TestCase
|
|
|
* expected true
|
|
|
*/
|
|
|
public function testgetHttpCharset()
|
|
|
- {
|
|
|
+ {
|
|
|
Zend_LocaleTestHelper::resetObject();
|
|
|
putenv("HTTP_ACCEPT_CHARSET=");
|
|
|
$value = new Zend_LocaleTestHelper();
|
|
|
$list = $value->getHttpCharset();
|
|
|
$this->assertTrue(empty($list));
|
|
|
-
|
|
|
+
|
|
|
Zend_LocaleTestHelper::resetObject();
|
|
|
putenv("HTTP_ACCEPT_CHARSET=,iso-8859-1, utf-8, utf-16, *;q=0.1");
|
|
|
$value = new Zend_LocaleTestHelper();
|
|
|
@@ -823,10 +826,6 @@ class Zend_LocaleTest extends PHPUnit_Framework_TestCase
|
|
|
|
|
|
class Zend_LocaleTestHelper extends Zend_Locale
|
|
|
{
|
|
|
- public static $_auto;
|
|
|
- public static $_environment;
|
|
|
- public static $_browser;
|
|
|
-
|
|
|
public static function resetObject()
|
|
|
{
|
|
|
self::$_auto = null;
|