rebaseline_server JSON: pass category values as values, not keys

gm/rebaseline_server/imagepairset_test.py

 #!/usr/bin/python
 
 """
 Copyright 2014 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 
 Test imagepairset.py
 """
@@ skipping 70 matching lines @@
     """Assembles some ImagePairs into an ImagePairSet, and validates results.
     """
     image_pairs = [
         MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_1_AS_DICT),
         MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_2_AS_DICT),
         MockImagePair(base_url=BASE_URL_1, dict_to_return=IMAGEPAIR_3_AS_DICT),
     ]
     expected_imageset_dict = {
         'extraColumnHeaders': {
             'builder': {
+                'counts': [3],
                 'headerText': 'builder',
                 'isFilterable': True,
                 'isSortable': True,
-                'valuesAndCounts': {
-                    'MyBuilder': 3
-                },
+                'values': ['MyBuilder'],

[borenet, 2014/05/08 12:40:18]

My concern with this format is that it's possible for the two lists to be out of
sync.  What if we used tuples or lists to create pairs:

'valuesAndCounts': [
  ('MyBuilder', 3),
]

[epoger, 2014/05/08 15:04:35]

JSON doesn't have a concept of tuples, but I could use a list of 2-item lists. 
I'll try that and see how it goes.  As you note, that will inherently guard
against out-of-sync lists.

Thanks for the suggestion.  It could make things a bit more complicated on the
client side, but we'll see.

             },
             'test': {
                 'headerText': 'which GM test',
                 'headerUrl': 'http://learn/about/gm/tests',
                 'isFilterable': True,
                 'isSortable': False,
             },
         },
         'imagePairs': [
             IMAGEPAIR_1_AS_DICT,
@@ skipping 68 matching lines @@
     return self._dict_to_return
 
 
 def main():
   suite = unittest.TestLoader().loadTestsFromTestCase(ImagePairSetTest)
   unittest.TextTestRunner(verbosity=2).run(suite)
 
 
 if __name__ == '__main__':
   main()