From e4fafb146e85cdfcf9d5418597b6818aa0754ada Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Thu, 12 Dec 2013 21:11:12 +0000 Subject: 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 --- tests/FrontBufferedStreamTest.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/FrontBufferedStreamTest.cpp') diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp index 420718ff7a..3693fa5536 100644 --- a/tests/FrontBufferedStreamTest.cpp +++ b/tests/FrontBufferedStreamTest.cpp @@ -5,11 +5,12 @@ * found in the LICENSE file. */ +#include "Test.h" +#include "TestClassDef.h" #include "SkFrontBufferedStream.h" #include "SkRefCnt.h" #include "SkStream.h" #include "SkTypes.h" -#include "Test.h" static void test_read(skiatest::Reporter* reporter, SkStream* bufferedStream, const void* expectations, size_t bytesToRead) { @@ -150,12 +151,9 @@ static void test_buffers(skiatest::Reporter* reporter, size_t bufferSize) { test_read_beyond_buffer(reporter, bufferSize); } -static void TestStreams(skiatest::Reporter* reporter) { +DEF_TEST(FrontBufferedStream, reporter) { // Test 6 and 64, which are used by Android, as well as another arbitrary length. test_buffers(reporter, 6); test_buffers(reporter, 15); test_buffers(reporter, 64); } - -#include "TestClassDef.h" -DEFINE_TESTCLASS("FrontBufferedStream", FrontBufferedStreamTestClass, TestStreams) -- cgit v1.2.3