Make SkSHA1 and SkM5 use common SkDigestHash result type

tests/BitmapHasherTest.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 "SkBitmap.h"
 #include "SkBitmapHasher.h"
 #include "SkColor.h"
-
-// Word size that is large enough to hold results of any checksum type.
-typedef uint64_t checksum_result;
+#include "SkHashDigest.h"
 
 namespace skiatest {
     class BitmapHasherTestClass : public Test {
     public:
         static Test* Factory(void*) {return SkNEW(BitmapHasherTestClass); }
     protected:
         virtual void onGetName(SkString* name) { name->set("BitmapHasher"); }
         virtual void onRun(Reporter* reporter) {
             this->fReporter = reporter;
             RunTest();
         }
     private:
 
         // Fill in bitmap with test data.
         void CreateTestBitmap(SkBitmap &bitmap, SkBitmap::Config config, int width, int height,
                               SkColor color) {
             bitmap.setConfig(config, width, height);
             REPORTER_ASSERT(fReporter, bitmap.allocPixels());
             bitmap.setIsOpaque(true);
             bitmap.eraseColor(color);
         }
 
         void RunTest() {
             // Test SkBitmapHasher
             SkBitmap bitmap;
-            SkHashDigest digest;
+            BITMAP_HASH_TYPE actualDigest;
+
             // initial test case
             CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 333, 555, SK_ColorBLUE);
-            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
-            REPORTER_ASSERT(fReporter, digest == 0x18f9df68b1b02f38ULL);
+            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &actualDigest));
+#ifdef BITMAP_HASH_TYPE_SkHashDigest
+            BITMAP_HASH_TYPE expectedDigest;
+            REPORTER_ASSERT(fReporter, expectedDigest.copyFromHexString("382fb0b168dff918"));
+            REPORTER_ASSERT(fReporter, actualDigest == expectedDigest);
+            REPORTER_ASSERT(fReporter, actualDigest.toHexString().equals("382fb0b168dff918"));

[epoger, 2013/04/18 16:39:34]

SkHashDigest.toHexString() displays the bytes in little-endian order (bytes are
listed in the reverse order from the compiler's representation of a uint64_t, as
seen below)

+#else
+            REPORTER_ASSERT(fReporter, actualDigest == 0x18f9df68b1b02f38ULL);
+#endif
+
             // same pixel data but different dimensions should yield a different checksum
             CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorBLUE);
-            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
-            REPORTER_ASSERT(fReporter, digest == 0x6b0298183f786c8eULL);
+            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &actualDigest));
+#ifdef BITMAP_HASH_TYPE_SkHashDigest
+            REPORTER_ASSERT(fReporter, actualDigest.toHexString().equals("8e6c783f1898026b"));
+#else
+            REPORTER_ASSERT(fReporter, actualDigest == 0x6b0298183f786c8eULL);
+#endif
+
             // same dimensions but different color should yield a different checksum
             CreateTestBitmap(bitmap, SkBitmap::kARGB_8888_Config, 555, 333, SK_ColorGREEN);
-            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
-            REPORTER_ASSERT(fReporter, digest == 0xc6b4b3f6fadaaf37ULL);
+            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &actualDigest));
+#ifdef BITMAP_HASH_TYPE_SkHashDigest
+            REPORTER_ASSERT(fReporter, actualDigest.toHexString().equals("37afdafaf6b3b4c6"));
+#else
+            REPORTER_ASSERT(fReporter, actualDigest == 0xc6b4b3f6fadaaf37ULL);
+#endif
+
             // same pixel colors in a different config should yield the same checksum
             CreateTestBitmap(bitmap, SkBitmap::kARGB_4444_Config, 555, 333, SK_ColorGREEN);
-            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &digest));
-            REPORTER_ASSERT(fReporter, digest == 0xc6b4b3f6fadaaf37ULL);
+            REPORTER_ASSERT(fReporter, SkBitmapHasher::ComputeDigest(bitmap, &actualDigest));
+#ifdef BITMAP_HASH_TYPE_SkHashDigest
+            REPORTER_ASSERT(fReporter, actualDigest.toHexString().equals("37afdafaf6b3b4c6"));
+#else
+            REPORTER_ASSERT(fReporter, actualDigest == 0xc6b4b3f6fadaaf37ULL);
+#endif
         }
 
         Reporter* fReporter;
     };
 
     static TestRegistry gReg(BitmapHasherTestClass::Factory);
 }