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/RTreeTest.cpp b/tests/RTreeTest.cpp
index a907d6d..beff03c 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2012 Google Inc.
*
@@ -7,6 +6,7 @@
*/
#include "Test.h"
+#include "TestClassDef.h"
#include "SkRandom.h"
#include "SkRTree.h"
#include "SkTSort.h"
@@ -139,7 +139,7 @@
}
}
-static void test_rtree(skiatest::Reporter* reporter) {
+DEF_TEST(RTree, reporter) {
SkRTree* rtree = SkRTree::Create(MIN_CHILDREN, MAX_CHILDREN);
SkAutoUnref au(rtree);
rtree_test_main(rtree, reporter);
@@ -149,7 +149,3 @@
SkAutoUnref auo(unsortedRtree);
rtree_test_main(unsortedRtree, reporter);
}
-
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("RTree", RTreeTestClass, test_rtree)