test launcher: make --gtest_filter=A.B + --gtest_also_run_disabled_tests also run A.DISABLED_B or D…

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 <stddef.h>
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.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/gtest_util.h"
 #include "base/test/launcher/test_launcher.h"
 #include "base/values.h"
 
 namespace base {
 
 namespace {
 
 // The default output file for XML output.
 const FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
     "test_detail.xml");
 
-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;
-}
-
 // Converts the given epoch time in milliseconds to a date string in the ISO
 // 8601 format, without the timezone information.
 // TODO(xyzzyz): Find a good place in Chromium to put it and refactor all uses
 // to point to it.
 std::string FormatTimeAsIso8601(base::Time time) {
   base::Time::Exploded exploded;
   time.UTCExplode(&exploded);
   return StringPrintf("%04d-%02d-%02dT%02d:%02d:%02d",
                       exploded.year,
                       exploded.month,
@@ skipping 180 matching lines @@
 
 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());
 
+  // Record disabled test names without DISABLED_ prefix so that they are easy
+  // to compare with regular test names, e.g. before or after disabling.
   per_iteration_data_[iteration_].results[
-      result.full_name].test_results.push_back(result);
+      TestNameWithoutDisabledPrefix(result.full_name)].test_results.push_back(
+          result);
 }
 
 void TestResultsTracker::PrintSummaryOfCurrentIteration() const {
   TestStatusMap tests_by_status(GetTestStatusMapForCurrentIteration());
 
   PrintTests(tests_by_status[TestResult::TEST_FAILURE].begin(),
              tests_by_status[TestResult::TEST_FAILURE].end(),
              "failed");
   PrintTests(tests_by_status[TestResult::TEST_FAILURE_ON_EXIT].begin(),
              tests_by_status[TestResult::TEST_FAILURE_ON_EXIT].end(),
@@ skipping 203 matching lines @@
 TestResultsTracker::PerIterationData::PerIterationData() {
 }
 
 TestResultsTracker::PerIterationData::PerIterationData(
     const PerIterationData& other) = default;
 
 TestResultsTracker::PerIterationData::~PerIterationData() {
 }
 
 }  // namespace base