Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/json_schema_compiler/cpp_type_generator_test.py

Issue 9866050: Update expectations in a json_schema_compiler unit test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed new problems from crrev.com/129251 Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/json_schema_compiler/cpp_type_generator.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/json_schema_compiler/cpp_type_generator_test.py
diff --git a/tools/json_schema_compiler/cpp_type_generator_test.py b/tools/json_schema_compiler/cpp_type_generator_test.py
index ca40815b9c249048def15dfb09ef37be0c215919..bc1144dafa020ab8e2ddba1608c3113f3232c7bc 100644
--- a/tools/json_schema_compiler/cpp_type_generator_test.py
+++ b/tools/json_schema_compiler/cpp_type_generator_test.py
@@ -24,21 +24,26 @@ class CppTypeGeneratorTest(unittest.TestCase):
self.tabs = self.model.namespaces.get('tabs')
def testGenerateIncludesAndForwardDeclarations(self):
- manager = CppTypeGenerator('', self.windows, 'windows_api')
- manager.AddNamespace(self.tabs, 'tabs_api')
- self.assertEquals('#include "path/to/tabs_api.h"',
+ manager = CppTypeGenerator('', self.windows, self.windows.unix_name)
+ manager.AddNamespace(self.tabs, self.tabs.unix_name)
+ self.assertEquals('#include "path/to/tabs.h"',
manager.GenerateIncludes().Render())
self.assertEquals(
'namespace tabs {\n'
'struct Tab;\n'
- '}',
+ '}\n'
+ 'namespace windows {\n'
+ 'struct Window;\n'
+ '} // windows',
manager.GenerateForwardDeclarations().Render())
- manager = CppTypeGenerator('', self.permissions, 'permissions_api')
- manager.AddNamespace(self.permissions, 'permissions_api')
+ manager = CppTypeGenerator('', self.permissions, self.permissions.unix_name)
self.assertEquals('', manager.GenerateIncludes().Render())
- self.assertEquals('', manager.GenerateForwardDeclarations().Render())
+ self.assertEquals('namespace permissions {\n'
+ 'struct Permissions;\n'
+ '} // permissions',
+ manager.GenerateForwardDeclarations().Render())
- def testGenerateIncludesAndForwardDeclaratiosnMultipleTypes(self):
+ def testGenerateIncludesAndForwardDeclarationsMultipleTypes(self):
m = model.Model()
self.tabs_json[0]['types'].append(self.permissions_json[0]['types'][0])
tabs_namespace = m.AddNamespace(self.tabs_json[0],
@@ -47,19 +52,22 @@ class CppTypeGeneratorTest(unittest.TestCase):
self.permissions_json[0]['functions'][1])
windows = m.AddNamespace(self.windows_json[0],
'path/to/windows.json')
- manager = CppTypeGenerator('', windows, 'windows_api')
- manager.AddNamespace(tabs_namespace, 'tabs_api')
- self.assertEquals('#include "path/to/tabs_api.h"',
+ manager = CppTypeGenerator('', windows, self.windows.unix_name)
+ manager.AddNamespace(tabs_namespace, self.tabs.unix_name)
+ self.assertEquals('#include "path/to/tabs.h"',
manager.GenerateIncludes().Render())
self.assertEquals(
'namespace tabs {\n'
'struct Tab;\n'
'struct Permissions;\n'
- '}',
+ '}\n'
+ 'namespace windows {\n'
+ 'struct Window;\n'
+ '} // windows',
manager.GenerateForwardDeclarations().Render())
def testChoicesEnum(self):
- manager = CppTypeGenerator('', self.tabs, 'tabs_api')
+ manager = CppTypeGenerator('', self.tabs, self.tabs.unix_name)
prop = self.tabs.functions['move'].params[0]
self.assertEquals('TAB_IDS_ARRAY',
manager.GetEnumValue(prop, model.PropertyType.ARRAY.name))
@@ -69,7 +77,7 @@ class CppTypeGeneratorTest(unittest.TestCase):
manager.GetChoicesEnumType(prop))
def testGetTypeSimple(self):
- manager = CppTypeGenerator('', self.tabs, 'tabs_api')
+ manager = CppTypeGenerator('', self.tabs, self.tabs.unix_name)
self.assertEquals('int',
manager.GetType(
self.tabs.types['Tab'].properties['id']))
@@ -81,42 +89,42 @@ class CppTypeGeneratorTest(unittest.TestCase):
self.tabs.types['Tab'].properties['selected']))
def testGetTypeArray(self):
- manager = CppTypeGenerator('', self.windows, 'windows_api')
+ manager = CppTypeGenerator('', self.windows, self.windows.unix_name)
self.assertEquals('std::vector<linked_ptr<Window> >',
manager.GetType(
self.windows.functions['getAll'].callback.params[0]))
- manager = CppTypeGenerator('', self.permissions, 'permissions_api')
+ manager = CppTypeGenerator('', self.permissions, self.permissions.unix_name)
self.assertEquals('std::vector<std::string>',
manager.GetType(
self.permissions.types['Permissions'].properties['origins']))
def testGetTypeLocalRef(self):
- manager = CppTypeGenerator('', self.tabs, 'tabs_api')
+ manager = CppTypeGenerator('', self.tabs, self.tabs.unix_name)
self.assertEquals('Tab',
manager.GetType(
self.tabs.functions['get'].callback.params[0]))
def testGetTypeIncludedRef(self):
- manager = CppTypeGenerator('', self.windows, 'windows_api')
- manager.AddNamespace(self.tabs, 'tabs_api')
- self.assertEquals('std::vector<linked_ptr<tabs_api::Tab> >',
+ manager = CppTypeGenerator('', self.windows, self.windows.unix_name)
+ manager.AddNamespace(self.tabs, self.tabs.unix_name)
+ self.assertEquals('std::vector<linked_ptr<tabs::Tab> >',
manager.GetType(
self.windows.types['Window'].properties['tabs']))
def testGetTypeNotfound(self):
prop = self.windows.types['Window'].properties['tabs'].item_type
prop.ref_type = 'Something'
- manager = CppTypeGenerator('', self.windows, 'windows_api')
+ manager = CppTypeGenerator('', self.windows, self.windows.unix_name)
self.assertRaises(KeyError, manager.GetType, prop)
def testGetTypeNotimplemented(self):
prop = self.windows.types['Window'].properties['tabs'].item_type
prop.type_ = 10
- manager = CppTypeGenerator('', self.windows, 'windows_api')
+ manager = CppTypeGenerator('', self.windows, self.windows.unix_name)
self.assertRaises(NotImplementedError, manager.GetType, prop)
def testGetTypeWithPadForGeneric(self):
- manager = CppTypeGenerator('', self.permissions, 'permissions_api')
+ manager = CppTypeGenerator('', self.permissions, self.permissions.unix_name)
self.assertEquals('std::vector<std::string> ',
manager.GetType(
self.permissions.types['Permissions'].properties['origins'],
@@ -128,16 +136,16 @@ class CppTypeGeneratorTest(unittest.TestCase):
def testNamespaceDeclaration(self):
manager = CppTypeGenerator('extensions', self.permissions,
- 'permissions_api')
+ self.permissions.unix_name)
self.assertEquals(
'namespace extensions {',
manager.GetRootNamespaceStart().Render())
manager = CppTypeGenerator('extensions::gen::api', self.permissions,
- 'permissions_api')
- self.assertEquals('namespace permissions_api {',
+ self.permissions.unix_name)
+ self.assertEquals('namespace permissions {',
manager.GetNamespaceStart().Render())
- self.assertEquals('} // permissions_api',
+ self.assertEquals('} // permissions',
manager.GetNamespaceEnd().Render())
self.assertEquals(
'namespace extensions {\n'
@@ -152,7 +160,7 @@ class CppTypeGeneratorTest(unittest.TestCase):
def testExpandChoicesInParams(self):
manager = CppTypeGenerator('extensions', self.tabs,
- 'tabs_api')
+ self.tabs.unix_name)
props = self.tabs.functions['move'].params
self.assertEquals(2, len(props))
self.assertEquals(3, len(manager.GetExpandedChoicesInParams(props)))
« no previous file with comments | « tools/json_schema_compiler/cpp_type_generator.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698