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/StringTest.cpp b/tests/StringTest.cpp
index c8c10e1..04e0470 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -1,11 +1,12 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "Test.h"
+#include "TestClassDef.h"
#include "SkString.h"
#include <stdarg.h>
#include <stdio.h>
@@ -32,9 +33,7 @@
ARGS_TO_BUFFER(format, buffer, size);
}
-
-
-static void TestString(skiatest::Reporter* reporter) {
+DEF_TEST(String, reporter) {
SkString a;
SkString b((size_t)0);
SkString c("");
@@ -190,9 +189,6 @@
}
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("String", StringTestClass, TestString)
-
DEF_TEST(String_SkStrSplit, r) {
SkTArray<SkString> results;