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/JpegTest.cpp b/tests/JpegTest.cpp
index ac2ec8a..4d00eec 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -5,13 +5,14 @@
* found in the LICENSE file.
*/
+#include "Test.h"
+#include "TestClassDef.h"
#include "SkBitmap.h"
#include "SkData.h"
#include "SkForceLinking.h"
#include "SkImageDecoder.h"
#include "SkImage.h"
#include "SkStream.h"
-#include "Test.h"
__SK_FORCE_IMAGE_DECODER_LINKING;
@@ -417,7 +418,7 @@
Jpeg files which have been mangled somehow. We want to display as
much of the jpeg as possible.
*/
-static void TestJpeg(skiatest::Reporter* reporter) {
+DEF_TEST(Jpeg, reporter) {
size_t len = sizeof(goodJpegImage) / 2;
// I am explicitly not putting the entire image into the
// DecodeMemory. This simulates a network error.
@@ -447,6 +448,3 @@
SkASSERT(writeSuccess);
#endif
}
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("JpegTest", JpegTestClass, TestJpeg)