Make the JSON-to-struct converter insert the root element name in the names of

the global arrays it generates.  This allows more than one prepopulated engine
to use an alternate_urls field.

BUG=none
TEST=none
R=kalman@chromium.org

Review URL: https://codereview.chromium.org/22339011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216309 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 25 insertions, 23 deletions

diff --git a/tools/json_to_struct/element_generator_test.py b/tools/json_to_struct/element_generator_test.py
index 484e83f..67459a1 100755
--- a/tools/json_to_struct/element_generator_test.py
+++ b/tools/json_to_struct/element_generator_test.py
@@ -10,70 +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)
+    GenerateFieldContent('', {'type': 'string', 'default': 'foo_bar'}, None,
+                         lines)
     self.assertEquals(['  "foo_bar",'], lines)
     lines = [];
-    GenerateFieldContent({'type': 'string', 'default': 'foo'}, 'bar\n', lines)
+    GenerateFieldContent('', {'type': 'string', 'default': 'foo'}, 'bar\n',
+                         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)
+    GenerateFieldContent('', {'type': 'string16',
+                              '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)
+    GenerateFieldContent('', {'type': 'string16', 'default': 'foo'},
+                         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({'type': 'array', 'contents': {'type': 'int'}},
+    GenerateFieldContent('test', {'type': 'array', 'contents': {'type': 'int'}},
                          None, lines)
     self.assertEquals(['STRUCT BEGINS', '  NULL,', '  0,'], lines)
     lines = ['STRUCT BEGINS'];
-    GenerateFieldContent({'field': 'my_array', 'type': 'array',
-                          'contents': {'type': 'int'}}, [3, 4], lines)
-    self.assertEquals('const int array_my_array[] = {\n' +
+    GenerateFieldContent('test', {'field': 'my_array', 'type': 'array',
+                                  'contents': {'type': 'int'}}, [3, 4], lines)
+    self.assertEquals('const int array_test_my_array[] = {\n' +
       '  3,\n' +
       '  4,\n' +
       '};\n' +
       'STRUCT BEGINS\n' +
-      '  array_my_array,\n' +
+      '  array_test_my_array,\n' +
       '  2,', '\n'.join(lines))
 
   def testGenerateElements(self):
@@ -115,7 +117,7 @@ class ElementGeneratorTest(unittest.TestCase):
                '  NULL,\n' +
                '  0,\n'
                '};\n',
-      'elem2': 'const wchar_t* const array_f3[] = {\n' +
+      'elem2': 'const wchar_t* const array_elem2_f3[] = {\n' +
                '  L"bar",\n' +
                '  L"foo",\n' +
                '};\n' +
@@ -123,7 +125,7 @@ class ElementGeneratorTest(unittest.TestCase):
                '  1000,\n' +
                '  "foo_bar",\n' +
                '  MAYBE,\n' +
-               '  array_f3,\n' +
+               '  array_elem2_f3,\n' +
                '  2,\n'
                '};\n'
     }