| Index: trunk/src/tools/json_schema_compiler/idl_schema_test.py
|
| ===================================================================
|
| --- trunk/src/tools/json_schema_compiler/idl_schema_test.py (revision 232015)
|
| +++ trunk/src/tools/json_schema_compiler/idl_schema_test.py (working copy)
|
| @@ -77,9 +77,7 @@
|
|
|
| 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']))
|
|
|
| @@ -164,12 +162,10 @@
|
| 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'])
|
|
|