Dynamically generate a heading for Extension Docs API pages

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

Index: chrome/common/extensions/docs/server2/branch_utility_test.py
diff --git a/chrome/common/extensions/docs/server2/branch_utility_test.py b/chrome/common/extensions/docs/server2/branch_utility_test.py
index c3735caec009ba7fbc5c2146f717082377f606d9..626aedb1036ca65693c368942166b36226de0871 100755
--- a/chrome/common/extensions/docs/server2/branch_utility_test.py
+++ b/chrome/common/extensions/docs/server2/branch_utility_test.py
@@ -45,14 +45,51 @@ class BranchUtilityTest(unittest.TestCase):
                       'stuff.html'))
 
   def testGetBranchNumberForChannelName(self):
+    self.assertEquals('dev',
+       self._branch_util.GetBranchAndVersionForChannelName('dev')['name'])
+    self.assertEquals('beta',
+       self._branch_util.GetBranchAndVersionForChannelName('beta')['name'])
+    self.assertEquals('stable',
+       self._branch_util.GetBranchAndVersionForChannelName('stable')['name'])
+    self.assertEquals('trunk',
+       self._branch_util.GetBranchAndVersionForChannelName('trunk')['name'])
+
     self.assertEquals('1145',
-                      self._branch_util.GetBranchNumberForChannelName('dev'))
+       self._branch_util.GetBranchAndVersionForChannelName('dev')['branch'])
     self.assertEquals('1084',
-                      self._branch_util.GetBranchNumberForChannelName('beta'))
+       self._branch_util.GetBranchAndVersionForChannelName('beta')['branch'])
     self.assertEquals('1084',
-                      self._branch_util.GetBranchNumberForChannelName('stable'))
+       self._branch_util.GetBranchAndVersionForChannelName('stable')['branch'])
     self.assertEquals('trunk',
-                      self._branch_util.GetBranchNumberForChannelName('trunk'))
+       self._branch_util.GetBranchAndVersionForChannelName('trunk')['branch'])
+
+    self.assertEquals('21',
+       self._branch_util.GetBranchAndVersionForChannelName('dev')['version'])
+    self.assertEquals('19',
+       self._branch_util.GetBranchAndVersionForChannelName('beta')['version'])
+    self.assertEquals('19',
+       self._branch_util.GetBranchAndVersionForChannelName('stable')['version'])
+    self.assertEquals('0',
+       self._branch_util.GetBranchAndVersionForChannelName('trunk')['version'])
+
+  def test_ExtractFromVersionJson(self):
+    self.assertEquals('1145',
+       self._branch_util._ExtractFromVersionJson('dev', 'branch'))
+    self.assertEquals('1084',
+       self._branch_util._ExtractFromVersionJson('beta', 'branch'))
+    self.assertEquals('1084',
+       self._branch_util._ExtractFromVersionJson('stable', 'branch'))
+    self.assertEquals('trunk',
+       self._branch_util._ExtractFromVersionJson('trunk', 'branch'))
+
+    self.assertEquals('21',
+       self._branch_util._ExtractFromVersionJson('dev', 'version'))
+    self.assertEquals('19',
+       self._branch_util._ExtractFromVersionJson('beta', 'version'))
+    self.assertEquals('19',
+       self._branch_util._ExtractFromVersionJson('stable', 'version'))
+    self.assertEquals('0',
+       self._branch_util._ExtractFromVersionJson('trunk', 'version'))
 
 if __name__ == '__main__':
   unittest.main()