Chromium Code Reviews| Index: tests/TestClassDef.h |
| diff --git a/tests/TestClassDef.h b/tests/TestClassDef.h |
| index f874acc007f32638c58211245289d5314e1529d9..d8cc30eba0ffe61f0afa9e08ee05c39e802e52f7 100644 |
| --- a/tests/TestClassDef.h |
| +++ b/tests/TestClassDef.h |
| @@ -11,9 +11,9 @@ |
| e.g. |
| #include "TestClassDef.h" |
| - DEF_TEST(some_test_name, r) { |
| + DEF_TEST(TestName, reporter) { |
| ... |
| - REPORTER_ASSERT(r, x == 15); |
| + REPORTER_ASSERT(reporter, x == 15); |
| } |
| */ |
| @@ -31,16 +31,18 @@ |
| } \ |
| static void name(skiatest::Reporter* reporter) |
| -#define DEFINE_GPUTESTCLASS(uiname, classname, function) \ |
| - namespace skiatest { \ |
| - class classname : public GpuTest { \ |
| - public: \ |
| - static Test* Factory(void*) { return SkNEW(classname); } \ |
| - protected: \ |
| - virtual void onGetName(SkString* name) SK_OVERRIDE { name->set(uiname); } \ |
| - virtual void onRun(Reporter* reporter) SK_OVERRIDE { \ |
| - function(reporter, GetGrContextFactory()); \ |
| - } \ |
| - }; \ |
| - static TestRegistry gReg_##classname(classname::Factory); \ |
| - } |
| +#define DEF_GPUTEST(name, reporter, fatory) \ |
|
mtklein
2014/01/10 01:44:09
fatory -> factory?
tfarina
2014/01/10 01:55:27
poor tfarina, always forget to pay attention! :(
|
| + static void name(skiatest::Reporter* reporter, GrContextFactory* factory); \ |
| + namespace skiatest { \ |
| + class name##Class : public GpuTest { \ |
| + public: \ |
| + static Test* Factory(void*) { return SkNEW(name##Class); } \ |
| + protected: \ |
| + virtual void onGetName(SkString* name) SK_OVERRIDE { name->set(#name); } \ |
| + virtual void onRun(Reporter* reporter) SK_OVERRIDE { \ |
| + name(reporter, GetGrContextFactory()); \ |
| + } \ |
| + }; \ |
| + static TestRegistry gReg_##name##Class(name##Class::Factory); \ |
| + } \ |
| + static void name(skiatest::Reporter* reporter, GrContextFactory* factory) |