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/FontHostStreamTest.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/FontHostStreamTest.cpp')
| -rw-r--r-- | tests/FontHostStreamTest.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp index e15bd5a355..b9f39b3110 100644 --- a/tests/FontHostStreamTest.cpp +++ b/tests/FontHostStreamTest.cpp @@ -4,9 +4,9 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "SkTypes.h" #include "Test.h" +#include "TestClassDef.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkColor.h" @@ -17,8 +17,7 @@ #include "SkRect.h" #include "SkStream.h" #include "SkTypeface.h" - -/////////////////////////////////////////////////////////////////////////////// +#include "SkTypes.h" static const SkColor bgColor = SK_ColorWHITE; @@ -66,8 +65,7 @@ static bool compare(const SkBitmap& ref, const SkIRect& iref, return true; } -static void test_fontHostStream(skiatest::Reporter* reporter) { - +DEF_TEST(FontHostStream, reporter) { { SkPaint paint; paint.setColor(SK_ColorGRAY); @@ -112,6 +110,3 @@ static void test_fontHostStream(skiatest::Reporter* reporter) { //Make sure the typeface is deleted and removed. SkGraphics::PurgeFontCache(); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("FontHost::CreateTypefaceFromStream", FontHostStreamTestClass, test_fontHostStream) |