diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-12 21:11:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-12 21:11:12 +0000 |
| commit | e4fafb146e85cdfcf9d5418597b6818aa0754ada (patch) | |
| tree | ef3f70bafc7797cd75f3fe4daf7a0ed9108b89a9 /tests/PipeTest.cpp | |
| parent | 0682019f2161af00168bb1984918753f2a1c1e54 (diff) | |
Use DEFINE_TESTCLASS_SHORT macro in tests.
The three version of DEFINE_TESTCLASS macro is deprecated and thus just
use the simple, short one.
BUG=None
TEST=out/Debug/tests
R=mtklein@google.com, bsalomon@google.com, robertphillips@google.com
Review URL: https://codereview.chromium.org/100113004
git-svn-id: http://skia.googlecode.com/svn/trunk@12653 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PipeTest.cpp')
| -rw-r--r-- | tests/PipeTest.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp index acf288ae8d..e18b3ae192 100644 --- a/tests/PipeTest.cpp +++ b/tests/PipeTest.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2012 Google Inc. * @@ -6,13 +5,14 @@ * found in the LICENSE file. */ +#include "Test.h" +#include "TestClassDef.h" #include "SamplePipeControllers.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkGPipe.h" #include "SkPaint.h" #include "SkShader.h" -#include "Test.h" // Ensures that the pipe gracefully handles drawing an invalid bitmap. static void testDrawingBadBitmap(SkCanvas* pipeCanvas) { @@ -43,7 +43,7 @@ static void testDrawingAfterEndRecording(SkCanvas* canvas) { pipeCanvas->drawBitmap(bm, 0, 0); } -static void test_pipeTests(skiatest::Reporter*) { +DEF_TEST(Pipe, reporter) { SkBitmap bitmap; bitmap.setConfig(SkBitmap::kARGB_8888_Config, 64, 64); SkCanvas canvas(bitmap); @@ -56,6 +56,3 @@ static void test_pipeTests(skiatest::Reporter*) { testDrawingAfterEndRecording(&canvas); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("PipeTest", PipeTestClass, test_pipeTests) |