| Index: chrome/common/extensions/docs/server2/availability_finder_test.py
|
| diff --git a/chrome/common/extensions/docs/server2/availability_finder_test.py b/chrome/common/extensions/docs/server2/availability_finder_test.py
|
| index 3db6ab127418c71252c741eb2a0941077a505164..860a58a0be45a1ec6b32f2f9dc149db3933f64b5 100755
|
| --- a/chrome/common/extensions/docs/server2/availability_finder_test.py
|
| +++ b/chrome/common/extensions/docs/server2/availability_finder_test.py
|
| @@ -188,9 +188,16 @@ class AvailabilityFinderTest(unittest.TestCase):
|
| only_on='apps')
|
|
|
| def testGetAPINodeAvailability(self):
|
| + def assertEquals(found, channel_info, actual, scheduled=None):
|
| + lookup_result = api_schema_graph.LookupResult
|
| + if channel_info is None:
|
| + self.assertEquals(lookup_result(found, None), actual)
|
| + else:
|
| + self.assertEquals(lookup_result(found, AvailabilityInfo(channel_info,
|
| + scheduled=scheduled)), actual)
|
| +
|
| for platform in GetPlatforms():
|
| # Allow the LookupResult constructions below to take just one line.
|
| - lookup_result = api_schema_graph.LookupResult
|
| avail_finder = self._create_availability_finder(
|
| self._node_fs_creator,
|
| self._node_fs_iterator,
|
| @@ -198,115 +205,78 @@ class AvailabilityFinderTest(unittest.TestCase):
|
| tabs_graph = avail_finder.GetAPINodeAvailability('tabs')
|
| fake_tabs_graph = avail_finder.GetAPINodeAvailability('fakeTabs')
|
|
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('trunk')),
|
| - tabs_graph.Lookup('tabs', 'properties',
|
| - 'fakeTabsProperty3'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('dev')),
|
| - tabs_graph.Lookup('tabs', 'events', 'onActivated',
|
| - 'parameters', 'activeInfo', 'properties',
|
| - 'windowId'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('dev')),
|
| - tabs_graph.Lookup('tabs', 'events', 'onUpdated', 'parameters',
|
| - 'tab'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('beta')),
|
| - tabs_graph.Lookup('tabs', 'events','onActivated'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('beta')),
|
| - tabs_graph.Lookup('tabs', 'functions', 'get', 'parameters',
|
| - 'tabId'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('stable')),
|
| - tabs_graph.Lookup('tabs', 'types', 'InjectDetails',
|
| - 'properties', 'code'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('stable')),
|
| - tabs_graph.Lookup('tabs', 'types', 'InjectDetails',
|
| - 'properties', 'file'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(25)),
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('trunk'),
|
| + tabs_graph.Lookup('tabs', 'properties', 'fakeTabsProperty3'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('dev'),
|
| + tabs_graph.Lookup('tabs', 'events', 'onActivated', 'parameters',
|
| + 'activeInfo', 'properties', 'windowId'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('dev'),
|
| + tabs_graph.Lookup('tabs', 'events', 'onUpdated', 'parameters', 'tab'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('beta'),
|
| + tabs_graph.Lookup('tabs', 'events', 'onActivated'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('beta'),
|
| + tabs_graph.Lookup('tabs', 'functions', 'get', 'parameters', 'tabId'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('stable'),
|
| + tabs_graph.Lookup('tabs', 'types', 'InjectDetails', 'properties',
|
| + 'code'))
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('stable'),
|
| + tabs_graph.Lookup('tabs', 'types', 'InjectDetails', 'properties',
|
| + 'file'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(25),
|
| tabs_graph.Lookup('tabs', 'types', 'InjectDetails'))
|
|
|
| # Test inlined type.
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetChannelInfo('trunk')),
|
| + assertEquals(True, self._branch_utility.GetChannelInfo('trunk'),
|
| tabs_graph.Lookup('tabs', 'types', 'InlinedType'))
|
|
|
| # Test implicitly inlined type.
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(25)),
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(25),
|
| fake_tabs_graph.Lookup('fakeTabs', 'types',
|
| - 'WasImplicitlyInlinedType'))
|
| + 'WasImplicitlyInlinedType'))
|
|
|
| # Nothing new in version 24 or 23.
|
|
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(22)),
|
| - tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties',
|
| - 'windowId'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(21)),
|
| - tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties',
|
| - 'selected'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(22),
|
| + tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties', 'windowId'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(21),
|
| + tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties', 'selected'))
|
|
|
| # Nothing new in version 20.
|
|
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(19)),
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(19),
|
| tabs_graph.Lookup('tabs', 'functions', 'getCurrent'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(18)),
|
| - tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties',
|
| - 'index'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(17)),
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(18),
|
| + tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties', 'index'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(17),
|
| tabs_graph.Lookup('tabs', 'events', 'onUpdated', 'parameters',
|
| - 'changeInfo'))
|
| + 'changeInfo'))
|
|
|
| # Nothing new in version 16.
|
|
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(15)),
|
| - tabs_graph.Lookup('tabs', 'properties',
|
| - 'fakeTabsProperty2'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(15),
|
| + tabs_graph.Lookup('tabs', 'properties', 'fakeTabsProperty2'))
|
|
|
| # Everything else is available at the API's release, version 14 here.
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(14)),
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(14),
|
| tabs_graph.Lookup('tabs', 'types', 'Tab'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(14)),
|
| - tabs_graph.Lookup('tabs', 'types', 'Tab',
|
| - 'properties', 'url'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(14)),
|
| - tabs_graph.Lookup('tabs', 'properties',
|
| - 'fakeTabsProperty1'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(14)),
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(14),
|
| + tabs_graph.Lookup('tabs', 'types', 'Tab', 'properties', 'url'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(14),
|
| + tabs_graph.Lookup('tabs', 'properties', 'fakeTabsProperty1'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(14),
|
| tabs_graph.Lookup('tabs', 'functions', 'get', 'parameters',
|
| - 'callback'))
|
| - self.assertEquals(
|
| - lookup_result(True, self._branch_utility.GetStableChannelInfo(14)),
|
| + 'callback'))
|
| + assertEquals(True, self._branch_utility.GetStableChannelInfo(14),
|
| tabs_graph.Lookup('tabs', 'events', 'onUpdated'))
|
|
|
| # Test things that aren't available.
|
| - self.assertEqual(lookup_result(False, None),
|
| - tabs_graph.Lookup('tabs', 'types',
|
| - 'UpdateInfo'))
|
| - self.assertEqual(lookup_result(False, None),
|
| - tabs_graph.Lookup('tabs', 'functions', 'get',
|
| - 'parameters', 'callback',
|
| - 'parameters', 'tab', 'id'))
|
| - self.assertEqual(lookup_result(False, None),
|
| - tabs_graph.Lookup('functions'))
|
| - self.assertEqual(lookup_result(False, None),
|
| - tabs_graph.Lookup('events', 'onActivated',
|
| - 'parameters', 'activeInfo',
|
| - 'tabId'))
|
| + assertEquals(False, None, tabs_graph.Lookup('tabs', 'types',
|
| + 'UpdateInfo'))
|
| + assertEquals(False, None, tabs_graph.Lookup('tabs', 'functions', 'get',
|
| + 'parameters', 'callback', 'parameters', 'tab', 'id'))
|
| + assertEquals(False, None, tabs_graph.Lookup('functions'))
|
| + assertEquals(False, None, tabs_graph.Lookup('events', 'onActivated',
|
| + 'parameters', 'activeInfo', 'tabId'))
|
|
|
|
|
| if __name__ == '__main__':
|
|
|