Revert 231982 "Docserver: Display enum value descriptions in API..."

trunk/src/tools/json_schema_compiler/idl_schema_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import idl_schema
 import unittest
 
 def getFunction(schema, name):
   for item in schema['functions']:
@@ skipping 59 matching lines @@
         'c': {'name': 'c', 'type': 'string'}},
       getType(self.idl_basics, 'MyType1')['properties'])
 
   def testMemberOrdering(self):
     self.assertEquals(
         ['x', 'y', 'z', 'a', 'b', 'c'],
         getType(self.idl_basics, 'MyType1')['properties'].keys())
 
   def testEnum(self):
     schema = self.idl_basics
-    expected = {'enum': [{'name': 'name1', 'description': 'comment1'},
-                         {'name': 'name2'}],
-                'description': 'Enum description',
+    expected = {'enum': ['name1', 'name2'], 'description': 'Enum description',
                 'type': 'string', 'id': 'EnumType'}
     self.assertEquals(expected, getType(schema, expected['id']))
 
     expected = [{'name':'type', '$ref':'EnumType'},
                 {'type':'function', 'name':'cb',
                   'parameters':[{'name':'type', '$ref':'EnumType'}]}]
     self.assertEquals(expected, getParams(schema, 'function13'))
 
     expected = [{'items': {'$ref': 'EnumType'}, 'name': 'types',
                  'type': 'array'}]
@@ skipping 64 matching lines @@
         func['parameters'])
     func = getFunction(schema, 'function4')
     self.assertEquals(('This tests if "double-quotes" are escaped correctly.'
                        '<br/><br/> It also tests a comment with two newlines.'),
                       func['description'])
 
   def testReservedWords(self):
     schema = idl_schema.Load('test/idl_reserved_words.idl')[0]
 
     foo_type = getType(schema, 'Foo')
-    self.assertEquals([{'name': 'float'}, {'name': 'DOMString'}],
-                      foo_type['enum'])
+    self.assertEquals(['float', 'DOMString'], foo_type['enum'])
 
     enum_type = getType(schema, 'enum')
-    self.assertEquals([{'name': 'callback'}, {'name': 'namespace'}],
-                      enum_type['enum'])
+    self.assertEquals(['callback', 'namespace'], enum_type['enum'])
 
     dictionary = getType(schema, 'dictionary')
     self.assertEquals('integer', dictionary['properties']['long']['type'])
 
     mytype = getType(schema, 'MyType')
     self.assertEquals('string', mytype['properties']['interface']['type'])
 
     params = getParams(schema, 'static')
     self.assertEquals('Foo', params[0]['$ref'])
     self.assertEquals('enum', params[1]['$ref'])
 
 
 if __name__ == '__main__':
   unittest.main()