diff options
author | scroggo <scroggo@google.com> | 2014-11-07 06:07:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-07 06:07:32 -0800 |
commit | 0ee2627026370bbb25e4efda490e14e468ac86fb (patch) | |
tree | 0e12fd4c409e5eb6df38024f57c61e0cfb562b0e /tests | |
parent | f0de423f0930c7ab2b4d722fd23ce68533363443 (diff) |
When running DM, write test failures to json.
Add skiatest::Failure to keep track of data about a test failure.
Reporter::reportFailed and ::onReportFailed now take Failure as a
parameter. This allows the implementation to treat the failure as it
wishes. Provide a helper to format the failure the same as prior to
the change.
Update the macros for calling reportFailed (REPORTER_ASSERT etc) to
create a Failure object.
Convert a direct call to reportFailed to the macro ERRORF.
Write Failures to Json.
Sample output when running dm on the dummy test crrev.com/705723004:
{
"test_results" : {
"failures" : [
{
"condition" : "0 > 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 10,
"message" : ""
},
{
"condition" : "false",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 4,
"message" : ""
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 5,
"message" : "I can too count!"
},
{
"condition" : "",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 6,
"message" : "seven is 7"
},
{
"condition" : "1 == 3",
"file_name" : "../../tests/DummyTest.cpp",
"line_no" : 14,
"message" : "I can too count!"
}
]
}
}
Report all of the failures from one test.
Previously, if one test had multiple failures, only one was reportered.
e.g:
Failures:
test Dummy: ../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
Now, we get all the messages:
Failures:
test Dummy: ../../tests/DummyTest.cpp:4 false
../../tests/DummyTest.cpp:5 I can too count!: 1 == 3
../../tests/DummyTest.cpp:6 seven is 7
test Dummy2: ../../tests/DummyTest.cpp:10 0 > 3
test Dummy3: ../../tests/DummyTest.cpp:14 I can too count!: 1 == 3
3 failures.
(Note that we still state "3 failures" because 3 DM::Tasks failed.)
BUG=skia:3082
BUG=skia:2454
Review URL: https://codereview.chromium.org/694703005
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GrTRecorderTest.cpp | 2 | ||||
-rw-r--r-- | tests/Test.cpp | 12 | ||||
-rw-r--r-- | tests/Test.h | 80 | ||||
-rw-r--r-- | tests/skia_test.cpp | 4 |
4 files changed, 67 insertions, 31 deletions
diff --git a/tests/GrTRecorderTest.cpp b/tests/GrTRecorderTest.cpp index a5aedf687c..83bc445b5f 100644 --- a/tests/GrTRecorderTest.cpp +++ b/tests/GrTRecorderTest.cpp @@ -214,7 +214,7 @@ static void test_subclasses(skiatest::Reporter* reporter) { break; default: - reporter->reportFailed(SkString("Invalid class type")); + ERRORF(reporter, "Invalid class type"); break; } } diff --git a/tests/Test.cpp b/tests/Test.cpp index c458f897fb..acbc332936 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -31,8 +31,8 @@ void Reporter::startTest(Test* test) { this->onStart(test); } -void Reporter::reportFailed(const SkString& desc) { - this->onReportFailed(desc); +void Reporter::reportFailed(const skiatest::Failure& failure) { + this->onReportFailed(failure); } void Reporter::endTest(Test* test) { @@ -63,11 +63,11 @@ public: explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {} int numFailures() const { return fFailures.count(); } - const SkString& failure(int i) const { return fFailures[i]; } + const skiatest::Failure& failure(int i) const { return fFailures[i]; } protected: - virtual void onReportFailed(const SkString& desc) SK_OVERRIDE { - fFailures.push_back(desc); + virtual void onReportFailed(const Failure& failure) SK_OVERRIDE { + fFailures.push_back(failure); } // Proxy down to fReporter. We assume these calls are threadsafe. @@ -85,7 +85,7 @@ protected: private: Reporter* fReporter; // Unowned. - SkTArray<SkString> fFailures; + SkTArray<skiatest::Failure> fFailures; }; void Test::run() { diff --git a/tests/Test.h b/tests/Test.h index 6c85b32bce..90cd25998f 100644 --- a/tests/Test.h +++ b/tests/Test.h @@ -20,6 +20,40 @@ namespace skiatest { class Test; + /** + * Information about a single failure from a Test. + * + * Not intended to be created/modified directly. To create one, use one of + * + * REPORTER_ASSERT + * REPORTER_ASSERT_MESSAGE + * ERRORF + * + * described in more detail further down in this file. + */ + struct Failure { + const char* fileName; + int lineNo; + const char* condition; + SkString message; + + // Helper to combine the failure info into one string. + void getFailureString(SkString* result) const { + if (!result) { + return; + } + result->printf("%s:%d\t", fileName, lineNo); + if (!message.isEmpty()) { + result->append(message); + if (strlen(condition) > 0) { + result->append(": "); + } + } + result->append(condition); + } + }; + + class Reporter : public SkRefCnt { public: SK_DECLARE_INST_COUNT(Reporter) @@ -28,7 +62,7 @@ namespace skiatest { int countTests() const { return fTestCount; } void startTest(Test*); - void reportFailed(const SkString& desc); + void reportFailed(const Failure&); void endTest(Test*); virtual bool allowExtendedTest() const { return false; } @@ -37,7 +71,7 @@ namespace skiatest { protected: virtual void onStart(Test*) {} - virtual void onReportFailed(const SkString& desc) {} + virtual void onReportFailed(const Failure&) {} virtual void onEnd(Test*) {} private: @@ -110,31 +144,31 @@ namespace skiatest { } */ -#define REPORTER_ASSERT(r, cond) \ - do { \ - if (!(cond)) { \ - SkString desc; \ - desc.printf("%s:%d\t%s", __FILE__, __LINE__, #cond); \ - r->reportFailed(desc); \ - } \ +#define REPORTER_ASSERT(r, cond) \ + do { \ + if (!(cond)) { \ + skiatest::Failure failure = { __FILE__, __LINE__, \ + #cond, SkString() }; \ + r->reportFailed(failure); \ + } \ } while(0) -#define REPORTER_ASSERT_MESSAGE(r, cond, message) \ - do { \ - if (!(cond)) { \ - SkString desc; \ - desc.printf("%s:%d\t%s: %s", __FILE__, __LINE__, \ - message, #cond); \ - r->reportFailed(desc); \ - } \ +#define REPORTER_ASSERT_MESSAGE(r, cond, message) \ + do { \ + if (!(cond)) { \ + skiatest::Failure failure = { __FILE__, __LINE__, \ + #cond, SkString(message) }; \ + r->reportFailed(failure); \ + } \ } while(0) -#define ERRORF(reporter, ...) \ - do { \ - SkString desc; \ - desc.printf("%s:%d\t", __FILE__, __LINE__); \ - desc.appendf(__VA_ARGS__) ; \ - (reporter)->reportFailed(desc); \ +#define ERRORF(r, ...) \ + do { \ + SkString desc; \ + desc.appendf(__VA_ARGS__) ; \ + skiatest::Failure failure = { __FILE__, __LINE__, \ + "", SkString(desc) }; \ + r->reportFailed(failure); \ } while(0) #define DEF_TEST(name, reporter) \ diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp index 172328ee4a..3d76c3a095 100644 --- a/tests/skia_test.cpp +++ b/tests/skia_test.cpp @@ -58,7 +58,9 @@ public: virtual bool verbose() const SK_OVERRIDE { return FLAGS_veryVerbose; } protected: - virtual void onReportFailed(const SkString& desc) SK_OVERRIDE { + virtual void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE { + SkString desc; + failure.getFailureString(&desc); SkDebugf("\nFAILED: %s", desc.c_str()); } |