diff options
| author |  tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-12 21:11:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-12 21:11:12 +0000 |
| commit | e4fafb146e85cdfcf9d5418597b6818aa0754ada (patch) | |
| tree | ef3f70bafc7797cd75f3fe4daf7a0ed9108b89a9 /tests/DataRefTest.cpp | |
| parent | 0682019f2161af00168bb1984918753f2a1c1e54 (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/DataRefTest.cpp')
| -rw-r--r-- | tests/DataRefTest.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp index c32c4553ca..b31bfcdd5c 100644 --- a/tests/DataRefTest.cpp +++ b/tests/DataRefTest.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 "SkData.h" #include "SkDataTable.h" #include "SkOrderedReadBuffer.h" @@ -133,7 +134,7 @@ static void test_globaltable(skiatest::Reporter* reporter) { } } -static void TestDataTable(skiatest::Reporter* reporter) { +DEF_TEST(DataTable, reporter) { test_emptytable(reporter); test_simpletable(reporter); test_vartable(reporter); @@ -206,7 +207,7 @@ static void test_files(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, strncmp(static_cast<const char*>(r2->data()), s, 26) == 0); } -static void TestData(skiatest::Reporter* reporter) { +DEF_TEST(Data, reporter) { const char* str = "We the people, in order to form a more perfect union."; const int N = 10; @@ -234,7 +235,3 @@ static void TestData(skiatest::Reporter* reporter) { test_cstring(reporter); test_files(reporter); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("Data", DataTestClass, TestData) -DEFINE_TESTCLASS("DataTable", DataTableTestClass, TestDataTable) |