test launcher: print test file names and lines in summary results

base/test/launcher/test_results_tracker.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_TEST_LAUNCHER_TEST_RESULTS_TRACKER_H_
 #define BASE_TEST_LAUNCHER_TEST_RESULTS_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 24 matching lines @@
 
   // Initialize the result tracker. Must be called exactly once before
   // calling any other methods. Returns true on success.
   bool Init(const CommandLine& command_line) WARN_UNUSED_RESULT;
 
   // Called when a test iteration is starting.
   void OnTestIterationStarting();
 
   // Adds |test_name| to the set of discovered tests (this includes all tests
   // present in the executable, not necessarily run).
-  void AddTest(const std::string& test_name);
+  void AddTest(const std::string& test_name, const std::string& file, int line);
 
   // Adds |test_name| to the set of disabled tests.
   void AddDisabledTest(const std::string& test_name);
 
   // Adds |result| to the stored test results.
   void AddTestResult(const TestResult& result);
 
   // Prints a summary of current test iteration to stdout.
   void PrintSummaryOfCurrentIteration() const;
 
@@ skipping 14 matching lines @@
 
   // Returns a test status map (see above) for current test iteration.
   TestStatusMap GetTestStatusMapForCurrentIteration() const;
 
   // Returns a test status map (see above) for all test iterations.
   TestStatusMap GetTestStatusMapForAllIterations() const;
 
  private:
   void GetTestStatusForIteration(int iteration, TestStatusMap* map) const;
 
+  template<typename InputIterator>
+  void PrintTests(InputIterator first,
+                  InputIterator last,
+                  const std::string& description) const;
+
   struct AggregateTestResult {
     AggregateTestResult();
     ~AggregateTestResult();
 
     std::vector<TestResult> test_results;
   };
 
   struct PerIterationData {
     PerIterationData();
     ~PerIterationData();
 
     // Aggregate test results grouped by full test name.
     typedef std::map<std::string, AggregateTestResult> ResultsMap;
     ResultsMap results;
   };
 
+  struct CodeLocation {
+    CodeLocation(const std::string f, int l) : file(f), line(l) {

[sky, 2015/07/28 22:37:07]

const std::string&

[Paweł Hajdan Jr., 2015/07/29 08:47:07]

Done.

+    }
+
+    std::string file;
+    int line;
+  };
+
   ThreadChecker thread_checker_;
 
   // Set of global tags, i.e. strings indicating conditions that apply to
   // the entire test run.
   std::set<std::string> global_tags_;
 
   // Set of all test names discovered in the current executable.
   std::set<std::string> all_tests_;
 
+  std::map<std::string, CodeLocation> test_locations_;
+
   // Set of all disabled tests in the current executable.
   std::set<std::string> disabled_tests_;
 
   // Store test results for each iteration.
   std::vector<PerIterationData> per_iteration_data_;
 
   // Index of current iteration (starting from 0). -1 before the first
   // iteration.
   int iteration_;
 
   // File handle of output file (can be NULL if no file).
   FILE* out_;
 
   DISALLOW_COPY_AND_ASSIGN(TestResultsTracker);
 };
 
 }  // namespace base
 
 #endif  // BASE_TEST_LAUNCHER_TEST_RESULTS_TRACKER_H_