Docserver: refactor Servlet, ObjectStore, and ServerInstance architecture to

chrome/common/extensions/docs/server2/branch_utility_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 os
 import sys
 import unittest
 
 from branch_utility import BranchUtility
 from fake_url_fetcher import FakeUrlFetcher
+from object_store_creator import ObjectStoreCreator
 from test_object_store import TestObjectStore
 
 class BranchUtilityTest(unittest.TestCase):
   def setUp(self):
     self._branch_util = BranchUtility(
         os.path.join('branch_utility', 'first.json'),
         FakeUrlFetcher(os.path.join(sys.path[0], 'test_data')),
-        object_store=TestObjectStore('test'))
+        ObjectStoreCreator.ForTest())
 
   def testSplitChannelNameFromPath(self):
     self.assertEquals(('stable', 'extensions/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'stable/extensions/stuff.html'))
     self.assertEquals(('dev', 'extensions/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'dev/extensions/stuff.html'))
     self.assertEquals(('beta', 'extensions/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'beta/extensions/stuff.html'))
     self.assertEquals(('trunk', 'extensions/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'trunk/extensions/stuff.html'))
     self.assertEquals((None, 'extensions/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'extensions/stuff.html'))
     self.assertEquals((None, 'apps/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'apps/stuff.html'))
     self.assertEquals((None, 'extensions/dev/stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'extensions/dev/stuff.html'))
     self.assertEquals((None, 'stuff.html'),
                       self._branch_util.SplitChannelNameFromPath(
                       'stuff.html'))
 
-  def testGetBranchNumberForChannelName(self):
-    self.assertEquals('1145',
-                      self._branch_util.GetBranchNumberForChannelName('dev'))
-    self.assertEquals('1084',
-                      self._branch_util.GetBranchNumberForChannelName('beta'))
-    self.assertEquals('1084',
-                      self._branch_util.GetBranchNumberForChannelName('stable'))
-    self.assertEquals('trunk',
-                      self._branch_util.GetBranchNumberForChannelName('trunk'))
+  def testGetBranchForChannel(self):
+    self.assertEquals('1145', self._branch_util.GetBranchForChannel('dev'))
+    self.assertEquals('1084', self._branch_util.GetBranchForChannel('beta'))
+    self.assertEquals('1084', self._branch_util.GetBranchForChannel('stable'))
+    self.assertEquals('trunk', self._branch_util.GetBranchForChannel('trunk'))
 
 if __name__ == '__main__':
   unittest.main()