headless: Ensure all commands have parameters and return types

headless/lib/browser/client_api_generator_unittest.py

 # Copyright 2016 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 argparse
 import client_api_generator
 import shutil
 import sys
 import tempfile
 import unittest
@@ skipping 352 matching lines @@
             }
           ],
           'events': [
             {
               'name': 'BarEvent',
             }
           ]
         }
       ]
     }
-    expected_types = [
-      {
-        'type': 'object',
-        'id': 'FooCommandParams',
-        'description': 'Parameters for the FooCommand command.',
-        'properties': [],
-      },
-      {
-        'type': 'object',
-        'id': 'FooCommandResult',
-        'description': 'Result for the FooCommand command.',
-        'properties': [],
-      },
-      {
-        'type': 'object',
-        'id': 'BarEventParams',
-        'description': 'Parameters for the BarEvent event.',
-        'properties': [],
-      }
-    ]
     client_api_generator.PatchExperimentalCommandsAndEvents(json_api)
-    client_api_generator.SynthesizeCommandTypes(json_api)
-    client_api_generator.SynthesizeEventTypes(json_api)
     for command in json_api['domains'][0]['commands']:
       self.assertTrue(command['experimental'])
     for event in json_api['domains'][0]['events']:
       self.assertTrue(command['experimental'])
-    types = json_api['domains'][0]['types']
-    self.assertListEqual(types, expected_types)
 
-  def test_PatchExperimentalCommandsAndEvents(self):
+  def test_EnsureCommandsHaveParametersAndReturnTypes(self):
     json_api = {
       'domains': [
         {
           'domain': 'domain',
           'commands': [
             {
               'name': 'FooCommand',
-              'experimental': True,
             }
           ],
           'events': [
             {
               'name': 'BarEvent',
-              'experimental': True,
             }
           ]
         }
       ]
     }
     expected_types = [
       {
         'type': 'object',
         'id': 'FooCommandParams',
         'description': 'Parameters for the FooCommand command.',
         'properties': [],
       },
       {
         'type': 'object',
         'id': 'FooCommandResult',
         'description': 'Result for the FooCommand command.',
         'properties': [],
       },
       {
         'type': 'object',
         'id': 'BarEventParams',
         'description': 'Parameters for the BarEvent event.',
         'properties': [],
       }
     ]
-    client_api_generator.PatchExperimentalCommandsAndEvents(json_api)
+    client_api_generator.EnsureCommandsHaveParametersAndReturnTypes(json_api)
     client_api_generator.SynthesizeCommandTypes(json_api)
     client_api_generator.SynthesizeEventTypes(json_api)
-    for command in json_api['domains'][0]['commands']:
-      self.assertTrue(command['experimental'])
-    for event in json_api['domains'][0]['events']:
-      self.assertTrue(command['experimental'])
     types = json_api['domains'][0]['types']
     self.assertListEqual(types, expected_types)
 
   def test_Generate(self):
     json_api = {
       'domains': [
         {
           'domain': 'domain',
           'types': [
             {
@@ skipping 67 matching lines @@
 
 
 if __name__ == '__main__':
   cmdline_parser = argparse.ArgumentParser()
   cmdline_parser.add_argument('--stamp')
   args = cmdline_parser.parse_args()
   unittest.main(verbosity=2, exit=False, argv=sys.argv[:1])
   if args.stamp:
     with open(args.stamp, 'a') as f:
       pass