xctest_list 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba4ec13aa03904dd67add015a892024392888ca2249507a4374dba75e877ea6
-  data.tar.gz: 3e2e5a315360be63e4b4811f7d9cc49163ccefc56a00b806b98665928d2ad8a2
+  metadata.gz: 4457b5c6dfe9911a602919c9432bcd07337f1a2d215731cd0d341e08f3dcebd9
+  data.tar.gz: 81b034564dc89ed742ff3d9c58f61428a0f2e3261cfcca4fb37902320f3a0ae0
 SHA512:
-  metadata.gz: 4e92a404299ddbfaa80402f7e44463eb17e4c98f6655ce8f93766682377ec89baa2847a85e37b68abe7ca60f62815ffbd7aba7353bc9337ad20675299c65e84d
-  data.tar.gz: ee4c4972c09a280f787521cd655ae603883d4c5fb0ca80ead55bc2ec322cafa93d9cb1cc454fb505d7ba226640e9ad6d24e6b65863b4c2635685ad1ece41977e
+  metadata.gz: c2d17625fd42e57fd259b68095d48f3a6c8a597a74e8aba19f01b94f7b6d3b4d0d98b25b71e5d925a74b9f67a7fed7beca1aa4f88ecf08880aa4aec0d88b0b31
+  data.tar.gz: aa8fb73c6e01b1c96f3a51b310d3a4b378627d03ddd54dc3c0d3dd722b0bb8b4dcdceec3382e9f5e6840a6a483fb80a1d8dd9f10a6a32ba61673cbcca7aa72ad

data/lib/xctest_list.rb

@@ -35,13 +35,13 @@ class XCTestList
   end
 
   # find the Objective-C symbols in the bundle's binary
-  def self.objc_tests(xctest_bundle_path, test_prefix: "test")
+  def self.objc_tests(xctest_bundle_path)
     tests = []
     objc_symbols_command_output_tempfile = Tempfile.new(File.basename(xctest_bundle_path) + "objc")
     system("nm -U '#{binary_path(xctest_bundle_path)}' > '#{objc_symbols_command_output_tempfile.path}'")
     tests = []
     File.foreach(objc_symbols_command_output_tempfile.path) do |line|
-      regex = / t -\[(?<testclass>\w+) (?<testmethod>#{test_prefix}\w*)\]/
+      regex = / t -\[(?<testclass>\w+) (?<testmethod>test\w*)\]/
       if (matches = regex.match(line))
         tests << "#{matches[:testclass]}/#{matches[:testmethod]}"
       end
@@ -49,27 +49,22 @@ class XCTestList
     tests
   end
 
-  # cleanup the Swift nm output to only provide the swift symbols
-  def self.swift_symbols(swift_symbols_cmd_output, test_prefix: "test")
-    swift_symbols_cmd_output.gsub(/^.* .* (.*)$/, '\1')
-  end
-
-  def self.swift_symbol_dump_command(xctest_binary_path, test_prefix: "test")
+  def self.swift_symbol_dump_command(xctest_binary_path, swift_test_prefix: "test")
     nm_version_string = `nm -version | head -n 1 | sed -E 's/Apple LLVM version ([0-9]+\.[0-9]+\.[0-9]+).*/\\1/'`.chomp
     if Gem::Version.new(nm_version_string) < Gem::Version.new('9.0.0')
       "nm -gU '#{xctest_binary_path}' | cut -d' ' -f3 | xcrun swift-demangle | grep -E '^\\S+\\.test[^.]+\\(\\)$' | sed 's/ () -> ()/()/'"
     else
-      "nm -gU '#{xctest_binary_path}' | cut -d' ' -f3 | xargs -s 131072 xcrun swift-demangle | cut -d' ' -f3 | grep -e '[\\.|_]'#{test_prefix}"
+      "nm -gU '#{xctest_binary_path}' | cut -d' ' -f3 | xargs -s 131072 xcrun swift-demangle | cut -d' ' -f3 | grep -e '[\\.|_]'#{swift_test_prefix}"
     end
   end
 
   # find the Swift symbols in the bundle's binary
-  def self.swift_tests(xctest_bundle_path, test_prefix: "test")
+  def self.swift_tests(xctest_bundle_path, swift_test_prefix: "test")
     swift_symbols_command_output_tempfile = Tempfile.new(File.basename(xctest_bundle_path) + "swift")
-    system("#{swift_symbol_dump_command(binary_path(xctest_bundle_path), test_prefix: test_prefix)}  > '#{swift_symbols_command_output_tempfile.path}'")
+    system("#{swift_symbol_dump_command(binary_path(xctest_bundle_path), swift_test_prefix: swift_test_prefix)}  > '#{swift_symbols_command_output_tempfile.path}'")
     tests = []
     File.foreach(swift_symbols_command_output_tempfile.path) do |line|
-      regex = /\w+\.(?<testclass>[^\.]+)\.(?<testmethod>#{test_prefix}[^\(]*)\(/
+      regex = /\w+\.(?<testclass>[^\.]+)\.(?<testmethod>#{swift_test_prefix}[^\(]*)\(/
       if /.*-\[.*\]/ !~ line && (matches = regex.match(line))
         tests << "#{matches[:testclass]}/#{matches[:testmethod]}"
       end
@@ -78,7 +73,7 @@ class XCTestList
   end
 
   # find the Objective-C and Swift tests in the binary's bundle
-  def self.tests(xctest_bundle_path, test_prefix: 'test')
-    objc_tests(xctest_bundle_path, test_prefix: test_prefix) | swift_tests(xctest_bundle_path, test_prefix: test_prefix)
+  def self.tests(xctest_bundle_path, swift_test_prefix: 'test')
+    objc_tests(xctest_bundle_path) | swift_tests(xctest_bundle_path, swift_test_prefix: swift_test_prefix)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xctest_list
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Lyndsey Ferguson