[Extension API Extern Generation] Fix array, choices specification

tools/json_schema_compiler/js_externs_generator_test.py

 #!/usr/bin/env python
 # Copyright 2015 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
 from js_externs_generator import JsExternsGenerator
 from datetime import datetime
 import model
 import unittest
@@ skipping 16 matching lines @@
 
   dictionary Bar {
     long num;
   };
 
   dictionary Baz {
     DOMString str;
     long num;
     boolean b;
     Greek letter;
+    Greek? optionalLetter;
     long[] arr;
+    Bar[]? optionalObjArr;
+    Greek[] enumArr;
+    any[] anythingGoes;
     Bar obj;
     long? maybe;
+    (DOMString or Greek or long[]) choice;
   };
 
   callback VoidCallback = void();
 
   interface Functions {
     // Does something exciting!
     // |baz| : The baz to use.
     static void doSomething(Baz baz, optional VoidCallback callback);
   };
 };
@@ skipping 26 matching lines @@
  *   num: number
  * }}
  */
 var Bar;
 
 /**
  * @typedef {{
  *   str: string,
  *   num: number,
  *   b: boolean,
- *   letter: chrome.fakeApi.Greek,
- *   arr: Array,
+ *   letter: !chrome.fakeApi.Greek,
+ *   optionalLetter: (!chrome.fakeApi.Greek|undefined),
+ *   arr: !Array<number>,
+ *   optionalObjArr: (!Array<Bar>|undefined),
+ *   enumArr: !Array<!chrome.fakeApi.Greek>,
+ *   anythingGoes: !Array<*>,
  *   obj: Bar,
- *   maybe: (number|undefined)
+ *   maybe: (number|undefined),
+ *   choice: (string|!chrome.fakeApi.Greek|!Array<number>)
  * }}
  */
 var Baz;
 
 /**
  * Does something exciting!
  * @param {Baz} baz The baz to use.
  * @param {Function=} callback
  */
 chrome.fakeApi.doSomething = function(baz, callback) {};
 """ % datetime.now().year
 
 
 class JsExternGeneratorTest(unittest.TestCase):
   def testBasic(self):
+    self.maxDiff = None # Lets us see the full diff when inequal.
     filename = 'fake_api.idl'
     api_def = idl_schema.Process(fake_idl, filename)
     m = model.Model()
     namespace = m.AddNamespace(api_def[0], filename)
-    self.assertEquals(expected_output,
-                      JsExternsGenerator().Generate(namespace).Render())
+    self.assertMultiLineEqual(expected_output,
+                              JsExternsGenerator().Generate(namespace).Render())
 
 
 if __name__ == '__main__':
   unittest.main()