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/OSPathTest.cpp b/tests/OSPathTest.cpp
index 5ae32eb..e0d7b9d 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -5,9 +5,10 @@
* found in the LICENSE file.
*/
+#include "Test.h"
+#include "TestClassDef.h"
#include "SkString.h"
#include "SkOSFile.h"
-#include "Test.h"
/**
* Test SkPathJoin and SkBasename.
@@ -50,7 +51,7 @@
REPORTER_ASSERT(reporter, basename.equals(filename));
}
-static void test_os_path_utils_tests(skiatest::Reporter* reporter) {
+DEF_TEST(OSPath, reporter) {
SkString dir("dir");
SkString filename("file");
test_dir_with_file(reporter, dir, filename);
@@ -83,6 +84,3 @@
REPORTER_ASSERT(reporter, emptyPath.size() == 1);
REPORTER_ASSERT(reporter, emptyPath.contains(SkPATH_SEPARATOR));
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("OSPath", OSPathTestClass, test_os_path_utils_tests)