xcknife 0.11.1 → 0.12.0

data/lib/xcknife/test_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'pp'
 require 'fileutils'
@@ -8,6 +10,7 @@ require 'logger'
 require 'shellwords'
 require 'open3'
 require 'xcknife/exceptions'
+require 'etc'
 
 module XCKnife
   class TestDumper
@@ -27,7 +30,7 @@ module XCKnife
       @skip_dump_bundle_names = []
       @simctl_timeout = 0
       parse_arguments(args)
-      @device_id ||= "booted"
+      @device_id ||= 'booted'
       @logger = logger
       @logger.level = @debug ? Logger::DEBUG : Logger::FATAL
       @parser = nil
@@ -38,70 +41,61 @@ module XCKnife
                                     naive_dump_bundle_names: @naive_dump_bundle_names, skip_dump_bundle_names: @skip_dump_bundle_names, simctl_timeout: @simctl_timeout)
       extra_environment_variables = parse_scheme_file
       logger.info { "Environment variables from xcscheme: #{extra_environment_variables.pretty_inspect}" }
-      output_fd = File.open(@output_file, "w")
+      output_fd = File.open(@output_file, 'w')
       if @temporary_output_folder.nil?
-        Dir.mktmpdir("xctestdumper_") do |outfolder|
+        Dir.mktmpdir('xctestdumper_') do |outfolder|
           list_tests(extra_environment_variables, helper, outfolder, output_fd)
         end
       else
-        unless File.directory?(@temporary_output_folder)
-          raise TestDumpError, "Error no such directory: #{@temporary_output_folder}"
-        end
+        raise TestDumpError, "Error no such directory: #{@temporary_output_folder}" unless File.directory?(@temporary_output_folder)
 
-        if Dir.entries(@temporary_output_folder).any? { |f| File.file?(File.join(@temporary_output_folder,f)) }
-          puts "Warning: #{@temporary_output_folder} is not empty! Files can be overwritten."
-        end
+        puts "Warning: #{@temporary_output_folder} is not empty! Files can be overwritten." if Dir.entries(@temporary_output_folder).any? { |f| File.file?(File.join(@temporary_output_folder, f)) }
         list_tests(extra_environment_variables, helper, File.absolute_path(@temporary_output_folder), output_fd)
       end
       output_fd.close
-      puts "Done listing test methods"
+      puts 'Done listing test methods'
     end
 
     private
+
     def list_tests(extra_environment_variables, helper, outfolder, output_fd)
       helper.call(@derived_data_folder, outfolder, extra_environment_variables).each do |test_specification|
         concat_to_file(test_specification, output_fd)
       end
     end
 
-
     def parse_scheme_file
       return {} unless @xcscheme_file
-      unless File.exists?(@xcscheme_file)
-        raise ArgumentError, "Error: no such xcscheme file: #{@xcscheme_file}"
-      end
+      raise ArgumentError, "Error: no such xcscheme file: #{@xcscheme_file}" unless File.exist?(@xcscheme_file)
+
       XCKnife::XcschemeAnalyzer.extract_environment_variables(IO.read(@xcscheme_file))
     end
 
     def parse_arguments(args)
       positional_arguments = parse_options(args)
-      if positional_arguments.size < required_arguments.size
-        warn_and_exit("You must specify *all* required arguments: #{required_arguments.join(", ")}")
-      end
+      warn_and_exit("You must specify *all* required arguments: #{required_arguments.join(', ')}") if positional_arguments.size < required_arguments.size
       @derived_data_folder, @output_file, @device_id = positional_arguments
     end
 
     def parse_options(args)
-      begin
-        return @parser.parse(args)
-      rescue OptionParser::ParseError => error
-        warn_and_exit(error)
-      end
+      @parser.parse(args)
+    rescue OptionParser::ParseError => e
+      warn_and_exit(e)
     end
 
     def build_parser
       OptionParser.new do |opts|
         opts.banner += " #{arguments_banner}"
