Index: tools/json_schema_compiler/model_test.py |
diff --git a/tools/json_schema_compiler/model_test.py b/tools/json_schema_compiler/model_test.py |
index 577b3ca53c7cc9095789a24c9982f7c2fc88a0b7..0a1518721319c6b94321804e8d2df3a1072d055d 100755 |
--- a/tools/json_schema_compiler/model_test.py |
+++ b/tools/json_schema_compiler/model_test.py |
@@ -32,25 +32,26 @@ class ModelTest(unittest.TestCase): |
sorted(self.permissions.functions.keys())) |
def testHasTypes(self): |
- self.assertEquals(['Tab'], self.tabs.types.keys()) |
- self.assertEquals(['Permissions'], self.permissions.types.keys()) |
- self.assertEquals(['Window'], self.windows.types.keys()) |
+ self.assertEquals(['tabs.Tab'], self.tabs.types.keys()) |
+ self.assertEquals(['permissions.Permissions'], |
+ self.permissions.types.keys()) |
+ self.assertEquals(['windows.Window'], self.windows.types.keys()) |
def testHasProperties(self): |
self.assertEquals(["active", "favIconUrl", "highlighted", "id", |
"incognito", "index", "pinned", "selected", "status", "title", "url", |
"windowId"], |
- sorted(self.tabs.types['Tab'].properties.keys())) |
+ sorted(self.tabs.types['tabs.Tab'].properties.keys())) |
def testProperties(self): |
- string_prop = self.tabs.types['Tab'].properties['status'] |
+ string_prop = self.tabs.types['tabs.Tab'].properties['status'] |
self.assertEquals(model.PropertyType.STRING, string_prop.type_) |
- integer_prop = self.tabs.types['Tab'].properties['id'] |
+ integer_prop = self.tabs.types['tabs.Tab'].properties['id'] |
self.assertEquals(model.PropertyType.INTEGER, integer_prop.type_) |
- array_prop = self.windows.types['Window'].properties['tabs'] |
+ array_prop = self.windows.types['windows.Window'].properties['tabs'] |
self.assertEquals(model.PropertyType.ARRAY, array_prop.type_) |
self.assertEquals(model.PropertyType.REF, array_prop.item_type.type_) |
- self.assertEquals('Tab', array_prop.item_type.ref_type) |
+ self.assertEquals('tabs.Tab', array_prop.item_type.ref_type) |
object_prop = self.tabs.functions['query'].params[0] |
self.assertEquals(model.PropertyType.OBJECT, object_prop.type_) |
self.assertEquals( |