From e4fafb146e85cdfcf9d5418597b6818aa0754ada Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 12 Dec 2013 21:11:12 +0000 Subject: 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 --- tests/CanvasStateTest.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tests/CanvasStateTest.cpp') diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 7cba71e726..854300907a 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2013 Google Inc. * @@ -7,6 +6,7 @@ */ #include "Test.h" +#include "TestClassDef.h" #include "SkBitmapDevice.h" #include "SkCanvas.h" #include "SkCanvasStateUtils.h" @@ -227,14 +227,9 @@ static void test_soft_clips(skiatest::Reporter* reporter) { SkClearLastError(); } -//////////////////////////////////////////////////////////////////////////////// - -static void test_canvas_state_utils(skiatest::Reporter* reporter) { +DEF_TEST(CanvasState, reporter) { test_complex_layers(reporter); test_complex_clips(reporter); test_draw_filters(reporter); test_soft_clips(reporter); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("CanvasState", TestCanvasStateClass, test_canvas_state_utils) -- cgit v1.2.3