-        opts.on("-d", "--debug", "Debug mode enabled") { |v| @debug = v }
-        opts.on("-r", "--retry-count COUNT", "Max retry count for simulator output", Integer) { |v| @max_retry_count = v }
-        opts.on("-x", '--simctl-timeout SECONDS', "Max allowed time in seconds for simctl commands", Integer) { |v| @simctl_timeout = v }
-        opts.on("-t", "--temporary-output OUTPUT_FOLDER", "Sets temporary Output folder") { |v| @temporary_output_folder = v }
-        opts.on("-s", "--scheme XCSCHEME_FILE", "Reads environments variables from the xcscheme file") { |v| @xcscheme_file = v }
-        opts.on("-l", "--dylib_logfile DYLIB_LOG_FILE", "Path for dylib log file") { |v| @dylib_logfile_path = v }
+        opts.on('-d', '--debug', 'Debug mode enabled') { |v| @debug = v }
+        opts.on('-r', '--retry-count COUNT', 'Max retry count for simulator output', Integer) { |v| @max_retry_count = v }
+        opts.on('-x', '--simctl-timeout SECONDS', 'Max allowed time in seconds for simctl commands', Integer) { |v| @simctl_timeout = v }
+        opts.on('-t', '--temporary-output OUTPUT_FOLDER', 'Sets temporary Output folder') { |v| @temporary_output_folder = v }
+        opts.on('-s', '--scheme XCSCHEME_FILE', 'Reads environments variables from the xcscheme file') { |v| @xcscheme_file = v }
+        opts.on('-l', '--dylib_logfile DYLIB_LOG_FILE', 'Path for dylib log file') { |v| @dylib_logfile_path = v }
         opts.on('--naive-dump TEST_BUNDLE_NAMES', 'List of test bundles to dump using static analysis', Array) { |v| @naive_dump_bundle_names = v }
         opts.on('--skip-dump TEST_BUNDLE_NAMES', 'List of test bundles to skip dumping', Array) { |v| @skip_dump_bundle_names = v }
 
-        opts.on_tail("-h", "--help", "Show this message") do
+        opts.on_tail('-h', '--help', 'Show this message') do
           puts opts
           exit
         end
@@ -118,7 +112,7 @@ module XCKnife
 
     def arguments_banner
       optional_args = optional_arguments.map { |a| "[#{a}]" }
-      (required_arguments + optional_args).join(" ")
+      (required_arguments + optional_args).join(' ')
     end
 
     def warn_and_exit(msg)
@@ -128,7 +122,7 @@ module XCKnife
     def concat_to_file(test_specification, output_fd)
       file = test_specification.json_stream_file
       IO.readlines(file).each do |line|
-        event = OpenStruct.new(JSON.load(line))
+        event = OpenStruct.new(JSON.parse(line))
         if should_test_event_be_ignored?(test_specification, event)
           logger.info "Skipped test dumper line #{line}"
         else
@@ -141,8 +135,9 @@ module XCKnife
 
     # Current limitation: this only supports class level skipping
     def should_test_event_be_ignored?(test_specification, event)
-      return false unless event["test"] == "1"
-      test_specification.skip_test_identifiers.include?(event["className"])
+      return false unless event['test'] == '1'
+
+      test_specification.skip_test_identifiers.include?(event['className'])
     end
   end
 
@@ -151,15 +146,16 @@ module XCKnife
 
     attr_reader :logger
 
+    # rubocop:disable Metrics/ParameterLists
     def initialize(device_id, max_retry_count, debug, logger, dylib_logfile_path,
                    naive_dump_bundle_names: [], skip_dump_bundle_names: [], simctl_timeout: 0)
       @xcode_path = `xcode-select -p`.strip
       @simctl_path = `xcrun -f simctl`.strip
       @nm_path = `xcrun -f nm`.strip
       @swift_path = `xcrun -f swift`.strip
-      @platforms_path = File.join(@xcode_path, "Platforms")
-      @platform_path = File.join(@platforms_path, "iPhoneSimulator.platform")
-      @sdk_path = File.join(@platform_path, "Developer/SDKs/iPhoneSimulator.sdk")
+      @platforms_path = File.join(@xcode_path, 'Platforms')
+      @platform_path = File.join(@platforms_path, 'iPhoneSimulator.platform')
+      @sdk_path = File.join(@platform_path, 'Developer/SDKs/iPhoneSimulator.sdk')
       @testroot = nil
       @device_id = device_id
       @max_retry_count = max_retry_count
@@ -170,68 +166,109 @@ module XCKnife
       @naive_dump_bundle_names = naive_dump_bundle_names
       @skip_dump_bundle_names = skip_dump_bundle_names
     end
