Move macros from TestClassDef.h to Test.h
Motivation: those macros don't make any sense without the definitions
in Test.h.
BUG=
R=mtklein@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/138563004
git-svn-id: http://skia.googlecode.com/svn/trunk@13074 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index 6c68191..cc5c17b 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -394,7 +394,6 @@
}
}
-#include "TestClassDef.h"
DEF_TEST(AAClip, reporter) {
test_empty(reporter);
test_path_bounds(reporter);
diff --git a/tests/ARGBImageEncoderTest.cpp b/tests/ARGBImageEncoderTest.cpp
index 8157cc7..7101165 100644
--- a/tests/ARGBImageEncoderTest.cpp
+++ b/tests/ARGBImageEncoderTest.cpp
@@ -11,7 +11,6 @@
#include "SkCanvas.h"
#include "SkStream.h"
#include "Test.h"
-#include "TestClassDef.h"
static SkBitmap::Config configs[] = {
SkBitmap::kRGB_565_Config,
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
index 0f6c1e9..0c0f9db 100644
--- a/tests/AndroidPaintTest.cpp
+++ b/tests/AndroidPaintTest.cpp
@@ -6,7 +6,6 @@
#include "SkOrderedWriteBuffer.h"
#include "SkPaint.h"
#include "Test.h"
-#include "TestClassDef.h"
static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
SkOrderedWriteBuffer writer;
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index db33afa..6d3720d 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -6,7 +6,6 @@
* found in the LICENSE file.
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkAnnotation.h"
#include "SkData.h"
#include "SkCanvas.h"
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index b7b13b3..9d5f0e6 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkThread.h"
#include "SkThreadUtils.h"
#include "SkTypes.h"
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index bdfe997..f1ebb36 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitSet.h"
DEF_TEST(BitSet, reporter) {
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index d831e5e..7f78392 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -6,7 +6,6 @@
* found in the LICENSE file.
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkRect.h"
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 7fc584f..79dddbb 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkRect.h"
#include "SkRandom.h"
diff --git a/tests/BitmapHasherTest.cpp b/tests/BitmapHasherTest.cpp
index fe7abde..2c1f4a3 100644
--- a/tests/BitmapHasherTest.cpp
+++ b/tests/BitmapHasherTest.cpp
@@ -10,7 +10,6 @@
#include "SkBitmap.h"
#include "SkColor.h"
#include "Test.h"
-#include "TestClassDef.h"
// Word size that is large enough to hold results of any checksum type.
typedef uint64_t checksum_result;
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index bcfec22..8059105 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -14,7 +14,6 @@
#include "SkRefCnt.h"
#include "SkShader.h"
#include "Test.h"
-#include "TestClassDef.h"
struct SkShaderTraits {
static void flatten(SkOrderedWriteBuffer& buffer, const SkShader& shader) {
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index ef637f4..e304076 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -8,7 +8,6 @@
#include "SkBitmap.h"
#include "Test.h"
-#include "TestClassDef.h"
static void test_bigwidth(skiatest::Reporter* reporter) {
SkBitmap bm;
diff --git a/tests/BlitRowTest.cpp b/tests/BlitRowTest.cpp
index 1b0fad0..3f3f529 100644
--- a/tests/BlitRowTest.cpp
+++ b/tests/BlitRowTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index cfcc103..386581c 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -11,7 +11,6 @@
#include "SkMath.h"
#include "SkPaint.h"
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index 434724d..8a329d8 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -17,7 +17,6 @@
#include "SkUtils.h"
#include "Test.h"
-#include "TestClassDef.h"
/**
* Fill this bitmap with some color.
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 8543009..4d39d9e 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkCanvasStateUtils.h"
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 744eafc..4ff842b 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -63,7 +63,6 @@
#include "SkStream.h"
#include "SkTDArray.h"
#include "Test.h"
-#include "TestClassDef.h"
class Canvas2CanvasClipVisitor : public SkCanvas::ClipVisitor {
public:
diff --git a/tests/ChecksumTest.cpp b/tests/ChecksumTest.cpp
index 478f843..6248678 100644
--- a/tests/ChecksumTest.cpp
+++ b/tests/ChecksumTest.cpp
@@ -8,7 +8,6 @@
#include "SkChecksum.h"
#include "SkRandom.h"
#include "Test.h"
-#include "TestClassDef.h"
// Murmur3 has an optional third seed argument, so we wrap it to fit a uniform type.
diff --git a/tests/ClampRangeTest.cpp b/tests/ClampRangeTest.cpp
index a9a59ac..16ca525 100644
--- a/tests/ClampRangeTest.cpp
+++ b/tests/ClampRangeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "gradients/SkClampRange.h"
#include "SkRandom.h"
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 84564c4..15a1332 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
// This is a GR test
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 829b7b6..05ced3d 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkCubicClipper.h"
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index 05f9fca..1150431 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "GrReducedClip.h"
#endif
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 6f2e0af..6f72068 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkEdgeClipper.h"
#include "SkLineClipper.h"
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 7ad19b7..4d2f815 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColor.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
diff --git a/tests/ColorPrivTest.cpp b/tests/ColorPrivTest.cpp
index 19a63c7..02885d0 100644
--- a/tests/ColorPrivTest.cpp
+++ b/tests/ColorPrivTest.cpp
@@ -1,5 +1,4 @@
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColorPriv.h"
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 6b1d7d7..64f2785 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColor.h"
#include "SkColorPriv.h"
#include "SkMathPriv.h"
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index 6a51392..e4c0a6b 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkData.h"
#include "SkDataTable.h"
#include "SkOrderedReadBuffer.h"
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 132736e..df7c658 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkBitmapProcShader.h"
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index d3e1c17..8a836d3 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkDeque.h"
static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
diff --git a/tests/DeviceLooperTest.cpp b/tests/DeviceLooperTest.cpp
index 2dc9410..bd1aa09 100644
--- a/tests/DeviceLooperTest.cpp
+++ b/tests/DeviceLooperTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkDeviceLooper.h"
#include "SkRasterClip.h"
diff --git a/tests/DiscardableMemoryPool.cpp b/tests/DiscardableMemoryPool.cpp
index d2c5eee..dc927bd 100644
--- a/tests/DiscardableMemoryPool.cpp
+++ b/tests/DiscardableMemoryPool.cpp
@@ -7,7 +7,6 @@
#include "SkDiscardableMemoryPool.h"
#include "Test.h"
-#include "TestClassDef.h"
DEF_TEST(DiscardableMemoryPool, reporter) {
SkAutoTUnref<SkDiscardableMemoryPool> pool(
diff --git a/tests/DiscardableMemoryTest.cpp b/tests/DiscardableMemoryTest.cpp
index 637dede..da36ffd 100644
--- a/tests/DiscardableMemoryTest.cpp
+++ b/tests/DiscardableMemoryTest.cpp
@@ -8,7 +8,6 @@
#include "SkDiscardableMemory.h"
#include "Test.h"
-#include "TestClassDef.h"
DEF_TEST(DiscardableMemory, reporter) {
const char testString[] = "HELLO, WORLD!";
diff --git a/tests/DocumentTest.cpp b/tests/DocumentTest.cpp
index a717ac7..73510f8 100644
--- a/tests/DocumentTest.cpp
+++ b/tests/DocumentTest.cpp
@@ -1,5 +1,4 @@
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkDocument.h"
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index c871848..a6ab817 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp
index 8c77ffe..ac015b6 100644
--- a/tests/DrawPathTest.cpp
+++ b/tests/DrawPathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkDashPathEffect.h"
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 768c936..93f4b61 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index d881738..4202270 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkTDynamicHash.h"
namespace {
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 39e3680..d0d31bf 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPath.h"
#include "SkCanvas.h"
diff --git a/tests/ErrorTest.cpp b/tests/ErrorTest.cpp
index 9dca9d8..3525205 100644
--- a/tests/ErrorTest.cpp
+++ b/tests/ErrorTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkError.h"
#include "SkPath.h"
#include "SkRect.h"
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index ef0f5bf..20b47ca 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRegion.h"
#include "SkPath.h"
#include "SkScan.h"
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
index b66d53b..4db81dd 100644
--- a/tests/FitsInTest.cpp
+++ b/tests/FitsInTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkTypes.h"
#include "SkTFitsIn.h"
diff --git a/tests/FlatDataTest.cpp b/tests/FlatDataTest.cpp
index 95a2bd0..54427f4 100644
--- a/tests/FlatDataTest.cpp
+++ b/tests/FlatDataTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
diff --git a/tests/FlateTest.cpp b/tests/FlateTest.cpp
index 8d5f015..22c70ab 100644
--- a/tests/FlateTest.cpp
+++ b/tests/FlateTest.cpp
@@ -9,7 +9,6 @@
#include <string.h>
#include "Test.h"
-#include "TestClassDef.h"
#include "SkData.h"
#include "SkFlate.h"
#include "SkStream.h"
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index b9f39b3..3f50a92 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index ba3a582..f9e23c8 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPaint.h"
#include "SkFontStream.h"
#include "SkOSFile.h"
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 8ecdecc..32c61db 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCommandLineFlags.h"
#include "SkFontMgr.h"
#include "SkTypeface.h"
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index adbf813..ddae138 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCommandLineFlags.h"
#include "SkFontMgr.h"
#include "SkOTTable_name.h"
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index 3693fa5..d2290f2 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkFrontBufferedStream.h"
#include "SkRefCnt.h"
#include "SkStream.h"
diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
index 792ed03..d47a66d 100755
--- a/tests/GLInterfaceValidation.cpp
+++ b/tests/GLInterfaceValidation.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 10d56fe..236a9b3 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -21,7 +21,6 @@
#include "SkChecksum.h"
#include "SkRandom.h"
#include "Test.h"
-#include "TestClassDef.h"
void GrGLProgramDesc::setRandom(SkRandom* random,
const GrGpuGL* gpu,
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index b090c89..01ac4d7 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkGeometry.h"
static bool nearly_equal(const SkPoint& a, const SkPoint& b) {
diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp
index c9dac9b..c2b8a88 100644
--- a/tests/GifTest.cpp
+++ b/tests/GifTest.cpp
@@ -12,7 +12,6 @@
(!defined(SK_BUILD_FOR_MAC))
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkData.h"
#include "SkForceLinking.h"
diff --git a/tests/GpuBitmapCopyTest.cpp b/tests/GpuBitmapCopyTest.cpp
index 9d1a527..681ea69 100644
--- a/tests/GpuBitmapCopyTest.cpp
+++ b/tests/GpuBitmapCopyTest.cpp
@@ -18,7 +18,6 @@
#include "SkPixelRef.h"
#include "SkRect.h"
#include "Test.h"
-#include "TestClassDef.h"
static const char* boolStr(bool value) {
return value ? "true" : "false";
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 0d8acc5..9ba9431 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -14,7 +14,6 @@
#include "SkColorFilter.h"
#include "SkGr.h"
#include "Test.h"
-#include "TestClassDef.h"
static GrColor filterColor(const GrColor& color, uint32_t flags) {
uint32_t mask = 0;
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index f2a321f..eb83db3 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -17,7 +17,6 @@
#include "SkRect.h"
#include "SkRRect.h"
#include "Test.h"
-#include "TestClassDef.h"
static void test_drawPathEmpty(skiatest::Reporter*, SkCanvas* canvas) {
// Filling an empty path should not crash.
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp
index 9ffbd64..461a57a 100644
--- a/tests/GrContextFactoryTest.cpp
+++ b/tests/GrContextFactoryTest.cpp
@@ -9,7 +9,6 @@
#include "GrContextFactory.h"
#include "Test.h"
-#include "TestClassDef.h"
DEF_GPUTEST(GrContextFactoryTest, reporter, factory) {
// Reset in case some other test has been using it first.
diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp
index 78d9025..68f922f 100644
--- a/tests/GrDrawTargetTest.cpp
+++ b/tests/GrDrawTargetTest.cpp
@@ -13,7 +13,6 @@
#include "GrGpu.h"
#include "GrDrawTargetCaps.h"
#include "Test.h"
-#include "TestClassDef.h"
static void test_print(skiatest::Reporter*, const GrDrawTargetCaps* caps) {
// This used to assert.
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 9d974ab..faf5ca1 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
#include "GrMemoryPool.h"
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index 07bf0ce..b73adc0 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -13,7 +13,6 @@
#include "GrTexture.h"
#include "SkTypes.h"
#include "Test.h"
-#include "TestClassDef.h"
DEF_GPUTEST(GrSurfaceTest, reporter, factory) {
GrContext* context = factory->get(GrContextFactory::kNull_GLContextType);
diff --git a/tests/GrUnitTests.cpp b/tests/GrUnitTests.cpp
index d444afc..ddb5ead 100644
--- a/tests/GrUnitTests.cpp
+++ b/tests/GrUnitTests.cpp
@@ -6,7 +6,6 @@
* found in the LICENSE file.
*/
#include "Test.h"
-#include "TestClassDef.h"
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 1f77fbb..da9ac7f 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmapDevice.h"
#include "SkColorShader.h"
#include "SkEmptyShader.h"
diff --git a/tests/HashCacheTest.cpp b/tests/HashCacheTest.cpp
index 437a80c..93877cb 100644
--- a/tests/HashCacheTest.cpp
+++ b/tests/HashCacheTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
// This is a GR test
#if SK_SUPPORT_GPU
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index a7946f4..06e5ab86 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkDiscardableMemory.h"
#include "SkScaledImageCache.h"
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index becb8c9..b4aaa9c 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 44b917c..3f984c4 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index 674cf5b..9202ff9 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkRect.h"
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index 4d00eec..36a7a11 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkData.h"
#include "SkForceLinking.h"
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index dc7b377..4c6ff59 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkTInternalLList.h"
#include "SkTLList.h"
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 01ebca1..d6ff92e 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index ed9f69c..ae827f7 100644
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMD5.h"
static bool digests_equal(const SkMD5::Digest& expectedDigest, const SkMD5::Digest& computedDigest) {
diff --git a/tests/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp
index e169763..bf8f16d 100644
--- a/tests/MallocPixelRefTest.cpp
+++ b/tests/MallocPixelRefTest.cpp
@@ -8,7 +8,6 @@
#include "SkData.h"
#include "SkMallocPixelRef.h"
#include "Test.h"
-#include "TestClassDef.h"
static void delete_uint8_proc(void* ptr, void*) {
delete[] static_cast<uint8_t*>(ptr);
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 58dd0c6..1d73d58 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColorPriv.h"
#include "SkEndian.h"
#include "SkFloatBits.h"
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index 8fd84d8..e22c9d4 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMatrix44.h"
static bool nearly_equal_double(double a, double b) {
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index d0fff54..26bb122 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMath.h"
#include "SkMatrix.h"
#include "SkMatrixUtils.h"
diff --git a/tests/MemoryTest.cpp b/tests/MemoryTest.cpp
index 4c3216b..c7eff30 100644
--- a/tests/MemoryTest.cpp
+++ b/tests/MemoryTest.cpp
@@ -1,5 +1,4 @@
#include "Test.h"
-#include "TestClassDef.h"
DEF_TEST(memory_calloc, reporter) {
const size_t kNum = 200;
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index 36d0f0a..73d50ee 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkChunkAlloc.h"
#include "SkUtils.h"
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index 0e718cb..0e40d12 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -7,7 +7,6 @@
#include "SkMessageBus.h"
#include "Test.h"
-#include "TestClassDef.h"
namespace {
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 4512045..5f9f340 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMetaData.h"
static void test_ptrs(skiatest::Reporter* reporter) {
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp
index ed62219..1c2771b 100644
--- a/tests/MipMapTest.cpp
+++ b/tests/MipMapTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMipMap.h"
#include "SkBitmap.h"
#include "SkRandom.h"
diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index e0d7b9d..c082462 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkString.h"
#include "SkOSFile.h"
diff --git a/tests/OnceTest.cpp b/tests/OnceTest.cpp
index d3a0a00..f9ab427 100644
--- a/tests/OnceTest.cpp
+++ b/tests/OnceTest.cpp
@@ -8,7 +8,6 @@
#include "SkOnce.h"
#include "SkThreadPool.h"
#include "Test.h"
-#include "TestClassDef.h"
static void add_five(int* x) {
*x += 5;
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 5f0750d..1509365 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index 8a6ed88..017e341 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPackBits.h"
static const uint16_t gTest0[] = { 0, 0, 1, 1 };
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index eed9de3..2a6bad4 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkLayerDrawLooper.h"
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index 3ade1a7..23b8919 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkParsePath.h"
static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index c133e9c..cc0db7c 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMath.h"
#include "SkPoint.h"
#include "SkScalar.h"
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 2d7b64e..00a3e2e 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPathMeasure.h"
static void test_small_segment3() {
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp
index f326a90..7e32f13 100644
--- a/tests/PathOpsAngleTest.cpp
+++ b/tests/PathOpsAngleTest.cpp
@@ -8,7 +8,6 @@
#include "SkOpSegment.h"
#include "SkTArray.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkPoint cubics[][4] = {
/* 0 */ {{0, 1}, {2, 6}, {4, 2}, {5, 3}},
diff --git a/tests/PathOpsBoundsTest.cpp b/tests/PathOpsBoundsTest.cpp
index 0e813d2..8683051 100644
--- a/tests/PathOpsBoundsTest.cpp
+++ b/tests/PathOpsBoundsTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsBounds.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkRect sectTests[][2] = {
{{2, 0, 4, 1}, {4, 0, 6, 1}},
diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp
index 974d426..9c82c27 100644
--- a/tests/PathOpsCubicIntersectionTest.cpp
+++ b/tests/PathOpsCubicIntersectionTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsRect.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
const int firstCubicIntersectionTest = 9;
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index a021454..3f9e9ff 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsLine.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static struct lineCubic {
SkDCubic cubic;
diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp
index 7fca3c3..0144bad 100644
--- a/tests/PathOpsCubicQuadIntersectionTest.cpp
+++ b/tests/PathOpsCubicQuadIntersectionTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsQuad.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static struct lineCubic {
SkDCubic cubic;
diff --git a/tests/PathOpsCubicReduceOrderTest.cpp b/tests/PathOpsCubicReduceOrderTest.cpp
index 090e22e..dc779b8 100644
--- a/tests/PathOpsCubicReduceOrderTest.cpp
+++ b/tests/PathOpsCubicReduceOrderTest.cpp
@@ -11,7 +11,6 @@
#include "SkPathOpsRect.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
#if 0 // disable test until stroke reduction is supported
static bool controls_inside(const SkDCubic& cubic) {
diff --git a/tests/PathOpsCubicToQuadsTest.cpp b/tests/PathOpsCubicToQuadsTest.cpp
index 4c0f414..ab22a83 100644
--- a/tests/PathOpsCubicToQuadsTest.cpp
+++ b/tests/PathOpsCubicToQuadsTest.cpp
@@ -12,7 +12,6 @@
#include "SkPathOpsRect.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static void test(skiatest::Reporter* reporter, const SkDCubic* cubics, const char* name,
int firstTest, size_t testCount) {
diff --git a/tests/PathOpsDCubicTest.cpp b/tests/PathOpsDCubicTest.cpp
index 279564b..422236d 100644
--- a/tests/PathOpsDCubicTest.cpp
+++ b/tests/PathOpsDCubicTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsCubic.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDCubic tests[] = {
{{{2, 0}, {3, 1}, {2, 2}, {1, 1}}},
diff --git a/tests/PathOpsDLineTest.cpp b/tests/PathOpsDLineTest.cpp
index c7edb29..dd86dd3 100644
--- a/tests/PathOpsDLineTest.cpp
+++ b/tests/PathOpsDLineTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsLine.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDLine tests[] = {
{{{2, 1}, {2, 1}}},
diff --git a/tests/PathOpsDPointTest.cpp b/tests/PathOpsDPointTest.cpp
index 507a320..186d691 100644
--- a/tests/PathOpsDPointTest.cpp
+++ b/tests/PathOpsDPointTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsPoint.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDPoint tests[] = {
{0, 0},
diff --git a/tests/PathOpsDQuadTest.cpp b/tests/PathOpsDQuadTest.cpp
index 80d81e8..bd29ff1 100644
--- a/tests/PathOpsDQuadTest.cpp
+++ b/tests/PathOpsDQuadTest.cpp
@@ -9,7 +9,6 @@
#include "SkPathOpsQuad.h"
#include "SkRRect.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDQuad tests[] = {
{{{1, 1}, {2, 1}, {0, 2}}},
diff --git a/tests/PathOpsDRectTest.cpp b/tests/PathOpsDRectTest.cpp
index 21c5f2a..874e82b 100644
--- a/tests/PathOpsDRectTest.cpp
+++ b/tests/PathOpsDRectTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsQuad.h"
#include "SkPathOpsRect.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDLine lineTests[] = {
{{{2, 1}, {2, 1}}},
diff --git a/tests/PathOpsDTriangleTest.cpp b/tests/PathOpsDTriangleTest.cpp
index 1a06287..b5e2d41 100644
--- a/tests/PathOpsDTriangleTest.cpp
+++ b/tests/PathOpsDTriangleTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsTriangle.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDTriangle tests[] = {
{{{2, 0}, {3, 1}, {2, 2}}},
diff --git a/tests/PathOpsDVectorTest.cpp b/tests/PathOpsDVectorTest.cpp
index 4d35037..ab291b2 100644
--- a/tests/PathOpsDVectorTest.cpp
+++ b/tests/PathOpsDVectorTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkPathOpsPoint.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDPoint tests[] = {
{0, 0},
diff --git a/tests/PathOpsInverseTest.cpp b/tests/PathOpsInverseTest.cpp
index adbb80d..424922a 100644
--- a/tests/PathOpsInverseTest.cpp
+++ b/tests/PathOpsInverseTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
DEF_TEST(PathOpsInverse, reporter) {
SkPath one, two;
diff --git a/tests/PathOpsLineIntersectionTest.cpp b/tests/PathOpsLineIntersectionTest.cpp
index 3633262..9885178 100644
--- a/tests/PathOpsLineIntersectionTest.cpp
+++ b/tests/PathOpsLineIntersectionTest.cpp
@@ -8,7 +8,6 @@
#include "SkIntersections.h"
#include "SkPathOpsLine.h"
#include "Test.h"
-#include "TestClassDef.h"
// FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
static const SkDLine tests[][2] = {
diff --git a/tests/PathOpsLineParametetersTest.cpp b/tests/PathOpsLineParametetersTest.cpp
index e67b0f7..aab1f7a 100644
--- a/tests/PathOpsLineParametetersTest.cpp
+++ b/tests/PathOpsLineParametetersTest.cpp
@@ -7,7 +7,6 @@
#include "PathOpsTestCommon.h"
#include "SkLineParameters.h"
#include "Test.h"
-#include "TestClassDef.h"
// tests to verify that distance calculations are coded correctly
static const SkDCubic tests[] = {
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index cf10bb5..387f9bd 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
static void testOpCubicsMain(PathOpsThreadState* data) {
#if DEBUG_SHOW_TEST_NAME
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index fee44e5..e973233 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
// four rects, of four sizes
// for 3 smaller sizes, tall, wide
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 7e30141..6f21d12 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index fea0426..37e46d3 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsRect.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static void standardTestCases(skiatest::Reporter* reporter) {
bool showSkipped = false;
diff --git a/tests/PathOpsQuadLineIntersectionTest.cpp b/tests/PathOpsQuadLineIntersectionTest.cpp
index e4235d1..a789443 100644
--- a/tests/PathOpsQuadLineIntersectionTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionTest.cpp
@@ -11,7 +11,6 @@
#include "SkPathOpsQuad.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static struct lineQuad {
SkDQuad quad;
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index 4465461..8069e86 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -10,7 +10,6 @@
#include "SkPathOpsLine.h"
#include "SkPathOpsQuad.h"
#include "SkReduceOrder.h"
-#include "TestClassDef.h"
static int doIntersect(SkIntersections& intersections, const SkDQuad& quad, const SkDLine& line,
bool& flipped) {
diff --git a/tests/PathOpsQuadParameterizationTest.cpp b/tests/PathOpsQuadParameterizationTest.cpp
index 0427307..809243c 100644
--- a/tests/PathOpsQuadParameterizationTest.cpp
+++ b/tests/PathOpsQuadParameterizationTest.cpp
@@ -7,7 +7,6 @@
#include "SkDQuadImplicit.h"
#include "SkPathOpsQuad.h"
#include "Test.h"
-#include "TestClassDef.h"
static bool point_on_parameterized_curve(const SkDQuad& quad, const SkDPoint& point) {
SkDQuadImplicit q(quad);
diff --git a/tests/PathOpsQuadReduceOrderTest.cpp b/tests/PathOpsQuadReduceOrderTest.cpp
index 4c34327..9a0bdcf3 100644
--- a/tests/PathOpsQuadReduceOrderTest.cpp
+++ b/tests/PathOpsQuadReduceOrderTest.cpp
@@ -9,7 +9,6 @@
#include "SkPathOpsRect.h"
#include "SkReduceOrder.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkDQuad testSet[] = {
{{{1, 1}, {2, 2}, {1, 1.000003}}},
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 5e2ad04..5cd3c35 100755
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
SkASSERT(data);
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index d0f98a1..8bcc883 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -8,7 +8,6 @@
#include "SkPath.h"
#include "SkPoint.h"
#include "Test.h"
-#include "TestClassDef.h"
static const SkPoint nonFinitePts[] = {
{ SK_ScalarInfinity, 0 },
diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp
index e33333a..ac92a62 100644
--- a/tests/PathOpsSimplifyQuadThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
static void testSimplifyQuadsMain(PathOpsThreadState* data)
{
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index f78a9ed..afa9200 100755
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
static void testSimplifyQuadralateralsMain(PathOpsThreadState* data)
{
diff --git a/tests/PathOpsSimplifyRectThreadedTest.cpp b/tests/PathOpsSimplifyRectThreadedTest.cpp
index 35cca7d..9e6a5ea 100644
--- a/tests/PathOpsSimplifyRectThreadedTest.cpp
+++ b/tests/PathOpsSimplifyRectThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
// four rects, of four sizes
// for 3 smaller sizes, tall, wide
diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp
index fff52ca..ba92af7 100644
--- a/tests/PathOpsSimplifyTest.cpp
+++ b/tests/PathOpsSimplifyTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
index a8feaaf..b5d6508 100755
--- a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
+++ b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
-#include "TestClassDef.h"
static void testSimplifyTrianglesMain(PathOpsThreadState* data) {
SkASSERT(data);
diff --git a/tests/PathOpsSkpClipTest.cpp b/tests/PathOpsSkpClipTest.cpp
index bd39151..e0f5e18 100755
--- a/tests/PathOpsSkpClipTest.cpp
+++ b/tests/PathOpsSkpClipTest.cpp
@@ -18,7 +18,6 @@
#include "SkThreadPool.h"
#include "SkTime.h"
#include "Test.h"
-#include "TestClassDef.h"
#ifdef SK_BUILD_FOR_WIN
#define PATH_SLASH "\\"
diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index 86fe605..39eb4cb 100755
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsExtendedTest.h"
-#include "TestClassDef.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsTypesTest.cpp b/tests/PathOpsTypesTest.cpp
index a43fe03..a3b051e 100755
--- a/tests/PathOpsTypesTest.cpp
+++ b/tests/PathOpsTypesTest.cpp
@@ -6,7 +6,6 @@
*/
#include "PathOpsTestCommon.h"
#include "Test.h"
-#include "TestClassDef.h"
static const double roughlyTests[][2] = {
{5.0402503619650929e-005, 4.3178054475078825e-005}
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 063f05d..44de1aa 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"
diff --git a/tests/PathUtilsTest.cpp b/tests/PathUtilsTest.cpp
index a147487..65b742c 100644
--- a/tests/PathUtilsTest.cpp
+++ b/tests/PathUtilsTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkPathUtils.h"
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 2fe3885..2bdcfb3 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
diff --git a/tests/PictureUtilsTest.cpp b/tests/PictureUtilsTest.cpp
index 65771c3..8cf013c 100644
--- a/tests/PictureUtilsTest.cpp
+++ b/tests/PictureUtilsTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "picture_utils.h"
#include "SkString.h"
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index e18b3ae..579f736 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SamplePipeControllers.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index e0ffd7a..3c735c6 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -1,5 +1,4 @@
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPixelRef.h"
#include "SkMallocPixelRef.h"
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index d4b9128..fed443a 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -117,7 +117,6 @@
REPORTER_ASSERT(reporter, pt == copy); // pt is unchanged
}
-#include "TestClassDef.h"
DEF_TEST(Point, reporter) {
test_casts(reporter);
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp
index c963e23..77f62dc 100644
--- a/tests/PremulAlphaRoundTripTest.cpp
+++ b/tests/PremulAlphaRoundTripTest.cpp
@@ -9,7 +9,6 @@
#include "SkCanvas.h"
#include "SkConfig8888.h"
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index d9e555d..9546924 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkDrawLooper.h"
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index beff03c..a78e746 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkRTree.h"
#include "SkTSort.h"
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index 536e388..4aa39a3 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkTSort.h"
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 85846e7..32676de 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -11,7 +11,6 @@
#include "SkMathPriv.h"
#include "SkRegion.h"
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "SkGpuDevice.h"
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 47a5f5a..5df1ab3 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -11,7 +11,6 @@
#include "GrContextFactory.h"
#include "SkGpuDevice.h"
#include "Test.h"
-#include "TestClassDef.h"
static const int X_SIZE = 12;
static const int Y_SIZE = 12;
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index b7a7c6d..d557f32 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkReader32.h"
static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index d844596..19973f7 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRefCnt.h"
#include "SkTRefArray.h"
#include "SkThreadUtils.h"
diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
index 96492ea..b9f4a9a 100644
--- a/tests/RefDictTest.cpp
+++ b/tests/RefDictTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRefDict.h"
class TestRC : public SkRefCnt {
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index 4d423db..814a7d4 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRegion.h"
#include "SkRandom.h"
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 6707ebf..845094b 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -10,7 +10,6 @@
#include "GrContextFactory.h"
#include "SkGpuDevice.h"
#include "Test.h"
-#include "TestClassDef.h"
static const int gWidth = 640;
static const int gHeight = 480;
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 57c93ae..891b039 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkMatrix.h"
#include "SkRRect.h"
diff --git a/tests/RuntimeConfigTest.cpp b/tests/RuntimeConfigTest.cpp
index b2e179c..d40a4f0 100644
--- a/tests/RuntimeConfigTest.cpp
+++ b/tests/RuntimeConfigTest.cpp
@@ -6,7 +6,6 @@
*/
#include "SkRTConf.h"
#include "Test.h"
-#include "TestClassDef.h"
SK_CONF_DECLARE(int, c_RTConfTestVariable,
"test.utils.rtconf.testVariable", 1,
diff --git a/tests/SHA1Test.cpp b/tests/SHA1Test.cpp
index 87849b2..d189c1c 100644
--- a/tests/SHA1Test.cpp
+++ b/tests/SHA1Test.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkSHA1.h"
static bool digests_equal(const SkSHA1::Digest& expectedDigest, const SkSHA1::Digest& computedDigest) {
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index eb52b8a..08f5d66 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkFloatingPoint.h"
#include "SkMath.h"
#include "SkPoint.h"
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index 38e7051..ee7875a 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
#include "SkCanvas.h"
diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp
index f0a17ac..bf5b275 100644
--- a/tests/ShaderImageFilterTest.cpp
+++ b/tests/ShaderImageFilterTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkCanvas.h"
#include "SkShader.h"
#include "SkRectShaderImageFilter.h"
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index d514516..3e67306 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkShader.h"
#include "SkGradientShader.h"
#include "SkColorShader.h"
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index a896517..c22b50f 100755
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -26,7 +26,6 @@
#include "SkThreadPool.h"
#include "SkTime.h"
#include "Test.h"
-#include "TestClassDef.h"
#ifdef SK_BUILD_FOR_WIN
#define PATH_SLASH "\\"
diff --git a/tests/SortTest.cpp b/tests/SortTest.cpp
index a114f32..198e3cf 100644
--- a/tests/SortTest.cpp
+++ b/tests/SortTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkTSort.h"
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index ae01d0c..91a9c81 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColorPriv.h"
#include "SkXfermode.h"
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 6ac06e5..ecb8336 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkOSFile.h"
#include "SkStream.h"
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index ceb4df5..a911a85 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkString.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 1278bd4..2a28fa4 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkRect.h"
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index b580999..820d24d 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -9,7 +9,6 @@
#include "SkRRect.h"
#include "SkSurface.h"
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
diff --git a/tests/TDStackNesterTest.cpp b/tests/TDStackNesterTest.cpp
index 1dc7e0a..968654b 100644
--- a/tests/TDStackNesterTest.cpp
+++ b/tests/TDStackNesterTest.cpp
@@ -8,7 +8,6 @@
#include "SkTDStackNester.h"
#include "Test.h"
-#include "TestClassDef.h"
/**
* Test SkTDStackNester<int>::push(). Pushes the current count onto the stack,
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index 6a423a5..1e6b616 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkGraphics.h"
#include "SkPaint.h"
#include "SkTLS.h"
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index 4026c6a..dc53633 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkTSet.h"
// Tests the SkTSet<T> class template.
diff --git a/tests/Test.h b/tests/Test.h
index ff6b4ac..2dc7c66 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -87,7 +87,26 @@
};
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 { \
@@ -116,4 +135,38 @@
(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
diff --git a/tests/TestClassDef.h b/tests/TestClassDef.h
deleted file mode 100644
index 8351ba7..0000000
--- a/tests/TestClassDef.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* This file is meant to be included by .cpp files, so it can spew out a
- customized class + global definition.
-
- e.g.
- #include "TestClassDef.h"
-
- DEF_TEST(TestName, reporter) {
- ...
- REPORTER_ASSERT(reporter, x == 15);
- }
-*/
-
-#define DEF_TEST(name, reporter) \
- static void name(skiatest::Reporter* 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* reporter) SK_OVERRIDE { name(reporter); } \
- }; \
- 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* 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)
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 475517a..76a96e7 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkSize.h"
static void TestISize(skiatest::Reporter* reporter) {
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index 4e3d9b9..c86a2bd 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkTileGrid.h"
diff --git a/tests/ToUnicode.cpp b/tests/ToUnicode.cpp
index d6ca3da..71b8592 100644
--- a/tests/ToUnicode.cpp
+++ b/tests/ToUnicode.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkData.h"
#include "SkPDFTypes.h"
#include "SkPDFFont.h"
diff --git a/tests/Typeface.cpp b/tests/Typeface.cpp
index d589f23..93f1627 100644
--- a/tests/Typeface.cpp
+++ b/tests/Typeface.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkTypeface.h"
DEF_TEST(Typeface, reporter) {
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index 68f0ecf..dc5bc15 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkPaint.h"
#include "SkUtils.h"
diff --git a/tests/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index f01b53d..d0ed6a1 100644
--- a/tests/UnitTestTest.cpp
+++ b/tests/UnitTestTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRTConf.h"
DEF_TEST(UnitTest, reporter) {
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index dfd0a2f..ccea466 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkRefCnt.h"
#include "SkTSearch.h"
diff --git a/tests/WArrayTest.cpp b/tests/WArrayTest.cpp
index 020953f..11d5ca5 100644
--- a/tests/WArrayTest.cpp
+++ b/tests/WArrayTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
// Include the implementation so we can make an appropriate template instance.
#include "SkAdvancedTypefaceMetrics.h"
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index c20ccd0..99e6d11 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -11,7 +11,6 @@
#include "SkMathPriv.h"
#include "SkRegion.h"
#include "Test.h"
-#include "TestClassDef.h"
#if SK_SUPPORT_GPU
#include "SkGpuDevice.h"
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index a76c35d..d9f4f9e 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkReader32.h"
#include "SkWriter32.h"
diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 8f4d65a..878f40d 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -6,7 +6,6 @@
*/
#include "Test.h"
-#include "TestClassDef.h"
#include "SkColor.h"
#include "SkXfermode.h"