Take two at fixing android bots still using testlistjson.

Tools/TestResultServer/model/jsonresults_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 246 matching lines @@
         incremental_json, _ = JsonResults._get_incremental_json(self._builder, JsonResults._load_json(aggregated_results), is_full_results_format=False)
         merged_results, status_code = JsonResults.merge(self._builder, aggregated_results, JsonResults._load_json(incremental_results), num_runs=max_builds, sort_keys=True)
 
         if expected_data:
             expected_results = self._make_test_json(expected_data, builder_name=self._builder)
             self.assert_json_equal(merged_results, expected_results)
             self.assertEqual(status_code, 200)
         else:
             self.assertTrue(status_code != 200)
 
+    def _test_get_test_list(self, input_data, expected_data):
+        input_results = self._make_test_json(input_data)
+        expected_results = JSON_RESULTS_TEST_LIST_TEMPLATE.replace("{[TESTDATA_TESTS]}", json.dumps(expected_data, separators=(',', ':')))
+        actual_results = JsonResults.get_test_list(self._builder, input_results)
+        self.assert_json_equal(actual_results, expected_results)
+
     def test_update_files_empty_aggregate_data(self):
         small_file = MockFile(name='results-small.json')
         large_file = MockFile(name='results.json')
 
         incremental_data = {
             "builds": ["2", "1"],
             "tests": {
                 "001.html": {
                     "results": [[200, TEXT]],
                     "times": [[200, 0]],
@@ skipping 736 matching lines @@
                                "times": [[1, 0]]}},
                        "foo": {
                            "001.html": {
                                "results": [[51, TEXT]],
                                "times": [[51, 0]]},
                            "002.html": {
                                "results": [[101, IMAGE]],
                                "times": [[101, 0]]}}},
              "version": 4})
 
+    # FIXME(aboxhall): Add some tests for xhtml/svg test results.
+
+    def test_get_test_name_list(self):
+        # Get test name list only. Don't include non-test-list data and
+        # of test result details.
+        # FIXME: This also tests a temporary bug in the data where directory-level
+        # results have a results and times values. Once that bug is fixed,
+        # remove this test-case and assert we don't ever hit it.
+        self._test_get_test_list(
+            # Input results
+            {"builds": ["3", "2", "1"],
+             "tests": {"foo": {
+                           "001.html": {
+                               "results": [[200, PASS]],
+                               "times": [[200, 0]]},
+                           "results": [[1, NO_DATA]],
+                           "times": [[1, 0]]},
+                       "002.html": {
+                           "results": [[10, TEXT]],
+                           "times": [[10, 0]]}}},
+            # Expected results
+            {"foo": {"001.html": {}}, "002.html": {}})
+
     def test_gtest(self):
         self._test_merge(
             # Aggregated results
             {"builds": ["2", "1"],
              "tests": {"foo.bar": {
                            "results": [[50, TEXT]],
                            "times": [[50, 0]]},
                        "foo.bar2": {
                            "results": [[100, IMAGE]],
                            "times": [[100, 0]]},
@@ skipping 95 matching lines @@
         files = TestFile.get_files(master['url_name'], builder, test_type, None, None, limit=3)
         self.assertEqual(len(files), 2)
         for f in files:
             j = json.loads(f.data)
             self.assertItemsEqual(j[builder]['blinkRevision'], ['12345', '54321'])
 
         tb.deactivate()
 
 if __name__ == '__main__':
     unittest.main()