From 21ffc56f7c207883d828d54298cc1b42dfa0db14 Mon Sep 17 00:00:00 2001 From: "ahernandez.miralles@gmail.com" Date: Sat, 29 Mar 2014 00:11:57 +0000 Subject: Remove ReferenceResolver dependency in APIDataSource. This is the first step towards moving APIDataSource to DataSourceRegistry BUG=275039 NOTRY=true Review URL: https://codereview.chromium.org/216943006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260316 0039d316-1c4b-4281-b951-d872f2087c98 --- .../docs/server2/api_data_source_test.py | 34 ---------------------- 1 file changed, 34 deletions(-) (limited to 'chrome/common/extensions/docs/server2/api_data_source_test.py') diff --git a/chrome/common/extensions/docs/server2/api_data_source_test.py b/chrome/common/extensions/docs/server2/api_data_source_test.py index 73c08b4..9d0a537 100755 --- a/chrome/common/extensions/docs/server2/api_data_source_test.py +++ b/chrome/common/extensions/docs/server2/api_data_source_test.py @@ -18,7 +18,6 @@ from features_bundle import FeaturesBundle from file_system import FileNotFoundError from future import Future from object_store_creator import ObjectStoreCreator -from reference_resolver import ReferenceResolver from server_instance import ServerInstance from test_data.canned_data import (CANNED_API_FILE_SYSTEM_DATA, CANNED_BRANCHES) from test_data.api_data_source.canned_trunk_fs import CANNED_TRUNK_FS_DATA @@ -115,19 +114,12 @@ class APIDataSourceTest(unittest.TestCase): with open(os.path.join(self._base_path, filename), 'r') as f: return f.read() - def _CreateRefResolver(self, filename): - test_data = self._LoadJSON(filename) - return ReferenceResolver.Factory(_FakeAPIDataSource(test_data), - _FakeAPIModels(test_data), - ObjectStoreCreator.ForTest()).Create() - def _LoadJSON(self, filename): return json.loads(self._ReadLocalFile(filename)) def testCreateId(self): dict_ = _JSCModel('tester', self._api_models, - self._CreateRefResolver('test_file_data_source.json'), False, _FakeAvailabilityFinder(), self._json_cache, @@ -146,7 +138,6 @@ class APIDataSourceTest(unittest.TestCase): dict_ = _JSCModel('tester', self._api_models, False, - self._CreateRefResolver('test_file_data_source.json'), _FakeAvailabilityFinder(), self._json_cache, _FakeTemplateCache(), @@ -159,28 +150,6 @@ class APIDataSourceTest(unittest.TestCase): self.assertEquals('67', _FormatValue(67)) self.assertEquals('234,567', _FormatValue(234567)) - def testFormatDescription(self): - dict_ = _JSCModel('ref_test', - self._api_models, - self._CreateRefResolver('ref_test_data_source.json'), - False, - _FakeAvailabilityFinder(), - self._json_cache, - _FakeTemplateCache(), - self._features_bundle, - None).ToDict() - self.assertEquals(_MakeLink('ref_test#type-type2', 'type2'), - _GetType(dict_, 'type1')['description']) - self.assertEquals( - 'A %s, or %s' % (_MakeLink('ref_test#type-type3', 'type3'), - _MakeLink('ref_test#type-type2', 'type2')), - _GetType(dict_, 'type2')['description']) - self.assertEquals( - '%s != %s' % (_MakeLink('other#type-type2', 'other.type2'), - _MakeLink('ref_test#type-type2', 'type2')), - _GetType(dict_, 'type3')['description']) - - def testGetApiAvailability(self): api_availabilities = { 'bluetooth': ChannelInfo('dev', CANNED_BRANCHES[28], 28), @@ -193,7 +162,6 @@ class APIDataSourceTest(unittest.TestCase): for api_name, availability in api_availabilities.iteritems(): model = _JSCModel(api_name, self._avail_api_models, - None, True, self._avail_finder, self._avail_json_cache, @@ -205,7 +173,6 @@ class APIDataSourceTest(unittest.TestCase): def testGetIntroList(self): model = _JSCModel('tester', self._api_models, - self._CreateRefResolver('test_file_data_source.json'), False, _FakeAvailabilityFinder(), self._json_cache, @@ -278,7 +245,6 @@ class APIDataSourceTest(unittest.TestCase): def testAddRules(self): dict_ = _JSCModel('add_rules_tester', self._api_models, - self._CreateRefResolver('test_file_data_source.json'), False, _FakeAvailabilityFinder(), self._json_cache, -- cgit v1.1