aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/DrawTextTest.cpp
diff options
context:
space:
mode:
authorGravatar tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-12 21:11:12 +0000
committerGravatar tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-12 21:11:12 +0000
commite4fafb146e85cdfcf9d5418597b6818aa0754ada (patch)
treeef3f70bafc7797cd75f3fe4daf7a0ed9108b89a9 /tests/DrawTextTest.cpp
parent0682019f2161af00168bb1984918753f2a1c1e54 (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/DrawTextTest.cpp')
-rw-r--r--tests/DrawTextTest.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index b1bb19de65..768c93603d 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -4,17 +4,16 @@
* 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"
#include "SkPaint.h"
#include "SkPoint.h"
#include "SkRect.h"
-
-///////////////////////////////////////////////////////////////////////////////
+#include "SkTypes.h"
static const SkColor bgColor = SK_ColorWHITE;
@@ -62,8 +61,7 @@ static bool compare(const SkBitmap& ref, const SkIRect& iref,
return true;
}
-static void test_drawText(skiatest::Reporter* reporter) {
-
+DEF_TEST(DrawText, reporter) {
SkPaint paint;
paint.setColor(SK_ColorGRAY);
paint.setTextSize(SkIntToScalar(20));
@@ -110,6 +108,3 @@ static void test_drawText(skiatest::Reporter* reporter) {
}
}
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("DrawText_DrawPosText", DrawTextTestClass, test_drawText)