Fix WebBluetooth generator to distinguish between different methods.

third_party/WebKit/LayoutTests/bluetooth/generate.py

Index: third_party/WebKit/LayoutTests/bluetooth/generate.py
diff --git a/third_party/WebKit/LayoutTests/bluetooth/generate.py b/third_party/WebKit/LayoutTests/bluetooth/generate.py
index bf13888a4eab358fdd8351a8d0a9a9a30c0448e9..d39fe12df84cfa47489a4a2918a5f2cdc19f129c 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/generate.py
+++ b/third_party/WebKit/LayoutTests/bluetooth/generate.py
@@ -24,34 +24,33 @@ For example, for the following template file:
 
 // script-tests/example.js
 promise_test(() => {
-  return navigator.bluetooth.requestDevice(...)
-    .then(device => device.gatt.CALLS([
-      getPrimaryService('heart_rate')|
-      getPrimaryServices('heart_rate')[UUID]]))
-    .then(device => device.gatt.PREVIOUS_CALL);
+    return navigator.bluetooth.requestDevice(...)
+        .then(device => device.gatt.CALLS([
+            getPrimaryService('heart_rate')|
+            getPrimaryServices('heart_rate')[UUID]]))
+        .then(device => device.gatt.PREVIOUS_CALL);
 }, 'example test for FUNCTION_NAME');
 
 this script will generate:
 
 // getPrimaryService/example.html
 promise_test(() => {
-  return navigator.bluetooth.requestDevice(...)
-    .then(device => device.gatt.getPrimaryService('heart_rate'))
-    .then(device => device.gatt.getPrimaryService('heart_rate'));
+    return navigator.bluetooth.requestDevice(...)
+        .then(device => device.gatt.getPrimaryService('heart_rate'))
+        .then(device => device.gatt.getPrimaryService('heart_rate'));
 }, 'example test for getPrimaryService');
 
 // getPrimaryServices/example-with-uuid.html
 promise_test(() => {
-  return navigator.bluetooth.requestDevice(...)
-    .then(device => device.gatt.getPrimaryServices('heart_rate'))
-    .then(device => device.gatt.getPrimaryServices('heart_rate'));
+    return navigator.bluetooth.requestDevice(...)
+        .then(device => device.gatt.getPrimaryServices('heart_rate'))
+        .then(device => device.gatt.getPrimaryServices('heart_rate'));
 }, 'example test for getPrimaryServices');
 
 Run
 $ python //third_party/WebKit/LayoutTests/bluetooth/generate.py
 and commit the generated files.
 """
-import glob
 import os
 import re
 import sys
@@ -61,87 +60,88 @@ TEMPLATES_DIR = 'script-tests'
 
 class GeneratedTest:
 
-  def __init__(self, data, path, template):
-    self.data = data
-    self.path = path
-    self.template = template
+    def __init__(self, data, path, template):
+        self.data = data
+        self.path = path
+        self.template = template
 
 
 def GetGeneratedTests():
-  """Yields a GeneratedTest for each call in templates in script-tests."""
-  current_path = os.path.dirname(os.path.realpath(__file__))
+    """Yields a GeneratedTest for each call in templates in script-tests."""
+    current_path = os.path.dirname(os.path.realpath(__file__))
 
-  # Read Base Test Template.
-  base_template_file_handle = open(
-      os.path.join(current_path, TEMPLATES_DIR, 'base_test_template.html'))
-  base_template_file_data = base_template_file_handle.read().decode('utf-8')
-  base_template_file_handle.close()
+    # Read Base Test Template.
+    base_template_file_handle = open(
+        os.path.join(current_path, TEMPLATES_DIR, 'base_test_template.html'))
+    base_template_file_data = base_template_file_handle.read().decode('utf-8')
+    base_template_file_handle.close()
 
-  # Get Templates.
-  available_templates = glob.glob(
-      os.path.join(current_path, TEMPLATES_DIR, '*.js'))
+    # Get Templates.
 
-  # Generate Test Files
-  for template in available_templates:
-    # Read template
-    template_file_handle = open(template)
-    template_file_data = template_file_handle.read().decode('utf-8')
-    template_file_handle.close()
+    template_path = os.path.join(current_path, TEMPLATES_DIR)
+    print template_path

[ortuno, 2016/12/02 09:57:50]

nit: no need to print.

 
-    template_name = os.path.splitext(os.path.basename(template))[0]
+    available_templates = []
+    for root, _, files in os.walk(template_path):
+        for template in files:
+            if template.endswith('.js'):
+                available_templates.append(os.path.join(root, template))
 
-    result = re.search(r'CALLS\(\[(.*?)\]\)', template_file_data, re.MULTILINE
-                       | re.DOTALL)
+    # Generate Test Files
+    for template in available_templates:
+        # Read template
+        template_file_handle = open(template)
+        template_file_data = template_file_handle.read().decode('utf-8')
+        template_file_handle.close()
 
-    if result is None:
-      raise Exception('Template must contain \'CALLS\' tokens')
+        template_name = os.path.splitext(os.path.basename(template))[0]
 
-    new_test_file_data = base_template_file_data.replace('TEST',
-                                                         template_file_data)
-    # Replace CALLS([...]) with CALLS so that we don't have to replace the
-    # CALLS([...]) for every new test file.
-    new_test_file_data = new_test_file_data.replace(result.group(), 'CALLS')
+        result = re.search(r'CALLS\(\[(.*?)\]\)', template_file_data, re.MULTILINE | re.DOTALL)
 
-    # Replace 'PREVIOUS_CALL' with 'CALLS' so that we can replace it while
-    # replacing CALLS.
-    new_test_file_data = new_test_file_data.replace('PREVIOUS_CALL', 'CALLS')
+        if result is None:
+            raise Exception('Template must contain \'CALLS\' tokens')
 
-    calls = result.group(1)
-    calls = ''.join(calls.split())  # Removes whitespace.
-    calls = calls.split('|')
+        new_test_file_data = base_template_file_data.replace('TEST', template_file_data)

[ortuno, 2016/12/02 09:57:50]

nit: break line.

+        # Replace CALLS([...]) with CALLS so that we don't have to replace the
+        # CALLS([...]) for every new test file.
+        new_test_file_data = new_test_file_data.replace(result.group(), 'CALLS')
 
-    for call in calls:
-      # Parse call
-      name, args, uuid_suffix = re.search(r'(.*?)\((.*?)\)(\[UUID\])?',
-                                          call).groups()
+        # Replace 'PREVIOUS_CALL' with 'CALLS' so that we can replace it while
+        # replacing CALLS.
+        new_test_file_data = new_test_file_data.replace('PREVIOUS_CALL', 'CALLS')
 
-      # Replace template tokens
-      call_test_file_data = new_test_file_data
+        calls = result.group(1)
+        calls = ''.join(calls.split())    # Removes whitespace.
+        calls = calls.split('|')
 
-      call_test_file_data = call_test_file_data.replace(
-          'CALLS', '{}({})'.format(name, args))
+        for call in calls:
+            # Parse call
+            name, args, uuid_suffix = re.search(r'(.*?)\((.*?)\)(\[UUID\])?', call).groups()
 
-      call_test_file_data = call_test_file_data.replace('FUNCTION_NAME', name)
+            # Replace template tokens
+            call_test_file_data = new_test_file_data
+            call_test_file_data = call_test_file_data.replace('CALLS', '{}({})'.format(name, args))
+            call_test_file_data = call_test_file_data.replace('FUNCTION_NAME', name)
 
-      # Get test file name
-      call_test_file_name = 'gen-{}{}.html'.format(template_name, '-with-uuid'
-                                                   if uuid_suffix else '')
-      call_test_file_path = os.path.join(current_path, name,
-                                         call_test_file_name)
+            # Get test file name
+            directory = os.path.basename(os.path.abspath(os.path.join(template, os.pardir)))

[ortuno, 2016/12/02 09:57:50]

hmm current_path, directory, name, call_test_file_name make things really
confusing. Strawman proposal: 

s/current_path/bluetooth_tests_dir/
s/directory/group_dir/ 
s/name/function_name/

Which results in:

os.path.join(bluetooth_tests_dir, group_dir, function_name,
call_test_file_name);

WDYT?

 
-      yield GeneratedTest(call_test_file_data, call_test_file_path, template)
+            call_test_file_name = 'gen-{}{}.html'.format(template_name, '-with-uuid' if uuid_suffix else '')
+            call_test_file_path = os.path.join(current_path, directory, name, call_test_file_name)
+
+            yield GeneratedTest(call_test_file_data, call_test_file_path, template)
 
 
 def main():
 
-  for generated_test in GetGeneratedTests():
-    # Create or open test file
-    test_file_handle = open(generated_test.path, 'wb')
+    for generated_test in GetGeneratedTests():
+        # Create or open test file
+        test_file_handle = open(generated_test.path, 'wb')
 
-    # Write contents
-    test_file_handle.write(generated_test.data.encode('utf-8'))
-    test_file_handle.close()
+        # Write contents
+        test_file_handle.write(generated_test.data.encode('utf-8'))
+        test_file_handle.close()
 
 
 if __name__ == '__main__':
-  sys.exit(main())
+    sys.exit(main())