+    # rubocop:enable Metrics/ParameterLists
 
     def call(derived_data_folder, list_folder, extra_environment_variables = {})
       @testroot = File.join(derived_data_folder, 'Build', 'Products')
       xctestrun_file = Dir[File.join(@testroot, '*.xctestrun')].first
-      if xctestrun_file.nil?
-        raise ArgumentError, "No xctestrun on #{@testroot}"
-      end
+      raise ArgumentError, "No xctestrun on #{@testroot}" if xctestrun_file.nil?
+
       xctestrun_as_json = `plutil -convert json -o - "#{xctestrun_file}"`
       FileUtils.mkdir_p(list_folder)
-      list_tests(JSON.load(xctestrun_as_json), list_folder, extra_environment_variables)
+      list_tests(JSON.parse(xctestrun_as_json), list_folder, extra_environment_variables)
     end
 
     private
 
     attr_reader :testroot
 
-    def list_tests(xctestrun, list_folder, extra_environment_variables)
-      xctestrun.reject! { |test_bundle_name, _| test_bundle_name == '__xctestrun_metadata__' }
-      xctestrun.map do |test_bundle_name, test_bundle|
+    def test_groups(xctestrun)
+      xctestrun.group_by do |test_bundle_name, _test_bundle|
         if @skip_dump_bundle_names.include?(test_bundle_name)
-          logger.info { "Skipping dumping tests in `#{test_bundle_name}` -- writing out fake event"}
-          test_specification = list_single_test(list_folder, test_bundle, test_bundle_name)
+          'single'
         elsif @naive_dump_bundle_names.include?(test_bundle_name)
-          test_specification = list_tests_with_nm(list_folder, test_bundle, test_bundle_name)
+          'nm'
         else
-          test_specification = list_tests_with_simctl(list_folder, test_bundle, test_bundle_name, extra_environment_variables)
-          wait_test_dumper_completion(test_specification.json_stream_file)
+          'simctl'
         end
+      end
+    end
+
+    # This executes naive test dumping in parallel by queueing up items onto a work queue to process
+    # with 1 new thread per processor. Results are placed onto a threadsafe spec queue to avoid writing
+    # to an object between threads, then popped off re-inserting them to our list of test results.
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def list_tests(xctestrun, list_folder, extra_environment_variables)
+      xctestrun.reject! { |test_bundle_name, _| test_bundle_name == '__xctestrun_metadata__' }
+
+      test_runs_by_method = test_groups(xctestrun)
+      spec_queue = Queue.new
+      nm_bundle_queue = Queue.new
+      results = []
+      single_tests = test_runs_by_method['single'] || []
+      nm_tests = test_runs_by_method['nm'] || []
+      simctl_tests = test_runs_by_method['simctl'] || []
+
+      single_tests.each do |test_bundle_name, test_bundle|
+        logger.info { "Skipping dumping tests in `#{test_bundle_name}` -- writing out fake event" }
+        spec_queue << list_single_test(list_folder, test_bundle, test_bundle_name)
+      end
+
+      simctl_tests.each do |test_bundle_name, test_bundle|
+        test_spec = list_tests_with_simctl(list_folder, test_bundle, test_bundle_name, extra_environment_variables)
+        wait_test_dumper_completion(test_spec.json_stream_file)
 
-        test_specification
+        spec_queue << test_spec
       end
+
+      nm_tests.each { |item| nm_bundle_queue << item }
+
+      [Etc.nprocessors, nm_bundle_queue.size].min.times.map do
+        nm_bundle_queue << :stop
+
+        Thread.new do
+          Thread.current.abort_on_exception = true
+
+          until (item = nm_bundle_queue.pop) == :stop
+            test_bundle_name, test_bundle = item
+            spec_queue << list_tests_with_nm(list_folder, test_bundle, test_bundle_name)
+          end
+        end
+      end.each(&:join)
+
+      results << spec_queue.pop until spec_queue.empty?
+
+      results
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def list_tests_with_simctl(list_folder, test_bundle, test_bundle_name, extra_environment_variables)
-      env_variables = test_bundle["EnvironmentVariables"]
-      testing_env_variables = test_bundle["TestingEnvironmentVariables"]
+      env_variables = test_bundle['EnvironmentVariables']
+      testing_env_variables = test_bundle['TestingEnvironmentVariables']
       outpath = File.join(list_folder, test_bundle_name)
