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/Reader32Test.cpp b/tests/Reader32Test.cpp
index d81287b..b7a7c6d 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -6,10 +5,9 @@
* found in the LICENSE file.
*/
-
-
-#include "SkReader32.h"
#include "Test.h"
+#include "TestClassDef.h"
+#include "SkReader32.h"
static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
REPORTER_ASSERT(reporter, reader.eof());
@@ -35,7 +33,7 @@
assert_start(reporter, reader);
}
-static void Tests(skiatest::Reporter* reporter) {
+DEF_TEST(Reader32, reporter) {
SkReader32 reader;
assert_empty(reporter, reader);
REPORTER_ASSERT(reporter, NULL == reader.base());
@@ -82,6 +80,3 @@
REPORTER_ASSERT(reporter, NULL == reader.base());
REPORTER_ASSERT(reporter, NULL == reader.peek());
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Reader32", Reader32Class, Tests)