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
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp
index 34a2984..2b5cf83 100644
--- a/tests/BitmapHeapTest.cpp
+++ b/tests/BitmapHeapTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2012 Google Inc.
*
@@ -15,6 +14,7 @@
#include "SkRefCnt.h"
#include "SkShader.h"
#include "Test.h"
+#include "TestClassDef.h"
class FlatDictionary : public SkFlatDictionary<SkShader> {
@@ -37,7 +37,7 @@
}
};
-static void TestBitmapHeap(skiatest::Reporter* reporter) {
+DEF_TEST(BitmapHeap, reporter) {
// Create a bitmap shader.
SkBitmap bm;
bm.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
@@ -91,6 +91,3 @@
REPORTER_ASSERT(reporter, heap.count() == 1);
REPORTER_ASSERT(reporter, SkBitmapHeapTester::GetRefCount(heap.getEntry(0)) == 0);
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("BitmapHeap", TestBitmapHeapClass, TestBitmapHeap)