GTTF: Include info about disabled tests and platforms in JSON test summary.

base/test/launcher/test_results_tracker.cc

 // 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.
 
 #include "base/test/launcher/test_results_tracker.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/launcher/test_launcher.h"
 #include "base/values.h"
 
 namespace base {
 
 // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
 using ::operator<<;
 
 namespace {
@@ skipping 15 matching lines @@
   fprintf(stdout,
           "%" PRIuS " test%s %s:\n",
           count,
           count != 1 ? "s" : "",
           description.c_str());
   for (InputIterator i = first; i != last; ++i)
     fprintf(stdout, "    %s\n", (*i).c_str());
   fflush(stdout);
 }
 
+std::string TestNameWithoutDisabledPrefix(const std::string& test_name) {
+  std::string test_name_no_disabled(test_name);
+  ReplaceSubstringsAfterOffset(&test_name_no_disabled, 0, "DISABLED_", "");
+  return test_name_no_disabled;
+}
+
 }  // namespace
 
 TestResultsTracker::TestResultsTracker() : iteration_(-1), out_(NULL) {
 }
 
 TestResultsTracker::~TestResultsTracker() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!out_)
     return;
@@ skipping 88 matching lines @@
 }
 
 void TestResultsTracker::OnTestIterationStarting() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Start with a fresh state for new iteration.
   iteration_++;
   per_iteration_data_.push_back(PerIterationData());
 }
 
+void TestResultsTracker::AddTest(const std::string& test_name) {
+  // Record disabled test names without DISABLED_ prefix so that they are easy
+  // to compare with regular test names, e.g. before or after disabling.
+  all_tests_.insert(TestNameWithoutDisabledPrefix(test_name));
+}
+
+void TestResultsTracker::AddDisabledTest(const std::string& test_name) {
+  // Record disabled test names without DISABLED_ prefix so that they are easy
+  // to compare with regular test names, e.g. before or after disabling.
+  disabled_tests_.insert(TestNameWithoutDisabledPrefix(test_name));
+}
+
 void TestResultsTracker::AddTestResult(const TestResult& result) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   per_iteration_data_[iteration_].results[
       result.full_name].test_results.push_back(result);
 }
 
 void TestResultsTracker::PrintSummaryOfCurrentIteration() const {
   std::map<TestResult::Status, std::set<std::string> > tests_by_status;
 
@@ skipping 77 matching lines @@
 
   ListValue* global_tags = new ListValue;
   summary_root->Set("global_tags", global_tags);
 
   for (std::set<std::string>::const_iterator i = global_tags_.begin();
        i != global_tags_.end();
        ++i) {
     global_tags->AppendString(*i);
   }
 
+  ListValue* all_tests = new ListValue;
+  summary_root->Set("all_tests", all_tests);
+
+  for (std::set<std::string>::const_iterator i = all_tests_.begin();
+       i != all_tests_.end();
+       ++i) {
+    all_tests->AppendString(*i);
+  }
+
+  ListValue* disabled_tests = new ListValue;
+  summary_root->Set("disabled_tests", disabled_tests);
+
+  for (std::set<std::string>::const_iterator i = disabled_tests_.begin();
+       i != disabled_tests_.end();
+       ++i) {
+    disabled_tests->AppendString(*i);
+  }
+
   ListValue* per_iteration_data = new ListValue;
   summary_root->Set("per_iteration_data", per_iteration_data);
 
   for (int i = 0; i <= iteration_; i++) {
     DictionaryValue* current_iteration_data = new DictionaryValue;
     per_iteration_data->Append(current_iteration_data);
 
     for (PerIterationData::ResultsMap::const_iterator j =
              per_iteration_data_[i].results.begin();
          j != per_iteration_data_[i].results.end();
@@ skipping 44 matching lines @@
 TestResultsTracker::AggregateTestResult::~AggregateTestResult() {
 }
 
 TestResultsTracker::PerIterationData::PerIterationData() {
 }
 
 TestResultsTracker::PerIterationData::~PerIterationData() {
 }
 
 }  // namespace base