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

Unified Diff: ppapi/tests/testing_instance.h

Issue 12193015: PPAPI/NaCl: Make related tests run in 1 fixture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 10 months 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 | « ppapi/tests/test_scrollbar.cc ('k') | ppapi/tests/testing_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/testing_instance.h
diff --git a/ppapi/tests/testing_instance.h b/ppapi/tests/testing_instance.h
index 2ce6c4b78cb7f31dd3a7c2cc6b0dd372f3cda399..a52313762f790c11cf738845a3eab95cbb42380c 100644
--- a/ppapi/tests/testing_instance.h
+++ b/ppapi/tests/testing_instance.h
@@ -62,12 +62,17 @@ pp::InstancePrivate {
// 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() {
@@ -75,7 +80,13 @@ pp::InstancePrivate {
// 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);
@@ -116,15 +127,6 @@ pp::InstancePrivate {
// 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);
« no previous file with comments | « ppapi/tests/test_scrollbar.cc ('k') | ppapi/tests/testing_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698