Move _baseline_name to test_result_writer.py.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/analyze_baselines.py

 # Copyright (c) 2016 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 12 matching lines @@
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR/ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import logging
 import optparse
 
 from webkitpy.common.checkout.baselineoptimizer import BaselineOptimizer
+from webkitpy.layout_tests.controllers.test_result_writer import baseline_name
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
 from webkitpy.tool.commands.rebaseline import AbstractRebaseliningCommand
 
 
 _log = logging.getLogger(__name__)
 
 
-# FIXME: Should TestResultWriter know how to compute this string?
-def _baseline_name(fs, test_name, suffix):
-    return fs.splitext(test_name)[0] + TestResultWriter.FILENAME_SUFFIX_EXPECTED + "." + suffix
-
-
 class AnalyzeBaselines(AbstractRebaseliningCommand):
     name = "analyze-baselines"
     help_text = "Analyzes the baselines for the given tests and prints results that are identical."
     show_in_main_help = True
     argument_names = "TEST_NAMES"
 
     def __init__(self):
         super(AnalyzeBaselines, self).__init__(options=[
             self.suffixes_option,
             optparse.make_option('--missing', action='store_true', default=False, help='Show missing baselines as well.'),
         ] + self.platform_options)
         self._optimizer_class = BaselineOptimizer  # overridable for testing
         self._baseline_optimizer = None
         self._port = None
 
     def _write(self, msg):
         print msg  # pylint: disable=print-statement
 
     def _analyze_baseline(self, options, test_name):
         for suffix in self._baseline_suffix_list:
-            baseline_name = _baseline_name(self._tool.filesystem, test_name, suffix)
-            results_by_directory = self._baseline_optimizer.read_results_by_directory(baseline_name)
+            name = baseline_name(self._tool.filesystem, test_name, suffix)
+            results_by_directory = self._baseline_optimizer.read_results_by_directory(name)
             if results_by_directory:
-                self._write("%s:" % baseline_name)
+                self._write("%s:" % name)
                 self._baseline_optimizer.write_by_directory(results_by_directory, self._write, "  ")
             elif options.missing:
-                self._write("%s: (no baselines found)" % baseline_name)
+                self._write("%s: (no baselines found)" % name)
 
     def execute(self, options, args, tool):
         self._baseline_suffix_list = options.suffixes.split(',')
         port_names = tool.port_factory.all_port_names(options.platform)
         if not port_names:
             _log.error("No port names match '%s'" % options.platform)
             return
         self._port = tool.port_factory.get(port_names[0])
         self._baseline_optimizer = self._optimizer_class(tool, self._port, port_names, skip_scm_commands=False)
         for test_name in self._port.tests(args):
             self._analyze_baseline(options, test_name)