Refactoring: Replace test_prefix_list variables with TestBaselineSet objects.

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

 # Copyright 2016 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.
 
 import json
 import optparse
 
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.checkout.git_mock import MockGit
 from webkitpy.common.net.layout_test_results import LayoutTestResults
 from webkitpy.common.system.log_testing import LoggingTestCase
 from webkitpy.layout_tests.builder_list import BuilderList
+from webkitpy.tool.commands.rebaseline import TestBaselineSet
 from webkitpy.tool.commands.rebaseline_cl import RebaselineCL
 from webkitpy.tool.commands.rebaseline_unittest import BaseTestCase
 
 
 class RebaselineCLTest(BaseTestCase, LoggingTestCase):
     command_constructor = RebaselineCL
 
     def setUp(self):
         BaseTestCase.setUp(self)
         LoggingTestCase.setUp(self)
@@ skipping 97 matching lines @@
                     'fast/dom/prototype-taco.html',
                     'svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html',
                 ],
                 'ignored': [],
             }))
 
         # Write to the mock filesystem so that these tests are considered to exist.
         tests = [
             'fast/dom/prototype-taco.html',
             'fast/dom/prototype-inheritance.html',
+            'fast/dom/prototype-slowtest.html',
             'fast/dom/prototype-newtest.html',
             'svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html',
         ]
         for test in tests:
             self._write(self.mac_port.host.filesystem.join(self.mac_port.layout_tests_dir(), test), 'contents')
 
     def tearDown(self):
         BaseTestCase.tearDown(self)
         LoggingTestCase.tearDown(self)
 
     @staticmethod
     def command_options(**kwargs):
         options = {
             'only_changed_tests': False,
             'dry_run': False,
             'optimize': True,
             'results_directory': None,
             'verbose': False,
             'trigger_jobs': False,
         }
         options.update(kwargs)
         return optparse.Values(dict(**options))
 
-    def test_execute_with_issue_number_given(self):
+    def test_execute_basic(self):
         return_code = self.command.execute(self.command_options(), [], self.tool)
         self.assertEqual(return_code, 0)
         self.assertLog([
             'INFO: Rebaselining fast/dom/prototype-inheritance.html\n',
             'INFO: Rebaselining fast/dom/prototype-newtest.html\n',
             'INFO: Rebaselining fast/dom/prototype-slowtest.html\n',
             'INFO: Rebaselining fast/dom/prototype-taco.html\n',
             'INFO: Rebaselining svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html\n',
         ])
 
     def test_execute_with_no_issue_number(self):
         git_cl = GitCL(self.tool)
         git_cl.get_issue_number = lambda: 'None'
         self.command.git_cl = lambda: git_cl
         return_code = self.command.execute(self.command_options(), [], self.tool)
         self.assertEqual(return_code, 1)
         self.assertLog(['ERROR: No issue number for current branch.\n'])
 
-    def test_execute_with_issue_number_from_branch(self):
-        return_code = self.command.execute(self.command_options(), [], self.tool)
-        self.assertEqual(return_code, 0)
-        self.assertLog([
-            'INFO: Rebaselining fast/dom/prototype-inheritance.html\n',
-            'INFO: Rebaselining fast/dom/prototype-newtest.html\n',
-            'INFO: Rebaselining fast/dom/prototype-slowtest.html\n',
-            'INFO: Rebaselining fast/dom/prototype-taco.html\n',
-            'INFO: Rebaselining svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html\n',
-        ])
-
     def test_execute_with_only_changed_tests_option(self):
         return_code = self.command.execute(self.command_options(only_changed_tests=True), [], self.tool)
         self.assertEqual(return_code, 0)
         # svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html
         # is in the list of failed tests, but not in the list of files modified
         # in the given CL; it should be included because all_tests is set to True.
         self.assertLog([
             'INFO: Rebaselining fast/dom/prototype-inheritance.html\n',
             'INFO: Rebaselining fast/dom/prototype-taco.html\n',
         ])
@@ skipping 72 matching lines @@
             ])
 
     def test_rebaseline_calls(self):
         """Tests the list of commands that are invoked when rebaseline is called."""
         # First write test contents to the mock filesystem so that
         # fast/dom/prototype-taco.html is considered a real test to rebaseline.
         port = self.tool.port_factory.get('test-win-win7')
         self._write(
             port.host.filesystem.join(port.layout_tests_dir(), 'fast/dom/prototype-taco.html'),
             'test contents')
+        test_baseline_set = TestBaselineSet(self.tool)
+        test_baseline_set.add('fast/dom/prototype-taco.html', Build('MOCK Try Win', 5000))
 
-        self.command.rebaseline(
-            self.command_options(),
-            {'fast/dom/prototype-taco.html': [Build('MOCK Try Win', 5000)]})
+        self.command.rebaseline(self.command_options(), test_baseline_set)
 
         self.assertEqual(
             self.tool.executive.calls,
             [
                 [['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt',
                   '--builder', 'MOCK Try Win', '--test', 'fast/dom/prototype-taco.html']],
                 [['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt',
                   '--builder', 'MOCK Try Win', '--test', 'fast/dom/prototype-taco.html', '--build-number', '5000']],
                 [['python', 'echo', 'optimize-baselines', '--suffixes', 'txt', 'fast/dom/prototype-taco.html']]
             ])
@@ skipping 30 matching lines @@
 
     def test_bails_when_there_are_unstaged_baselines(self):
         git = self.tool.git()
         git.unstaged_changes = lambda: {'third_party/WebKit/LayoutTests/my-test-expected.txt': '?'}
         return_code = self.command.execute(self.command_options(), [], self.tool)
         self.assertEqual(return_code, 1)
         self.assertLog([
             'ERROR: Aborting: there are unstaged baselines:\n',
             'ERROR:   /mock-checkout/third_party/WebKit/LayoutTests/my-test-expected.txt\n',
         ])