Add REPORTF test macro.

tests/ImageDecodingTest.cpp

 /*
  * Copyright 2013 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 "SkBitmap.h"
@@ skipping 425 matching lines @@
             SkDecodingImageGenerator::Create(encodedStream->duplicate(), opts),
             &bm, NULL);
     }
     if (!success) {
         if (opts.fUseRequestedColorType
             && (kARGB_4444_SkColorType == opts.fRequestedColorType)) {
             return;  // Ignore known conversion inabilities.
         }
         // 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__));
+        const char* colorTypeDesc
+            = opts.fUseRequestedColorType

[bungeman-skia, 2014/01/09 23:43:56]

With the line breaks like this, this is really hard to follow (it was before too
though). I usually format this something like

const char* colorTypeDesc = (opts.fUseRequestedColorType)
                          ? SkColorType_to_string(opts.fRequestedColorType)
                          : "(none)";

to make it a bit more obvious. Actually, we're not even making the pointer const
anyway, so why not just

const char* colorTypeDesc = "(none)";
if (opts.fUseRequestedColorType) {
    colorTypeDesc = SkColorType_to_string(opts.fRequestedColorType);
}

dunno, just as is it is difficult to read. (Same below.)

[hal.canary, 2014/01/10 13:20:33]

Fixed.

+            ? SkColorType_to_string(opts.fRequestedColorType) : "(none)";
+        REPORTF(reporter,
+                ("Bounds decode failed [sampleSize=%d dither=%s colorType=%s"
+                 " %s]", opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
+                 colorTypeDesc, path.c_str()));
         return;
     }
     #if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
     // Android is the only system that use Skia's image decoders in
     // production.  For now, we'll only verify that samplesize works
     // on systems where it already is known to work.
     REPORTER_ASSERT(reporter, check_rounding(bm.height(), kExpectedHeight,
                                              opts.fSampleSize));
     REPORTER_ASSERT(reporter, check_rounding(bm.width(), kExpectedWidth,
                                              opts.fSampleSize));
     #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__));
+        const char* colorTypeDesc
+            = opts.fUseRequestedColorType
+            ? SkColorType_to_string(opts.fRequestedColorType) : "(none)";
+        REPORTF(reporter,
+                ("Pixel decode failed [sampleSize=%d dither=%s colorType=%s"
+                 " %s]", opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
+                 colorTypeDesc, path.c_str()));
         return;
     }
 
     SkBitmap::Config requestedConfig
         = SkColorTypeToBitmapConfig(opts.fRequestedColorType);
     REPORTER_ASSERT(reporter,
                     (!opts.fUseRequestedColorType)
                     || (bm.config() == requestedConfig));
 
     // Condition under which we should check the decoding results:
     if ((SkBitmap::kARGB_8888_Config == bm.config())
         && (!path.endsWith(".jpg"))  // lossy
         && (opts.fSampleSize == 1)) {  // scaled
         const SkColor* correctPixels = kExpectedPixels;
         SkASSERT(bm.height() == kExpectedHeight);
         SkASSERT(bm.width() == kExpectedWidth);
         int pixelErrors = 0;
         for (int y = 0; y < bm.height(); ++y) {
             for (int x = 0; x < bm.width(); ++x) {
                 if (*correctPixels != bm.getColor(x, y)) {
                     ++pixelErrors;
                 }
                 ++correctPixels;
             }
         }
         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__));
+            const char* colorTypeDesc
+                = opts.fUseRequestedColorType
+                ? SkColorType_to_string(opts.fRequestedColorType) : "(none)";
+            REPORTF(reporter,
+                    ("Pixel-level mismatch (%d of %d) [sampleSize=%d "
+                     "dither=%s colorType=%s %s]",
+                     pixelErrors, kExpectedHeight * kExpectedWidth,
+                     opts.fSampleSize, (opts.fDitherImage ? "yes" : "no"),
+                     colorTypeDesc, path.c_str()));
         }
     }
 }
 
 /**
  *  SkDecodingImageGenerator has an Options struct which lets the
  *  client of the generator set sample size, dithering, and bitmap
  *  config.  This test loops through many possible options and tries
  *  them on a set of 5 small encoded images (each in a different
  *  format).  We test both SkData and SkStreamRewindable decoding.
@@ skipping 54 matching lines @@
                     SkDecodingImageGenerator::Options options(scaleList[i],
                                                               ditherList[j]);
                     test_options(reporter, options, encodedStream, encodedData,
                                  useDataList[m], path);
                 }
             }
         }
     }
 }
 ////////////////////////////////////////////////////////////////////////////////