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/UtilsTest.cpp b/tests/UtilsTest.cpp
index d7d67c2..dfd0a2f 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.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 "SkRandom.h"
#include "SkRefCnt.h"
#include "SkTSearch.h"
@@ -183,7 +184,7 @@
}
}
-static void TestUTF(skiatest::Reporter* reporter) {
+DEF_TEST(Utils, reporter) {
static const struct {
const char* fUtf8;
SkUnichar fUni;
@@ -219,6 +220,3 @@
test_autounref(reporter);
test_autostarray(reporter);
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Utils", UtfTestClass, TestUTF)