aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ErrorTest.cpp
diff options
context:
space:
mode:
authorGravatar tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-12 21:11:12 +0000
committerGravatar tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-12-12 21:11:12 +0000
commite4fafb146e85cdfcf9d5418597b6818aa0754ada (patch)
treeef3f70bafc7797cd75f3fe4daf7a0ed9108b89a9 /tests/ErrorTest.cpp
parent0682019f2161af00168bb1984918753f2a1c1e54 (diff)
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
Diffstat (limited to 'tests/ErrorTest.cpp')
-rw-r--r--tests/ErrorTest.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/ErrorTest.cpp b/tests/ErrorTest.cpp
index 2d10640c68..9dca9d87d5 100644
--- a/tests/ErrorTest.cpp
+++ b/tests/ErrorTest.cpp
@@ -1,11 +1,12 @@
-
/*
* Copyright 2013 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 "SkError.h"
#include "SkPath.h"
#include "SkRect.h"
@@ -27,7 +28,7 @@ static void cb(SkError err, void *context) {
REPORTER_ASSERT( context_ptr->fReporter, (*(context_ptr->fIntPointer) == 0xdeadbeef) );
}
-static void ErrorTest(skiatest::Reporter* reporter) {
+DEF_TEST(Error, reporter) {
SkError err;
unsigned int test_value = 0xdeadbeef;
@@ -59,6 +60,3 @@ static void ErrorTest(skiatest::Reporter* reporter) {
CHECK(kInvalidArgument_SkError);
CHECK(kNoError_SkError);
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("Error", ErrorTestClass, ErrorTest)