-      test_host = replace_vars(test_bundle["TestHostPath"])
-      test_bundle_path = replace_vars(test_bundle["TestBundlePath"], test_host)
+      test_host = replace_vars(test_bundle['TestHostPath'])
+      test_bundle_path = replace_vars(test_bundle['TestBundlePath'], test_host)
       test_dumper_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'TestDumper', 'TestDumper.dylib'))
-      unless File.exist?(test_dumper_path)
-        raise TestDumpError, "Could not find TestDumper.dylib on #{test_dumper_path}"
-      end
+      raise TestDumpError, "Could not find TestDumper.dylib on #{test_dumper_path}" unless File.exist?(test_dumper_path)
 
-      is_logic_test = test_bundle["TestHostBundleIdentifier"].nil?
+      is_logic_test = test_bundle['TestHostBundleIdentifier'].nil?
       env = simctl_child_attrs(
-        "XCTEST_TYPE" => xctest_type(test_bundle),
-        "XCTEST_TARGET" => test_bundle_name,
-        "TestDumperOutputPath" => outpath,
-        "IDE_INJECTION_PATH" => testing_env_variables["DYLD_INSERT_LIBRARIES"],
-        "XCInjectBundleInto" => testing_env_variables["XCInjectBundleInto"],
-        "XCInjectBundle" => test_bundle_path,
-        "TestBundleLocation" => test_bundle_path,
-        "OS_ACTIVITY_MODE" => "disable",
-        "DYLD_PRINT_LIBRARIES" => "YES",
-        "DYLD_PRINT_ENV" => "YES",
-        "DYLD_ROOT_PATH" => @sdk_path,
-        "DYLD_LIBRARY_PATH" => env_variables["DYLD_LIBRARY_PATH"],
-        "DYLD_FRAMEWORK_PATH" => env_variables["DYLD_FRAMEWORK_PATH"],
-        "DYLD_FALLBACK_LIBRARY_PATH" => "#{@sdk_path}/usr/lib",
-        "DYLD_FALLBACK_FRAMEWORK_PATH" => "#{@platform_path}/Developer/Library/Frameworks",
-        "DYLD_INSERT_LIBRARIES" => test_dumper_path,
+        'XCTEST_TYPE' => xctest_type(test_bundle),
+        'XCTEST_TARGET' => test_bundle_name,
+        'TestDumperOutputPath' => outpath,
+        'IDE_INJECTION_PATH' => testing_env_variables['DYLD_INSERT_LIBRARIES'],
+        'XCInjectBundleInto' => testing_env_variables['XCInjectBundleInto'],
+        'XCInjectBundle' => test_bundle_path,
+        'TestBundleLocation' => test_bundle_path,
+        'OS_ACTIVITY_MODE' => 'disable',
+        'DYLD_PRINT_LIBRARIES' => 'YES',
+        'DYLD_PRINT_ENV' => 'YES',
+        'DYLD_ROOT_PATH' => @sdk_path,
+        'DYLD_LIBRARY_PATH' => env_variables['DYLD_LIBRARY_PATH'],
+        'DYLD_FRAMEWORK_PATH' => env_variables['DYLD_FRAMEWORK_PATH'],
+        'DYLD_FALLBACK_LIBRARY_PATH' => "#{@sdk_path}/usr/lib",
+        'DYLD_FALLBACK_FRAMEWORK_PATH' => "#{@platform_path}/Developer/Library/Frameworks",
+        'DYLD_INSERT_LIBRARIES' => test_dumper_path
       )
       env.merge!(simctl_child_attrs(extra_environment_variables))
       inject_vars(env, test_host)
@@ -241,18 +278,21 @@ module XCKnife
         run_logic_test(env, test_host, test_bundle_path)
       else
         install_app(test_host)
-        test_host_bundle_identifier = replace_vars(test_bundle["TestHostBundleIdentifier"], test_host)
+        test_host_bundle_identifier = replace_vars(test_bundle['TestHostBundleIdentifier'], test_host)
         run_apptest(env, test_host_bundle_identifier, test_bundle_path)
       end
-      return TestSpecification.new outpath, discover_tests_to_skip(test_bundle)
+      TestSpecification.new outpath, discover_tests_to_skip(test_bundle)
     end
 
