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 8bc3bd0bb5a498ea027d9b325caaa6466b8b5c45..a8c1b7baf413a6756a185514a95b2ea4dfa6f430 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.GetChannelInfoForChannelName('dev').name) |
+ self.assertEquals('beta', |
+ self._branch_util.GetChannelInfoForChannelName('beta').name) |
+ self.assertEquals('stable', |
+ self._branch_util.GetChannelInfoForChannelName('stable').name) |
+ self.assertEquals('trunk', |
+ self._branch_util.GetChannelInfoForChannelName('trunk').name) |
+ |
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.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('trunk', |
+ 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('trunk', |
- self._branch_util.GetBranchNumberForChannelName('trunk')) |
+ self._branch_util._ExtractFromVersionJson('trunk', 'version')) |
if __name__ == '__main__': |
unittest.main() |