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/ColorFilterTest.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/ColorFilterTest.cpp')
| -rw-r--r-- | tests/ColorFilterTest.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp index 544c9f0f25..8444b73a1d 100644 --- a/tests/ColorFilterTest.cpp +++ b/tests/ColorFilterTest.cpp @@ -1,11 +1,12 @@ - /* * Copyright 2011 Google Inc. * * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "Test.h" +#include "TestClassDef.h" #include "SkColor.h" #include "SkColorPriv.h" #include "SkColorFilter.h" @@ -32,7 +33,7 @@ static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) { #define ILLEGAL_MODE ((SkXfermode::Mode)-1) -static void test_asColorMode(skiatest::Reporter* reporter) { +DEF_TEST(ColorFilter, reporter) { SkRandom rand; for (int mode = 0; mode <= SkXfermode::kLastMode; mode++) { @@ -93,7 +94,7 @@ static void test_asColorMode(skiatest::Reporter* reporter) { /////////////////////////////////////////////////////////////////////////////// -static void test_lumaColorFilter(skiatest::Reporter* reporter) { +DEF_TEST(LumaColorFilter, reporter) { SkPMColor in, out; SkAutoTUnref<SkColorFilter> lf(SkLumaColorFilter::Create()); @@ -125,7 +126,3 @@ static void test_lumaColorFilter(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, SkGetPackedB32(out) == 0); } } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("ColorFilter", ColorFilterTestClass, test_asColorMode) -DEFINE_TESTCLASS("LumaColorFilter", LumaColorFilterTestClass, test_lumaColorFilter) |