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/ImageCacheTest.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/ImageCacheTest.cpp') diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp index 8f1591f708..6087b7f37f 100644 --- a/tests/ImageCacheTest.cpp +++ b/tests/ImageCacheTest.cpp @@ -6,6 +6,7 @@ */ #include "Test.h" +#include "TestClassDef.h" #include "SkDiscardableMemory.h" #include "SkScaledImageCache.h" @@ -85,7 +86,7 @@ static SkDiscardableMemory* pool_factory(size_t bytes) { return gPool->create(bytes); } -static void TestImageCache(skiatest::Reporter* reporter) { +DEF_TEST(ImageCache, reporter) { static const size_t defLimit = DIM * DIM * 4 * COUNT + 1024; // 1K slop { @@ -104,9 +105,6 @@ static void TestImageCache(skiatest::Reporter* reporter) { } } -#include "TestClassDef.h" -DEFINE_TESTCLASS("ImageCache", TestImageCacheClass, TestImageCache) - DEF_TEST(ImageCache_doubleAdd, r) { // Adding the same key twice should be safe. SkScaledImageCache cache(1024); -- cgit v1.2.3