GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") and value (12345)

R=scroggo@google.com

Review URL: https://codereview.chromium.org/15883004

git-svn-id: http://skia.googlecode.com/svn/trunk@9271 2bbb7eff-a529-9590-31e7-b0007b416f81

13 files changed, 90 insertions, 110 deletions

diff --git a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
index e4fd0059bc..7832eb0234 100644
--- a/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-images/output-expected/json-summary.txt
@@ -1,12 +1,8 @@
 {
    "actual-results" : {
       "failed" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "failure-ignored" : null,
       "no-comparison" : null,
@@ -14,11 +10,15 @@
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8863920166200910451 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13451349865803053525 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
index e4fd0059bc..7832eb0234 100644
--- a/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-different-pixels-json/output-expected/json-summary.txt
@@ -1,12 +1,8 @@
 {
    "actual-results" : {
       "failed" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "failure-ignored" : null,
       "no-comparison" : null,
@@ -14,11 +10,15 @@
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8863920166200910451 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13451349865803053525 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
index f65de30787..57aee04201 100644
--- a/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-empty-dir/output-expected/json-summary.txt
@@ -3,22 +3,18 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "succeeded" : null
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : null,
+         "allowed-digests" : null,
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : null,
+         "allowed-digests" : null,
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
index 64d1a3f842..fad1ffe5bd 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-images/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       }
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
index 64d1a3f842..fad1ffe5bd 100644
--- a/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-bytes-json/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       }
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
index 64d1a3f842..fad1ffe5bd 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-images/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       }
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
index 64d1a3f842..fad1ffe5bd 100644
--- a/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
+++ b/gm/tests/outputs/compared-against-identical-pixels-json/output-expected/json-summary.txt
@@ -4,21 +4,21 @@
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       }
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
index e4fd0059bc..7832eb0234 100644
--- a/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
+++ b/gm/tests/outputs/ignore-expectations-mismatch/output-expected/json-summary.txt
@@ -1,12 +1,8 @@
 {
    "actual-results" : {
       "failed" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "failure-ignored" : null,
       "no-comparison" : null,
@@ -14,11 +10,15 @@
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8863920166200910451 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13451349865803053525 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
index 45fe47644c..f6cd87b8dd 100644
--- a/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
+++ b/gm/tests/outputs/intentionally-skipped-tests/output-expected/json-summary.txt
@@ -3,18 +3,10 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "565/selftest2.png" : {
-            "bitmap-64bitMD5" : 8863920166200910451
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         },
-         "8888/selftest2.png" : {
-            "bitmap-64bitMD5" : 13451349865803053525
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "565/selftest2.png" : [ "bitmap-64bitMD5", 8863920166200910451 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ],
+         "8888/selftest2.png" : [ "bitmap-64bitMD5", 13451349865803053525 ]
       },
       "succeeded" : null
    },
diff --git a/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt b/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt
index fe6038e0ae..b3e2a8150f 100644
--- a/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-hierarchy/output-expected/json-summary.txt
@@ -1,12 +1,8 @@
 {
    "actual-results" : {
       "failed" : {
-         "selftest1_565.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "selftest1_8888.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "selftest1_565.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "selftest1_8888.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "failure-ignored" : null,
       "no-comparison" : null,
@@ -14,11 +10,15 @@
    },
    "expected-results" : {
       "selftest1_565.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 8863920166200910451 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 8863920166200910451 ]
+         ],
          "ignore-failure" : false
       },
       "selftest1_8888.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 13451349865803053525 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 13451349865803053525 ]
+         ],
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
index eeed6b44a1..006516eda6 100644
--- a/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
+++ b/gm/tests/outputs/no-readpath/output-expected/json-summary.txt
@@ -3,12 +3,8 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "succeeded" : null
    },
diff --git a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
index f65de30787..57aee04201 100644
--- a/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
+++ b/gm/tests/outputs/nonverbose/output-expected/json-summary.txt
@@ -3,22 +3,18 @@
       "failed" : null,
       "failure-ignored" : null,
       "no-comparison" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       },
       "succeeded" : null
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : null,
+         "allowed-digests" : null,
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : null,
+         "allowed-digests" : null,
          "ignore-failure" : false
       }
    }
diff --git a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
index b4e600379e..c99a8e9651 100644
--- a/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
+++ b/gm/tests/outputs/pipe-playback-failure/output-expected/json-summary.txt
@@ -1,32 +1,32 @@
 {
    "actual-results" : {
       "failed" : {
-         "comparison/selftest1-pipe.png" : {
-            "bitmap-64bitMD5" : 6140979239232854774
-         }
+         "comparison/selftest1-pipe.png" : [ "bitmap-64bitMD5", 6140979239232854774 ]
       },
       "failure-ignored" : null,
       "no-comparison" : null,
       "succeeded" : {
-         "565/selftest1.png" : {
-            "bitmap-64bitMD5" : 12927999507540085554
-         },
-         "8888/selftest1.png" : {
-            "bitmap-64bitMD5" : 1209453360120438698
-         }
+         "565/selftest1.png" : [ "bitmap-64bitMD5", 12927999507540085554 ],
+         "8888/selftest1.png" : [ "bitmap-64bitMD5", 1209453360120438698 ]
       }
    },
    "expected-results" : {
       "565/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 12927999507540085554 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 12927999507540085554 ]
+         ],
          "ignore-failure" : false
       },
       "8888/selftest1.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       },
       "comparison/selftest1-pipe.png" : {
-         "allowed-bitmap-64bitMD5s" : [ 1209453360120438698 ],
+         "allowed-digests" : [
+            [ "bitmap-64bitMD5", 1209453360120438698 ]
+         ],
          "ignore-failure" : false
       }
    }