+    # Improvement?: assume that everything in the historical info is correct, so dont simctl or nm, and just spit out exactly what it said the classes were
+
     def list_tests_with_nm(list_folder, test_bundle, test_bundle_name)
       output_methods(list_folder, test_bundle, test_bundle_name) do |test_bundle_path|
         methods = []
         swift_demangled_nm(test_bundle_path) do |output|
           output.each_line do |line|
-            next unless method = method_from_nm_line(line)
+            next unless (method = method_from_nm_line(line))
+
             methods << method
           end
         end
@@ -271,25 +311,25 @@ module XCKnife
       logger.info { "Writing out TestDumper file for #{test_bundle_name} to #{outpath}" }
       test_specification = TestSpecification.new outpath, discover_tests_to_skip(test_bundle)
 
-      test_bundle_path = replace_vars(test_bundle["TestBundlePath"], replace_vars(test_bundle["TestHostPath"]))
+      test_bundle_path = replace_vars(test_bundle['TestBundlePath'], replace_vars(test_bundle['TestHostPath']))
       methods = yield(test_bundle_path)
 
       test_type = xctest_type(test_bundle)
       File.open test_specification.json_stream_file, 'a' do |f|
-        f << JSON.dump(message: "Starting Test Dumper", event: "begin-test-suite", testType: test_type) << "\n"
+        f << JSON.dump(message: 'Starting Test Dumper', event: 'begin-test-suite', testType: test_type) << "\n"
         f << JSON.dump(event: 'begin-ocunit', bundleName: File.basename(test_bundle_path), targetName: test_bundle_name) << "\n"
         methods.map { |method| method[:class] }.uniq.each do |class_name|
-          f << JSON.dump(test: '1', className: class_name, event: "end-test", totalDuration: "0") << "\n"
+          f << JSON.dump(test: '1', className: class_name, event: 'end-test', totalDuration: '0') << "\n"
         end
-        f << JSON.dump(message: "Completed Test Dumper", event: "end-action", testType: test_type) << "\n"
+        f << JSON.dump(message: 'Completed Test Dumper', event: 'end-action', testType: test_type) << "\n"
       end
 
       test_specification
     end
 
     def discover_tests_to_skip(test_bundle)
-      identifier_for_test_method = "/"
-      skip_test_identifiers = test_bundle["SkipTestIdentifiers"] || []
+      identifier_for_test_method = '/'
+      skip_test_identifiers = test_bundle['SkipTestIdentifiers'] || []
       skip_test_identifiers.reject { |i| i.include?(identifier_for_test_method) }.to_set
     end
 
@@ -298,12 +338,11 @@ module XCKnife
     end
 
     def wrapped_simctl(args)
-      args = [*gtimeout, simctl] + args
-      args
+      [*gtimeout, simctl] + args
     end
 
     def gtimeout
-      return [] unless @simctl_timeout > 0
+      return [] unless @simctl_timeout.positive?
 
       path = gtimeout_path
       if path.empty?
@@ -311,22 +350,22 @@ module XCKnife
         return []
       end
 
-      [path, "-k", "5", "#{@simctl_timeout}"]
+      [path, '-k', '5', @simctl_timeout.to_s]
     end
 
     def gtimeout_path
       `which gtimeout`.strip
     end
 
-    def replace_vars(str, testhost = "<UNKNOWN>")
-      str.gsub("__PLATFORMS__", @platforms_path).
-        gsub("__TESTHOST__", testhost).
-        gsub("__TESTROOT__", testroot)
+    def replace_vars(str, testhost = '<UNKNOWN>')
+      str.gsub('__PLATFORMS__', @platforms_path)
+         .gsub('__TESTHOST__', testhost)
+         .gsub('__TESTROOT__', testroot)
     end
 
     def inject_vars(env, test_host)
       env.each do |k, v|
-        env[k] = replace_vars(v || "", test_host)
+        env[k] = replace_vars(v || '', test_host)
       end
     end
 
@@ -339,47 +378,44 @@ module XCKnife
     def install_app(test_host_path)
       retries_count = 0
       max_retry_count = 3
-      until (retries_count > max_retry_count) or call_simctl(["install", @device_id, test_host_path])
+      until (retries_count > max_retry_count) || call_simctl(['install', @device_id, test_host_path])
         retries_count += 1
         call_simctl ['shutdown', @device_id]
         call_simctl ['boot', @device_id]
         sleep 1.0
       end
 
