Add REPORTF test macro.
This macro replaces:
SkString str;
str.printf("Foo test Expected %d got %d", x, y);
reporter->reportFailed(str);
with the shorter code:
REPORTF(reporter, ("Foo test Expected %d got %d", x, y));
The new form also appends __FILE__:__LINE__ to the message before calling reportFailed().
BUG=
R=mtklein@google.com
Review URL: https://codereview.chromium.org/132843002
git-svn-id: http://skia.googlecode.com/svn/trunk@13016 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index c74bb35..becb8c9 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -410,6 +410,23 @@
}
}
+static inline const char* options_colorType(
+ const SkDecodingImageGenerator::Options& opts) {
+ if (opts.fUseRequestedColorType) {
+ return SkColorType_to_string(opts.fRequestedColorType);
+ } else {
+ return "(none)";
+ }
+}
+
+static inline const char* yn(bool value) {
+ if (value) {
+ return "yes";
+ } else {
+ return "no";
+ }
+}
+
/**
* Given either a SkStream or a SkData, try to decode the encoded
* image using the specified options and report errors.
@@ -443,13 +460,9 @@
}
// If we get here, it's a failure and we will need more
// information about why it failed.
- reporter->reportFailed(SkStringPrintf(
- "Bounds decode failed "
- "[sampleSize=%d dither=%s colorType=%s %s] %s:%d",
- opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
- (opts.fUseRequestedColorType
- ? SkColorType_to_string(opts.fRequestedColorType) : "(none)"),
- path.c_str(), __FILE__, __LINE__));
+ ERRORF(reporter, "Bounds decode failed [sampleSize=%d dither=%s "
+ "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
+ options_colorType(opts), path.c_str());
return;
}
#if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
@@ -463,13 +476,9 @@
#endif // SK_BUILD_FOR_ANDROID || SK_BUILD_FOR_UNIX
SkAutoLockPixels alp(bm);
if (bm.getPixels() == NULL) {
- reporter->reportFailed(SkStringPrintf(
- "Pixel decode failed "
- "[sampleSize=%d dither=%s colorType=%s %s] %s:%d",
- opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
- (opts.fUseRequestedColorType
- ? SkColorType_to_string(opts.fRequestedColorType) : "(none)"),
- path.c_str(), __FILE__, __LINE__));
+ ERRORF(reporter, "Pixel decode failed [sampleSize=%d dither=%s "
+ "colorType=%s %s]", opts.fSampleSize, yn(opts.fDitherImage),
+ options_colorType(opts), path.c_str());
return;
}
@@ -496,14 +505,11 @@
}
}
if (pixelErrors != 0) {
- reporter->reportFailed(SkStringPrintf(
- "Pixel-level mismatch (%d of %d) [sampleSize=%d "
- "dither=%s colorType=%s %s] %s:%d",
- pixelErrors, kExpectedHeight * kExpectedWidth,
- opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
- (opts.fUseRequestedColorType
- ? SkColorType_to_string(opts.fRequestedColorType)
- : "(none)"), path.c_str(), __FILE__, __LINE__));
+ ERRORF(reporter, "Pixel-level mismatch (%d of %d) "
+ "[sampleSize=%d dither=%s colorType=%s %s]",
+ pixelErrors, kExpectedHeight * kExpectedWidth,
+ opts.fSampleSize, yn(opts.fDitherImage),
+ options_colorType(opts), path.c_str());
}
}
}