PPAPI/NaCl: Make related tests run in 1 fixture

ppapi/tests/testing_instance.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_TESTS_TESTING_INSTANCE_H_
 #define PPAPI_TESTS_TESTING_INSTANCE_H_
 
 #include <string>
 
 #include "ppapi/utility/completion_callback_factory.h"
@@ skipping 44 matching lines @@
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
   virtual void DidChangeView(const pp::View& view);
   virtual bool HandleInputEvent(const pp::InputEvent& event);
 
 #if !(defined __native_client__)
   virtual pp::Var GetInstanceObject();
 #endif
 
   // Outputs the information from one test run, using the format
   //   <test_name> [PASS|FAIL <error_message>]
+  //
+  // You should generally use one of the RUN_TEST* macros in test_case.h
+  // instead.
+  //
   // If error_message is empty, we say the test passed and emit PASS. If
   // error_message is nonempty, the test failed with that message as the error
   // string.
   //
   // Intended usage:
-  //   LogTest("Foo", FooTest());
+  //   PP_TimeTicks start_time(core.GetTimeTicks());
+  //   LogTest("Foo", FooTest(), start_time);
   //
   // Where FooTest is defined as:
   //   std::string FooTest() {
   //     if (something_horrible_happened)
   //       return "Something horrible happened";
   //     return "";
   //   }
-  void LogTest(const std::string& test_name, const std::string& error_message);
+  //
+  // NOTE: It's important to get the start time in the previous line, rather
+  //       than calling GetTimeTicks in the LogTestLine. There's no guarantee
+  //       that GetTimeTicks will be evaluated before FooTest().
+  void LogTest(const std::string& test_name,
+               const std::string& error_message,
+               PP_TimeTicks start_time);
 
   // Appends an error message to the log.
   void AppendError(const std::string& message);
 
   // Passes the message_data through to the HandleMessage method on the
   // TestClass object that's associated with this instance.
   virtual void HandleMessage(const pp::Var& message_data);
 
   const std::string& protocol() {
     return protocol_;
@@ skipping 20 matching lines @@
   // See doc for |remove_plugin_|.
   void set_remove_plugin(bool remove) { remove_plugin_ = remove; }
 
  private:
   void ExecuteTests(int32_t unused);
 
   // Creates a new TestCase for the give test name, or NULL if there is no such
   // test. Ownership is passed to the caller. The given string is split by '_'.
   // The test case name is the first part.
   TestCase* CaseForTestName(const std::string& name);
-  // Returns the filter (second part) of the given string. If there is no '_',
-  // returns the empty string, which means 'run all tests for this test case'.
-  // E.g.:
-  //  http://testserver/test_case.html?testcase=PostMessage
-  // Otherwise, the part of the testcase after '_' is returned, and the test
-  // whose name matches that string (if any) will be run:
-  //  http://testserver/test_case.html?testcase=PostMessage_SendingData
-  // Runs 'PostMessage_SendingData.
-  std::string FilterForTestName(const std::string& name);
 
   // Sends a test command to the page using PostMessage.
   void SendTestCommand(const std::string& command);
   void SendTestCommand(const std::string& command, const std::string& params);
 
   // Appends a list of available tests to the console in the document.
   void LogAvailableTests();
 
   // Appends the given error test to the console in the document.
   void LogError(const std::string& text);
@@ skipping 35 matching lines @@
   // WebSocket port.
   int websocket_port_;
 
   // At the end of each set of tests, the plugin is removed from the web-page.
   // However, for some tests, it is desirable to not remove the plguin from the
   // page.
   bool remove_plugin_;
 };
 
 #endif  // PPAPI_TESTS_TESTING_INSTANCE_H_