summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-07 22:40:15 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-07 22:40:15 +0000
commit407fb291a42f4f21a63b3d4e34eb6583d4a5979e (patch)
tree4f954748f6979498d7ee8b40840d86dcb09655c2 /ppapi/native_client
parent1f7589362dc5a371c8279e154edfa04ad379de3e (diff)
downloadchromium_src-407fb291a42f4f21a63b3d4e34eb6583d4a5979e.zip
chromium_src-407fb291a42f4f21a63b3d4e34eb6583d4a5979e.tar.gz
chromium_src-407fb291a42f4f21a63b3d4e34eb6583d4a5979e.tar.bz2
Reenable NaCl PPB_URLRequestInfo test.
SetProperty accepts plenty of invalid values. The error checking is delayed until url loading time. BUG=94790 TEST=this is Review URL: http://codereview.chromium.org/8478019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rw-r--r--ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons4
-rw-r--r--ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.cc20
2 files changed, 11 insertions, 13 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
index cb4abc9..340b4e7 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
@@ -39,6 +39,4 @@ node = env.PPAPIBrowserTester(
env.AddNodeToTestSuite(node,
['chrome_browser_tests'],
'run_ppapi_ppb_url_request_info_browser_test',
- # TODO(mcgrathr): broken for the moment, see
- #http://code.google.com/p/chromium/issues/detail?id=94790
- is_broken=env.PPAPIBrowserTesterIsBroken() or True)
+ is_broken=env.PPAPIBrowserTesterIsBroken())
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.cc b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.cc
index bd70091..d1c01fb 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_url_request_info/ppapi_ppb_url_request_info.cc
@@ -107,6 +107,9 @@ void TestSetProperty() {
PropertyTestData(ID_STR(_prop_name), PP_MakeString(""), PP_FALSE), \
PropertyTestData(ID_STR(_prop_name), PP_MakeDouble(0.0), PP_FALSE)
+ // SetProperty accepts plenty of invalid values (malformed urls, negative
+ // thresholds, etc). Error checking is delayed until request opening (aka url
+ // loading).
#define ID_STR(arg) arg, #arg
PropertyTestData test_data[] = {
ADD_BOOL_PROPERTY(PP_URLREQUESTPROPERTY_STREAMTOFILE),
@@ -159,11 +162,11 @@ void TestSetProperty() {
PP_MakeUndefined(), PP_FALSE),
PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_HEADERS),
PP_MakeString("Proxy-Authorization: Basic dXNlcjpwYXNzd29yZA=="),
- PP_FALSE),
+ PP_TRUE),
PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_HEADERS),
PP_MakeString("Accept-Encoding: *\n"
"Accept-Charset: iso-8859-5, unicode-1-1;q=0.8"),
- PP_FALSE),
+ PP_TRUE),
PropertyTestData(
ID_STR(PP_URLREQUESTPROPERTY_PREFETCHBUFFERUPPERTHRESHOLD),
PP_MakeInt32(0), PP_TRUE),
@@ -176,23 +179,20 @@ void TestSetProperty() {
PropertyTestData(
ID_STR(PP_URLREQUESTPROPERTY_PREFETCHBUFFERLOWERTHRESHOLD),
PP_MakeInt32(100), PP_TRUE),
- // Bug filed against Chrome to validate SetProperty values better.
- // http://code.google.com/p/chromium/issues/detail?id=89842.
- /*
PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_URL),
- PP_MakeString("::::::::::::"), PP_FALSE),
+ PP_MakeString("::::::::::::"), PP_TRUE),
PropertyTestData(ID_STR(PP_URLREQUESTPROPERTY_METHOD),
- PP_MakeString("INVALID"), PP_FALSE),
+ PP_MakeString("INVALID"), PP_TRUE),
PropertyTestData(
ID_STR(PP_URLREQUESTPROPERTY_CUSTOMCONTENTTRANSFERENCODING),
- PP_MakeString("invalid"), PP_FALSE),
+ PP_MakeString("invalid"), PP_TRUE),
PropertyTestData(
ID_STR(PP_URLREQUESTPROPERTY_PREFETCHBUFFERUPPERTHRESHOLD),
- PP_MakeInt32(-100), PP_FALSE),
+ PP_MakeInt32(-100), PP_TRUE),
PropertyTestData(
ID_STR(PP_URLREQUESTPROPERTY_PREFETCHBUFFERLOWERTHRESHOLD),
PP_MakeInt32(-100), PP_TRUE),
- */
+
};
const PPB_URLRequestInfo* ppb = PPBURLRequestInfo();