Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/ui/ppapi_uitest.cc

Issue 8770023: Break FileIO and URLLoader tests down into individual cases. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ppapi/tests/test_url_loader.h » ('j') | ppapi/tests/test_url_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ppapi_uitest.cc
===================================================================
--- chrome/test/ui/ppapi_uitest.cc (revision 112536)
+++ chrome/test/ui/ppapi_uitest.cc (working copy)
@@ -291,10 +291,88 @@
TEST_PPAPI_IN_PROCESS(Buffer)
TEST_PPAPI_OUT_OF_PROCESS(Buffer)
-TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader)
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader)
-TEST_PPAPI_NACL_VIA_HTTP(URLLoader)
+// URLLoader tests.
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicGET)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicPOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicFilePOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BasicFileRangePOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_CompoundBodyPOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_EmptyDataPOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_BinaryDataPOST)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_CustomRequestHeader)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_FailsBogusContentLength)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_StreamToFile)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedSameOriginRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedSameOriginRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedCrossOriginRequest)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedCrossOriginRequest)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedJavascriptURLRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedMethodRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedHeaderRestriction)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedCustomReferrer)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomContentTransferEncoding)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_TrustedCustomContentTransferEncoding)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_AuditURLRedirect)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_AbortCalls)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(URLLoader_UntendedLoad)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_BasicGET)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_BasicPOST)
+// TODO(bbudge) Enable these when PPB_FileIO is proxied.
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_BasicFilePOST)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_BasicFileRangePOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_CompoundBodyPOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_EmptyDataPOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_BinaryDataPOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_CustomRequestHeader)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_FailsBogusContentLength)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_StreamToFile)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedSameOriginRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedSameOriginRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedCrossOriginRequest)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedCrossOriginRequest)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedJavascriptURLRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedMethodRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedHeaderRestriction)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_TrustedCustomReferrer)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
+ URLLoader_UntrustedCustomContentTransferEncoding)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
+ URLLoader_TrustedCustomContentTransferEncoding)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_AuditURLRedirect)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_AbortCalls)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_UntendedLoad)
+
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_BasicGET)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_BasicPOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_BasicFilePOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_BasicFileRangePOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_CompoundBodyPOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_EmptyDataPOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_BinaryDataPOST)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_CustomRequestHeader)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_FailsBogusContentLength)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_StreamToFile)
+// TODO(bbudge) Enable these when we can get the document URL in NaCl.
+// TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedSameOriginRestriction)
+// TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedCrossOriginRequest)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedJavascriptURLRestriction)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedMethodRestriction)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedHeaderRestriction)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedCustomReferrer)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntrustedCustomContentTransferEncoding)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_AuditURLRedirect)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_AbortCalls)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_UntendedLoad)
+
TEST_PPAPI_IN_PROCESS(PaintAggregator)
TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator)
TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator)
@@ -324,7 +402,7 @@
TEST_PPAPI_IN_PROCESS(VarDeprecated)
// Disabled because it times out: http://crbug.com/89961
-//TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated)
+// TEST_PPAPI_OUT_OF_PROCESS(VarDeprecated)
// Windows defines 'PostMessage', so we have to undef it.
#ifdef PostMessage
@@ -353,19 +431,51 @@
TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
// http://crbug.com/90039 and http://crbug.com/83443 (Mac)
-TEST_F(PPAPITest, FAILS_FileIO) {
- RunTestViaHTTP("FileIO");
-}
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_Open)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_AbortCalls)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_ParallelReads)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_ParallelWrites)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_NotAllowMixedReadWrite)
+// Touch and SetLength fail on Mac and Linux due to sandbox restrictions.
+// http://crbug.com/101128
+#if !defined(OS_MAC) && !defined(OS_LINUX)
dmichael (off chromium) 2011/12/02 19:05:26 These should just be marked FAILS_ where they fail
bbudge 2011/12/02 19:36:07 Done. Thanks for the pro-tip.
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_ReadWriteSetLength)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_TouchQuery)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_WillWriteWillSetLength)
+#endif
+
// http://crbug.com/101154
-TEST_F(OutOfProcessPPAPITest, DISABLED_FileIO) {
- RunTestViaHTTP("FileIO");
-}
-TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO)
+// TODO(bbudge) Enable these tests when PPB_FileIO is proxied.
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_Open)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_AbortCalls)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_ParallelReads)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_ParallelWrites)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_NotAllowMixedReadWrite)
dmichael (off chromium) 2011/12/02 19:05:26 Ditto, FAILS_ if possible, DISABLED_ otherwise.
bbudge 2011/12/02 19:36:07 Done.
+// Touch and SetLength fail on Mac and Linux due to sandbox restrictions.
+// http://crbug.com/101128
+#if !defined(OS_MAC) && !defined(OS_LINUX)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_ReadWriteSetLength)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_TouchQuery)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_WillWriteWillSetLength)
+#endif
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_Open)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_AbortCalls)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_ParallelReads)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_ParallelWrites)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_NotAllowMixedReadWrite)
+// Touch and SetLength fail on Mac and Linux due to sandbox restrictions.
+// http://crbug.com/101128
+#if !defined(OS_MAC) && !defined(OS_LINUX)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_TouchQuery)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_ReadWriteSetLength)
+// The following test requires PPB_FileIO_Trusted, not available in NaCl.
+// TEST_PPAPI_NACL_VIA_HTTP(FileIO_WillWriteWillSetLength)
+#endif
TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileRef)
// Disabled because it times out: http://crbug.com/89961
-//TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
+// TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileRef)
TEST_PPAPI_NACL_VIA_HTTP(FileRef)
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | ppapi/tests/test_url_loader.h » ('j') | ppapi/tests/test_url_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698