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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/json_to_struct/element_generator_test.py

Issue 1209733002: Add the ability to code generated prepopulated static nested structs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add test Created 5 years, 5 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_to_struct/element_generator.py ('k') | tools/json_to_struct/json_to_struct.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/json_to_struct/element_generator_test.py
diff --git a/tools/json_to_struct/element_generator_test.py b/tools/json_to_struct/element_generator_test.py
index 67459a1d8713f142ebbc8850d2978ed279e09bae..373338ebed1d6f85f7f76b07b5740a68f63bb3e8 100755
--- a/tools/json_to_struct/element_generator_test.py
+++ b/tools/json_to_struct/element_generator_test.py
@@ -10,66 +10,72 @@ import unittest
class ElementGeneratorTest(unittest.TestCase):
def testGenerateIntFieldContent(self):
lines = [];
- GenerateFieldContent('', {'type': 'int', 'default': 5}, None, lines)
+ GenerateFieldContent('', {'type': 'int', 'default': 5}, None, lines, ' ',
+ {})
self.assertEquals([' 5,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'int', 'default': 5}, 12, lines)
+ GenerateFieldContent('', {'type': 'int', 'default': 5}, 12, lines, ' ', {})
self.assertEquals([' 12,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'int'}, -3, lines)
+ GenerateFieldContent('', {'type': 'int'}, -3, lines, ' ', {})
self.assertEquals([' -3,'], lines)
def testGenerateStringFieldContent(self):
lines = [];
GenerateFieldContent('', {'type': 'string', 'default': 'foo_bar'}, None,
- lines)
+ lines, ' ', {})
self.assertEquals([' "foo_bar",'], lines)
lines = [];
GenerateFieldContent('', {'type': 'string', 'default': 'foo'}, 'bar\n',
- lines)
+ lines, ' ', {})
self.assertEquals([' "bar\\n",'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'string'}, None, lines)
+ GenerateFieldContent('', {'type': 'string'}, None, lines, ' ', {})
self.assertEquals([' NULL,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'string'}, 'foo', lines)
+ GenerateFieldContent('', {'type': 'string'}, 'foo', lines, ' ', {})
self.assertEquals([' "foo",'], lines)
def testGenerateString16FieldContent(self):
lines = [];
GenerateFieldContent('', {'type': 'string16',
- 'default': u'f\u00d8\u00d81a'}, None, lines)
+ 'default': u'f\u00d8\u00d81a'},
+ None, lines, ' ', {})
self.assertEquals([' L"f\\x00d8" L"\\x00d8" L"1a",'], lines)
lines = [];
GenerateFieldContent('', {'type': 'string16', 'default': 'foo'},
- u'b\uc3a5r', lines)
+ u'b\uc3a5r', lines, ' ', {})
self.assertEquals([' L"b\\xc3a5" L"r",'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'string16'}, None, lines)
+ GenerateFieldContent('', {'type': 'string16'}, None, lines, ' ', {})
self.assertEquals([' NULL,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'string16'}, u'foo\\u1234', lines)
+ GenerateFieldContent('', {'type': 'string16'}, u'foo\\u1234', lines, ' ',
+ {})
self.assertEquals([' L"foo\\\\u1234",'], lines)
def testGenerateEnumFieldContent(self):
lines = [];
- GenerateFieldContent('', {'type': 'enum', 'default': 'RED'}, None, lines)
+ GenerateFieldContent('', {'type': 'enum', 'default': 'RED'}, None, lines,
+ ' ', {})
self.assertEquals([' RED,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'enum', 'default': 'RED'}, 'BLACK', lines)
+ GenerateFieldContent('', {'type': 'enum', 'default': 'RED'}, 'BLACK', lines,
+ ' ', {})
self.assertEquals([' BLACK,'], lines)
lines = [];
- GenerateFieldContent('', {'type': 'enum'}, 'BLUE', lines)
+ GenerateFieldContent('', {'type': 'enum'}, 'BLUE', lines, ' ', {})
self.assertEquals([' BLUE,'], lines)
def testGenerateArrayFieldContent(self):
lines = ['STRUCT BEGINS'];
GenerateFieldContent('test', {'type': 'array', 'contents': {'type': 'int'}},
- None, lines)
+ None, lines, ' ', {})
self.assertEquals(['STRUCT BEGINS', ' NULL,', ' 0,'], lines)
lines = ['STRUCT BEGINS'];
GenerateFieldContent('test', {'field': 'my_array', 'type': 'array',
- 'contents': {'type': 'int'}}, [3, 4], lines)
+ 'contents': {'type': 'int'}},
+ [3, 4], lines, ' ', {})
self.assertEquals('const int array_test_my_array[] = {\n' +
' 3,\n' +
' 4,\n' +
@@ -77,6 +83,17 @@ class ElementGeneratorTest(unittest.TestCase):
'STRUCT BEGINS\n' +
' array_test_my_array,\n' +
' 2,', '\n'.join(lines))
+ lines = ['STRUCT BEGINS'];
+ GenerateFieldContent('test', {'field': 'my_array', 'type': 'array',
+ 'contents': {'type': 'int'}},
+ [3, 4], lines, ' ', {'array_test_my_array': 1})
+ self.assertEquals('const int array_test_my_array_1[] = {\n' +
+ ' 3,\n' +
+ ' 4,\n' +
+ '};\n' +
+ 'STRUCT BEGINS\n' +
+ ' array_test_my_array_1,\n' +
+ ' 2,', '\n'.join(lines))
def testGenerateElements(self):
schema = [
@@ -85,14 +102,38 @@ class ElementGeneratorTest(unittest.TestCase):
{'field': 'f2', 'type': 'enum', 'ctype': 'QuasiBool', 'default': 'MAYBE',
'optional': True},
{'field': 'f3', 'type': 'array', 'contents': {'type': 'string16'},
- 'optional': True}
+ 'optional': True},
+ {
+ 'field': 'f4',
+ 'type': 'struct',
+ 'type_name': 'InnerType',
+ 'fields': [
+ {'field': 'g0', 'type': 'string'}
+ ],
+ 'optional': True
+ },
+ {
+ 'field': 'f5',
+ 'type': 'array',
+ 'contents': {
+ 'type': 'struct',
+ 'type_name': 'InnerType',
+ 'fields': [
+ {'field': 'a0', 'type': 'string'},
+ {'field': 'a1', 'type': 'string'}
+ ]
+ },
+ 'optional': True
+ }
]
description = {
'int_variables': {'a': -5, 'b': 5},
'elements': {
'elem0': {'f0': 5, 'f1': 'foo', 'f2': 'SURE'},
'elem1': {'f2': 'NOWAY', 'f0': -2, 'f1': 'bar'},
- 'elem2': {'f1': 'foo_bar', 'f3': [u'bar', u'foo']}
+ 'elem2': {'f1': 'foo_bar', 'f3': [u'bar', u'foo']},
+ 'elem3': {'f1': 'foo', 'f4': {'g0': 'test'}},
+ 'elem4': {'f1': 'foo', 'f5': [{'a0': 'test0', 'a1': 'test1'}]},
}
}
@@ -103,30 +144,67 @@ class ElementGeneratorTest(unittest.TestCase):
'b': 'const int b = 5;\n',
}
elements_expected = {
- 'elem0': 'const MyType elem0 = {\n' +
- ' 5,\n' +
- ' "foo",\n' +
- ' SURE,\n' +
- ' NULL,\n' +
+ 'elem0': 'const MyType elem0 = {\n'
+ ' 5,\n'
+ ' "foo",\n'
+ ' SURE,\n'
+ ' NULL,\n'
+ ' 0,\n'
+ ' {0},\n'
+ ' NULL,\n'
' 0,\n'
'};\n',
- 'elem1': 'const MyType elem1 = {\n' +
- ' -2,\n' +
- ' "bar",\n' +
- ' NOWAY,\n' +
- ' NULL,\n' +
+ 'elem1': 'const MyType elem1 = {\n'
+ ' -2,\n'
+ ' "bar",\n'
+ ' NOWAY,\n'
+ ' NULL,\n'
+ ' 0,\n'
+ ' {0},\n'
+ ' NULL,\n'
' 0,\n'
'};\n',
- 'elem2': 'const wchar_t* const array_elem2_f3[] = {\n' +
- ' L"bar",\n' +
- ' L"foo",\n' +
- '};\n' +
- 'const MyType elem2 = {\n' +
- ' 1000,\n' +
- ' "foo_bar",\n' +
- ' MAYBE,\n' +
- ' array_elem2_f3,\n' +
+ 'elem2': 'const wchar_t* const array_elem2_f3[] = {\n'
+ ' L"bar",\n'
+ ' L"foo",\n'
+ '};\n'
+ 'const MyType elem2 = {\n'
+ ' 1000,\n'
+ ' "foo_bar",\n'
+ ' MAYBE,\n'
+ ' array_elem2_f3,\n'
' 2,\n'
+ ' {0},\n'
+ ' NULL,\n'
+ ' 0,\n'
+ '};\n',
+ 'elem3': 'const MyType elem3 = {\n'
+ ' 1000,\n'
+ ' "foo",\n'
+ ' MAYBE,\n'
+ ' NULL,\n'
+ ' 0,\n'
+ ' {\n'
+ ' "test",\n'
+ ' },\n'
+ ' NULL,\n'
+ ' 0,\n'
+ '};\n',
+ 'elem4': 'const InnerType array_elem4_f5[] = {\n'
+ ' {\n'
+ ' "test0",\n'
+ ' "test1",\n'
+ ' },\n'
+ '};\n'
+ 'const MyType elem4 = {\n'
+ ' 1000,\n'
+ ' "foo",\n'
+ ' MAYBE,\n'
+ ' NULL,\n'
+ ' 0,\n'
+ ' {0},\n'
+ ' array_elem4_f5,\n'
+ ' 1,\n'
'};\n'
}
expected = ''
« no previous file with comments | « tools/json_to_struct/element_generator.py ('k') | tools/json_to_struct/json_to_struct.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698