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..4804d05f43a3ab8ec020752f0f689ca04d2c5066 100755 |
--- a/chrome/common/extensions/docs/server2/branch_utility_test.py |
+++ b/chrome/common/extensions/docs/server2/branch_utility_test.py |
@@ -46,13 +46,41 @@ class BranchUtilityTest(unittest.TestCase): |
def testGetBranchNumberForChannelName(self): |
self.assertEquals('1145', |
- self._branch_util.GetBranchNumberForChannelName('dev')) |
+ self._branch_util.GetChannelInfoForChannelName('dev')['branch']) |
self.assertEquals('1084', |
- self._branch_util.GetBranchNumberForChannelName('beta')) |
+ self._branch_util.GetChannelInfoForChannelName('beta')['branch']) |
self.assertEquals('1084', |
- self._branch_util.GetBranchNumberForChannelName('stable')) |
+ self._branch_util.GetChannelInfoForChannelName('stable')['branch']) |
self.assertEquals('trunk', |
- self._branch_util.GetBranchNumberForChannelName('trunk')) |
+ self._branch_util.GetChannelInfoForChannelName('trunk')['branch']) |
+ |
+ self.assertEquals('21', |
+ self._branch_util.GetChannelInfoForChannelName('dev')['version']) |
+ self.assertEquals('19', |
+ self._branch_util.GetChannelInfoForChannelName('beta')['version']) |
+ self.assertEquals('19', |
+ self._branch_util.GetChannelInfoForChannelName('stable')['version']) |
+ self.assertEquals('0', |
+ self._branch_util.GetChannelInfoForChannelName('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() |