Break FileIO and URLLoader tests down into individual cases.

chrome/test/ui/ppapi_uitest.cc

Index: chrome/test/ui/ppapi_uitest.cc
===================================================================
--- chrome/test/ui/ppapi_uitest.cc	(revision 112536)
+++ chrome/test/ui/ppapi_uitest.cc	(working copy)
@@ -291,19 +291,94 @@
 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_DISABLED_BasicFilePOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(URLLoader_DISABLED_BasicFileRangePOST)

[dmichael (off chromium), 2011/12/02 20:28:33]

The DISABLED/FAILS/MAYBE needs to go at the front of the whole test name, e.g.:
DISABLED_URLLoader_BasicFilePOST

[bbudge, 2011/12/02 21:32:10]

That doesn't seem to work. The framework complains it can't find the test. I
think it's because the class name is appended at the front, so it's not like the
TEST_F ones.

[dmichael (off chromium), 2011/12/02 22:31:42]

Right...  other places where tests are disabled use the TEST_F style. The way
you have will fail later (or more likely will appear to succeed without actually
running the test, because of how the PPAPI tests work now). For FAILS and FLAKY,
the test should still be run.

I think you need to have DISABLED/FLAKY/FAILS at the beginning or gtest won't
pick it up.

A few ways to fix it:
1) Explicitly use TEST_F
2) Add new macros like FAILS_TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP, which appends
FAILS_ at the right place.
3) Make the macros strip off DISABLED_, FLAKY_, or FAILS_ before passing the
test case name to RunTest.

I think my favorite is 3).

[bbudge, 2011/12/06 00:36:04]

Done.

+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_DISABLED_UntrustedSameOriginRestriction)
+TEST_PPAPI_NACL_VIA_HTTP(URLLoader_DISABLED_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)
 
 TEST_PPAPI_IN_PROCESS(Scrollbar)
-// http://crbug.com/89961
-TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) {
-  RunTest("Scrollbar");
-}
+TEST_PPAPI_OUT_OF_PROCESS(Scrollbar)
 TEST_PPAPI_NACL_VIA_HTTP(Scrollbar)
 
 TEST_PPAPI_IN_PROCESS(URLUtil)
@@ -324,7 +399,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
@@ -352,20 +427,52 @@
 TEST_PPAPI_IN_PROCESS(VideoDecoder)
 TEST_PPAPI_OUT_OF_PROCESS(VideoDecoder)
 
-// http://crbug.com/90039 and http://crbug.com/83443 (Mac)
-TEST_F(PPAPITest, FAILS_FileIO) {
-  RunTestViaHTTP("FileIO");
-}
+// Touch and SetLength fail on Mac and Linux due to sandbox restrictions.
+// http://crbug.com/101128
+#if defined(OS_MACOSX) || defined(OS_LINUX)
+#define FileIO_MAYBE_ReadWriteSetLength FileIO_DISABLED_ReadWriteSetLength
+#define FileIO_MAYBE_TouchQuery FileIO_DISABLED_TouchQuery
+#define FileIO_MAYBE_WillWriteWillSetLength \
+    FileIO_DISABLED_WillWriteWillSetLength
+#else
+#define FileIO_MAYBE_ReadWriteSetLength FileIO_ReadWriteSetLength
+#define FileIO_MAYBE_TouchQuery FileIO_TouchQuery
+#define FileIO_MAYBE_WillWriteWillSetLength FileIO_WillWriteWillSetLength
+#endif
+
+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)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_MAYBE_ReadWriteSetLength)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_MAYBE_TouchQuery)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileIO_MAYBE_WillWriteWillSetLength)
+
 // 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_DISABLED_Open)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_AbortCalls)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_ParallelReads)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_ParallelWrites)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_NotAllowMixedReadWrite)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_ReadWriteSetLength)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_TouchQuery)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileIO_DISABLED_WillWriteWillSetLength)
 
+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)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_MAYBE_TouchQuery)
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_MAYBE_ReadWriteSetLength)
+// The following test requires PPB_FileIO_Trusted, not available in NaCl.
+TEST_PPAPI_NACL_VIA_HTTP(FileIO_DISABLED_WillWriteWillSetLength)
 
 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)