Move macros from TestClassDef.h to Test.h

tests/Test.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef skiatest_Test_DEFINED
 #define skiatest_Test_DEFINED
 
@@ skipping 69 matching lines @@
     class GpuTest : public Test{
     public:
         GpuTest() : Test() {}
         static GrContextFactory* GetGrContextFactory();
         static void DestroyContexts();
         virtual bool isThreadsafe() const { return false; }
     private:
     };
 
     typedef SkTRegistry<Test*(*)(void*)> TestRegistry;
-}
+}  // namespace skiatest
+
+/*
+    Use the following macros to make use of the skiatest classes, e.g.
+
+    #include "Test.h"
+
+    DEF_TEST(TestName, reporter) {
+        ...
+        REPORTER_ASSERT(reporter, x == 15);
+        ...
+        REPORTER_ASSERT_MESSAGE(reporter, x == 15, "x should be 15");
+        ...
+        if (x != 15) {
+            ERRORF(reporter, "x should be 15, but is %d", x);
+            return;
+        }
+        ...
+    }
+*/
 
 #define REPORTER_ASSERT(r, cond)                                 \
     do {                                                         \
         if (!(cond)) {                                           \
             SkString desc;                                       \
             desc.printf("%s:%d\t%s", __FILE__, __LINE__, #cond); \
             r->reportFailed(desc);                               \
         }                                                        \
     } 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);                           \
         }                                                    \
     } while(0)
 
 #define ERRORF(reporter, ...)                       \
     do {                                            \
         SkString desc;                              \
         desc.printf("%s:%d\t", __FILE__, __LINE__); \
         desc.appendf(__VA_ARGS__) ;                 \
         (reporter)->reportFailed(desc);             \
     } while(0)
 
+#define DEF_TEST(name, reporter)                                   \
+    static void name(skiatest::Reporter*);                         \
+    namespace skiatest {                                           \
+    class name##Class : public Test {                              \
+    public:                                                        \
+        static Test* Factory(void*) { return SkNEW(name##Class); } \
+    protected:                                                     \
+        virtual void onGetName(SkString* name) SK_OVERRIDE {       \
+            name->set(#name);                                      \
+        }                                                          \
+        virtual void onRun(Reporter* r) SK_OVERRIDE { name(r); }   \
+    };                                                             \
+    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
+    }                                                              \
+    static void name(skiatest::Reporter* reporter)
+
+#define DEF_GPUTEST(name, reporter, factory)                       \
+    static void name(skiatest::Reporter*, GrContextFactory*);      \
+    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* r) SK_OVERRIDE {              \
+            name(r, GetGrContextFactory());                        \
+        }                                                          \
+    };                                                             \
+    static TestRegistry gReg_##name##Class(name##Class::Factory);  \
+    }                                                              \
+    static void name(skiatest::Reporter* reporter, GrContextFactory* factory)
+
 #endif