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)
@@ -117,6 +117,19 @@
     RunTest(test_case);
   }
 
+  std::string StripPrefixes(const std::string& test_name) {
+    if (test_name.find("FAILS_") == 0)

[dmichael (off chromium), 2011/12/06 18:08:18]

optional suggestion: I waffled about mentioning this when I thought there were 3
prefixes you needed. If you really need 4, it might make sense to make this a
loop:
const char* const prefixes = { "FLAKY_", "DISABLED_", ...};
for (size_t i = 0; i < sizeof(prefixes)/sizeof(prefixes[0]); ++i)
  if (test_name.find(prefixes[i]) == 0)
    return test_name.substr(strlen(prefixes[i]));
return test_name;

I like that this way you don't hard-code the size of each prefix.

[bbudge, 2011/12/06 22:48:15]

Hey, thanks! I futzed around with ways to get rid of the magic numbers. This is
good.
On 2011/12/06 18:08:18, dmichael wrote:

+      return test_name.substr(6);
+    else if (test_name.find("FLAKY_") == 0)
+      return test_name.substr(6);
+    else if (test_name.find("DISABLED_") == 0)
+      return test_name.substr(9);
+    else if (test_name.find("MAYBE_") == 0)

[dmichael (off chromium), 2011/12/06 17:34:55]

I don't think you need MAYBE_, it should be defined away before we reach this
point.

[bbudge, 2011/12/06 17:55:38]

That's what I thought initially. However without it I get "test not found"
failures and the code definitely gets hit in the debugger. It's probably a
subtlety in C macro expansion.
On 2011/12/06 17:34:55, dmichael wrote:

[bbudge, 2011/12/06 22:48:15]

Done.

+      return test_name.substr(6);
+    else
+     return test_name;
+  }
+
  private:
   void RunTestURL(const GURL& test_url) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -214,31 +227,31 @@
 // Most interfaces should be tested with both macros.
 #define TEST_PPAPI_IN_PROCESS(test_name) \
     TEST_F(PPAPITest, test_name) { \
-      RunTest(#test_name); \
+      RunTest(StripPrefixes(#test_name)); \

[dmichael (off chromium), 2011/12/06 18:08:18]

I bet the MAYBE_ problem is happening because of the same issue described here:
http://stackoverflow.com/questions/1597007/creating-c-macro-with-and-line-tok...
You probably need yet another macro, like:
#define STRING_NAME(test_name) #test_name
and change these to:
RunTest(StripPrefixes(STRING_NAME(test_name))); \

Hope that helps...

[bbudge, 2011/12/06 22:48:15]

Done.

     }
 #define TEST_PPAPI_OUT_OF_PROCESS(test_name) \
     TEST_F(OutOfProcessPPAPITest, test_name) { \
-      RunTest(#test_name); \
+      RunTest(StripPrefixes(#test_name)); \
     }
 
 // Similar macros that test over HTTP.
 #define TEST_PPAPI_IN_PROCESS_VIA_HTTP(test_name) \
     TEST_F(PPAPITest, test_name) { \
-      RunTestViaHTTP(#test_name); \
+      RunTestViaHTTP(StripPrefixes(#test_name)); \
     }
 #define TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(test_name) \
     TEST_F(OutOfProcessPPAPITest, test_name) { \
-      RunTestViaHTTP(#test_name); \
+      RunTestViaHTTP(StripPrefixes(#test_name)); \
     }
 
 // Similar macros that test with WebSocket server
 #define TEST_PPAPI_IN_PROCESS_WITH_WS(test_name) \
     TEST_F(PPAPITest, test_name) { \
-      RunTestWithWebSocketServer(#test_name); \
+      RunTestWithWebSocketServer(StripPrefixes(#test_name)); \
     }
 #define TEST_PPAPI_OUT_OF_PROCESS_WITH_WS(test_name) \
     TEST_F(OutOfProcessPPAPITest, test_name) { \
-      RunTestWithWebSocketServer(#test_name); \
+      RunTestWithWebSocketServer(StripPrefixes(#test_name)); \
     }
 
 
@@ -249,7 +262,7 @@
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
     TEST_F(PPAPINaClTest, test_name) { \
-  RunTestViaHTTP(#test_name); \
+  RunTestViaHTTP(StripPrefixes(#test_name)); \
 }
 #endif
 
@@ -291,10 +304,93 @@
 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)
+// TODO(bbudge) Fix Javascript URLs for trusted loaders.
+// http://crbug.com/103062
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(FAILS_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(DISABLED_URLLoader_BasicFilePOST)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_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)
+// TODO(bbudge) Fix Javascript URLs for trusted loaders.
+// http://crbug.com/103062
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(
+    FAILS_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(DISABLED_URLLoader_UntrustedSameOriginRestriction)
+TEST_PPAPI_NACL_VIA_HTTP(DISABLED_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 +420,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 +448,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 MAYBE_FileIO_ReadWriteSetLength DISABLED_FileIO_ReadWriteSetLength
+#define MAYBE_FileIO_TouchQuery DISABLED_FileIO_TouchQuery
+#define MAYBE_FileIO_WillWriteWillSetLength \
+    DISABLED_FileIO_WillWriteWillSetLength
+#else
+#define MAYBE_FileIO_ReadWriteSetLength FileIO_ReadWriteSetLength

[dmichael (off chromium), 2011/12/06 17:34:55]

Check your Windows try...  this one looks like it's failing on Windows too :-(

[bbudge, 2011/12/06 17:55:38]

Yep. It's the PPAPINaClTest, so I want to investigate why this new test is
failing. It could be a proxy bug.
On 2011/12/06 17:34:55, dmichael wrote:

+#define MAYBE_FileIO_TouchQuery FileIO_TouchQuery
+#define MAYBE_FileIO_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(MAYBE_FileIO_ReadWriteSetLength)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_FileIO_TouchQuery)
+TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_FileIO_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(DISABLED_FileIO_Open)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_AbortCalls)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_ParallelReads)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_ParallelWrites)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_NotAllowMixedReadWrite)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_ReadWriteSetLength)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_TouchQuery)
+TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(DISABLED_FileIO_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(MAYBE_FileIO_TouchQuery)
+TEST_PPAPI_NACL_VIA_HTTP(MAYBE_FileIO_ReadWriteSetLength)
+// The following test requires PPB_FileIO_Trusted, not available in NaCl.
+TEST_PPAPI_NACL_VIA_HTTP(DISABLED_FileIO_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)