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/Writer32Test.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tests/Writer32Test.cpp') diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp index 15218378ec..2032fefae7 100644 --- a/tests/Writer32Test.cpp +++ b/tests/Writer32Test.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2011 Google Inc. * @@ -6,12 +5,11 @@ * found in the LICENSE file. */ - - +#include "Test.h" +#include "TestClassDef.h" #include "SkRandom.h" #include "SkReader32.h" #include "SkWriter32.h" -#include "Test.h" static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer, const void* expected, size_t size) { @@ -188,7 +186,7 @@ static void testWritePad(skiatest::Reporter* reporter, SkWriter32* writer) { } } -static void Tests(skiatest::Reporter* reporter) { +DEF_TEST(Writer32, reporter) { // dynamic allocator { SkWriter32 writer(256 * 4); @@ -252,6 +250,3 @@ static void Tests(skiatest::Reporter* reporter) { test_ptr(reporter); test_rewind(reporter); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("Writer32", Writer32Class, Tests) -- cgit v1.2.3