GM: include filename extension (.png) of each output file in JSON summary

gm/gm_expectations.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 "gm_expectations.h"
 #include "SkBitmapHasher.h"
 #include "SkImageDecoder.h"
@@ skipping 123 matching lines @@
         Json::Value jsonValue;
         jsonValue[kJsonKey_ExpectedResults_AllowedBitmapHashes] = allowedChecksumArray;
         jsonValue[kJsonKey_ExpectedResults_IgnoreFailure] = this->ignoreFailure();
         return jsonValue;
     }
 
 
     // IndividualImageExpectationsSource class...
 
     Expectations IndividualImageExpectationsSource::get(const char *testName) {
-        SkString path = make_filename(fRootDir.c_str(), "", testName,
-                                      "png");
+        SkString path = make_filename(fRootDir.c_str(), "", testName, kPNG_FileExtension);
         SkBitmap referenceBitmap;
         bool decodedReferenceBitmap =
             SkImageDecoder::DecodeFile(path.c_str(), &referenceBitmap,
                                        SkBitmap::kARGB_8888_Config,
                                        SkImageDecoder::kDecodePixels_Mode,
                                        NULL);
         if (decodedReferenceBitmap) {
             return Expectations(referenceBitmap);
         } else {
             return Expectations();
         }
     }
 
 
     // JsonExpectationsSource class...
 
     JsonExpectationsSource::JsonExpectationsSource(const char *jsonPath) {
         parse(jsonPath, &fJsonRoot);
         fJsonExpectedResults = fJsonRoot[kJsonKey_ExpectedResults];
     }
 
     Expectations JsonExpectationsSource::get(const char *testName) {
-        return Expectations(fJsonExpectedResults[testName]);
+        SkString testNameWithExtension(testName);
+        testNameWithExtension.append(".");
+        testNameWithExtension.append(kPNG_FileExtension);

[scroggo, 2013/05/08 20:39:45]

This will break my use of this function in skimage_main.cpp (working on that
self test...).

I see that IndividualImageExpectationsSource::get(const char *testName) already
had similar behavior. I do think it makes sense to make the two consistent. In
order to make this function work for PDF, PNG, and skimage (where testName
already includes the extension), maybe the function should take two parameters,
testName and extension? A NULL extension can skip the append, allowing skimage
to work.

[epoger, 2013/05/09 14:20:07]

Thanks for the early warning on that.  Actually, in the long run, I think we
want both this method and IndividualImageExpectationsSource::get(const char
*testName) to look up the result without appending any file extension.  That
way, it will work for any filetype in GM, and it will continue to work as-is for
skimage.

I made this change for now, because I figured it would be easier... but I didn't
bank on it breaking skimage.

So, would you be in favor of the long-term fix above?  If so, I'll figure out a
way to just do it now.

[scroggo, 2013/05/09 14:28:48]

Yes. Thanks!

+        return Expectations(fJsonExpectedResults[testNameWithExtension.c_str()]);
     }
 
     /*static*/ SkData* JsonExpectationsSource::readIntoSkData(SkStream &stream, size_t maxBytes) {
         if (0 == maxBytes) {
             return SkData::NewEmpty();
         }
         char* bufStart = reinterpret_cast<char *>(sk_malloc_throw(maxBytes));
         char* bufPtr = bufStart;
         size_t bytesRemaining = maxBytes;
         while (bytesRemaining > 0) {
@@ skipping 27 matching lines @@
         Json::Reader reader;
         if (!reader.parse(bytes, bytes+size, *jsonRoot)) {
             gm_fprintf(stderr, "error parsing JSON file %s\n", jsonPath);
             DEBUGFAIL_SEE_STDERR;
             return false;
         }
         return true;
     }
 
 }