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/AnnotationTest.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/AnnotationTest.cpp')
| -rw-r--r-- | tests/AnnotationTest.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp index 5429b58912..db33afa6ab 100644 --- a/tests/AnnotationTest.cpp +++ b/tests/AnnotationTest.cpp @@ -6,6 +6,7 @@ * found in the LICENSE file. */ #include "Test.h" +#include "TestClassDef.h" #include "SkAnnotation.h" #include "SkData.h" #include "SkCanvas.h" @@ -24,7 +25,7 @@ static bool ContainsString(const char* data, size_t dataSize, const char* needle return false; } -static void test_nodraw(skiatest::Reporter* reporter) { +DEF_TEST(Annotation_NoDraw, reporter) { SkBitmap bm; bm.setConfig(SkBitmap::kARGB_8888_Config, 10, 10); bm.allocPixels(); @@ -45,7 +46,7 @@ struct testCase { bool expectAnnotations; }; -static void test_pdf_link_annotations(skiatest::Reporter* reporter) { +DEF_TEST(Annotation_PdfLink, reporter) { SkISize size = SkISize::Make(612, 792); SkMatrix initialTransform; initialTransform.reset(); @@ -73,7 +74,7 @@ static void test_pdf_link_annotations(skiatest::Reporter* reporter) { } } -static void test_named_destination_annotations(skiatest::Reporter* reporter) { +DEF_TEST(Annotation_NamedDestination, reporter) { SkISize size = SkISize::Make(612, 792); SkMatrix initialTransform; initialTransform.reset(); @@ -94,12 +95,3 @@ static void test_named_destination_annotations(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, ContainsString(rawOutput, out->size(), "/example ")); } - -static void TestAnnotation(skiatest::Reporter* reporter) { - test_nodraw(reporter); - test_pdf_link_annotations(reporter); - test_named_destination_annotations(reporter); -} - -#include "TestClassDef.h" -DEFINE_TESTCLASS("Annotation", AnnotationClass, TestAnnotation) |