-      if retries_count > max_retry_count
-        raise TestDumpError, "Installing #{test_host_path} failed"
-      end
-
+      raise TestDumpError, "Installing #{test_host_path} failed" if retries_count > max_retry_count
     end
 
     def wait_test_dumper_completion(file)
       retries_count = 0
-      until has_test_dumper_terminated?(file)  do
+      until test_dumper_terminated?(file)
         retries_count += 1
-        if retries_count == @max_retry_count
-          raise TestDumpError, "Timeout error on: #{file}"
-        end
+        raise TestDumpError, "Timeout error on: #{file}" if retries_count == @max_retry_count
+
         sleep 0.1
       end
     end
 
-    def has_test_dumper_terminated?(file)
-      return false unless File.exists?(file)
+    def test_dumper_terminated?(file)
+      return false unless File.exist?(file)
+
       last_line = `tail -n 1 "#{file}"`
-      return last_line.include?("Completed Test Dumper")
+      last_line.include?('Completed Test Dumper')
     end
 
     def run_apptest(env, test_host_bundle_identifier, test_bundle_path)
-      unless call_simctl(["launch", @device_id, test_host_bundle_identifier, '-XCTest', 'All', dylib_logfile_path, test_bundle_path], env: env)
-        raise TestDumpError, "Launching #{test_bundle_path} in #{test_host_bundle_identifier} failed"
-      end
+      return if call_simctl(['launch', @device_id, test_host_bundle_identifier, '-XCTest', 'All', dylib_logfile_path, test_bundle_path], env: env)
+
+      raise TestDumpError, "Launching #{test_bundle_path} in #{test_host_bundle_identifier} failed"
     end
 
     def run_logic_test(env, test_host, test_bundle_path)
-      opts = @debug ? {} : { err: "/dev/null" }
-      unless call_simctl(["spawn", @device_id, test_host, '-XCTest', 'All', dylib_logfile_path, test_bundle_path], env: env, **opts)
-        raise TestDumpError, "Spawning #{test_bundle_path} in #{test_host} failed"
-      end
+      opts = @debug ? {} : { err: '/dev/null' }
+      return if call_simctl(['spawn', @device_id, test_host, '-XCTest', 'All', dylib_logfile_path, test_bundle_path], env: env, **opts)
+
+      raise TestDumpError, "Spawning #{test_bundle_path} in #{test_host} failed"
     end
 
     def call_simctl(args, env: {}, **spawn_opts)
@@ -398,21 +434,19 @@ module XCKnife
     end
 
     def xctest_type(test_bundle)
-      if test_bundle["TestHostBundleIdentifier"].nil?
-        "LOGICTEST"
+      if test_bundle['TestHostBundleIdentifier'].nil?
+        'LOGICTEST'
       else
-        "APPTEST"
+        'APPTEST'
       end
     end
 
-    def swift_demangled_nm(test_bundle_path)
-      Open3.pipeline_r([@nm_path, File.join(test_bundle_path, File.basename(test_bundle_path, '.xctest'))], [@swift_path, 'demangle']) do |o, _ts|
-        yield(o)
-      end
+    def swift_demangled_nm(test_bundle_path, &block)
+      Open3.pipeline_r([@nm_path, File.join(test_bundle_path, File.basename(test_bundle_path, '.xctest'))], [@swift_path, 'demangle'], &block)
     end
 
     def method_from_nm_line(line)
-      return unless line.strip =~ %r{^
+      return unless line.strip =~ /^
         [\da-f]+\s # address
         [tT]\s # symbol type
         (?: # method
@@ -420,13 +454,13 @@ module XCKnife
           | # or swift instance method
             _? # only present on Xcode 10.0 and below
             (?:@objc\s)? # optional objc annotation
-            (?:[^\.]+\.)? # module name
+            (?:[^.]+\.)? # module name
             (.+) # class name
             \.(test.+)\s->\s\(\) # method signature
         )
-      $}ox
+      $/ox
 
-      { class: $1 || $3, method: $2 || $4 }
+      { class: Regexp.last_match(1) || Regexp.last_match(3), method: Regexp.last_match(2) || Regexp.last_match(4) }
     end
   end
 end