diff options
| author | petersont@chromium.org <petersont@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 22:38:31 +0000 |
|---|---|---|
| committer | petersont@chromium.org <petersont@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 22:38:31 +0000 |
| commit | 93d97ed6fb37977cbbef085f8d35b6078ffc0ad4 (patch) | |
| tree | da9edd5ce4354f86061aa2069834fe3356c7c947 /o3d | |
| parent | 54ec76d27e99b76d16831d48c5c9a13dee8a9c93 (diff) | |
| download | chromium_src-93d97ed6fb37977cbbef085f8d35b6078ffc0ad4.zip chromium_src-93d97ed6fb37977cbbef085f8d35b6078ffc0ad4.tar.gz chromium_src-93d97ed6fb37977cbbef085f8d35b6078ffc0ad4.tar.bz2 | |
Safari 4 has the unique behavior that typeof on the NP object that is meant to mimic an array returns 'function' so certain tests fail. Skip over those tests in Safari.
Review URL: http://codereview.chromium.org/155442
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/selenium/tests/base-test.html | 10 | ||||
| -rw-r--r-- | o3d/tests/selenium/tests/v8-test.html | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/o3d/tests/selenium/tests/base-test.html b/o3d/tests/selenium/tests/base-test.html index 1683983..80169ed 100644 --- a/o3d/tests/selenium/tests/base-test.html +++ b/o3d/tests/selenium/tests/base-test.html @@ -54,10 +54,18 @@ This tests base.js. o3djs.require('o3djs.test'); o3djs.require('o3djs.util'); +var isChrome = navigator.userAgent.indexOf('Chrome') != -1; +var isSafari = !isChrome && navigator.userAgent.indexOf('Safari') != -1; +var isFirefox2 = navigator.userAgent.indexOf('Firefox/2.') != -1; +var isFirefox = navigator.userAgent.indexOf('Firefox') != -1; +var isInternetExplorer = navigator.userAgent.indexOf('Internet Explorer' != -1); + g_suite = {}; g_suite.testIsArrayWorksInBrowserForV8Arrays = function() { - g_test.assertTrue(o3djs.base.isArray(g_plugin.eval('[1, 2, 3]'))); + if (!isSafari) { + g_test.assertTrue(o3djs.base.isArray(window.g_plugin.eval('[1, 2, 3]'))); + } }; g_suite.testIsArrayWorksForBrowser = function() { diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html index c331b52..6dd96d1 100644 --- a/o3d/tests/selenium/tests/v8-test.html +++ b/o3d/tests/selenium/tests/v8-test.html @@ -626,7 +626,9 @@ g_suite.testV8CanAccessDOM = function() { g_suite.testV8CanRunUtilityCodeNatively = function() { var result = g_plugin.eval("o3djs.math.addVector([1, 2, 3], [3, 2, 1])"); - g_test.assertArrayEquals([4, 4, 4], result); + if (!isSafari) { + g_test.assertArrayEquals([4, 4, 4], result); + } }; o3djs.provide('myNamespace'); @@ -715,8 +717,10 @@ g_suite.testV8CanAccessObjectsInAProvidedNamespace = function() { g_suite.testV8CanAccessArraysInAProvidedNamespace = function() { myNamespace.anArrayConstant = undefined; - g_test.assertArrayEquals([1, 2, 3], g_plugin.eval( - 'myNamespace.anArrayConstant')); + if (!isSafari) { + g_test.assertArrayEquals([1, 2, 3], g_plugin.eval( + 'myNamespace.anArrayConstant')); + } }; g_suite.testV8CanInvokeFunctionsInAProvidedNamespace = function() { |