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/ClipStackTest.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tests/ClipStackTest.cpp') diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 704aa6244b..05f9fcaaa3 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.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" #if SK_SUPPORT_GPU #include "GrReducedClip.h" #endif @@ -15,7 +16,6 @@ #include "SkRect.h" #include "SkRegion.h" - static void test_assign_and_comparison(skiatest::Reporter* reporter) { SkClipStack s; bool doAA = false; @@ -1159,9 +1159,8 @@ static void test_reduced_clip_stack_no_aa_crash(skiatest::Reporter* reporter) { } #endif -/////////////////////////////////////////////////////////////////////////////////////////////////// -static void TestClipStack(skiatest::Reporter* reporter) { +DEF_TEST(ClipStack, reporter) { SkClipStack stack; REPORTER_ASSERT(reporter, 0 == stack.getSaveCount()); @@ -1210,6 +1209,3 @@ static void TestClipStack(skiatest::Reporter* reporter) { test_reduced_clip_stack_no_aa_crash(reporter); #endif } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("ClipStack", TestClipStackClass, TestClipStack) -- cgit v1.2.3