From ce5ba1cb4d03ec0ce01151849312c65bd29e7e7b Mon Sep 17 00:00:00 2001
From: Vakhid Betrakhmadov <vakhid.betrakhmadov@revolut.com>
Date: Mon, 6 Jan 2025 19:37:11 +0000
Subject: [PATCH] Fix xcresulttool for Xcode 16

Resolve: #65
---
 xctestrunner/test_runner/xcresult_util.py | 40 ++++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/xctestrunner/test_runner/xcresult_util.py b/xctestrunner/test_runner/xcresult_util.py
index 7e253a6..57b3696 100644
--- a/xctestrunner/test_runner/xcresult_util.py
+++ b/xctestrunner/test_runner/xcresult_util.py
@@ -19,6 +19,7 @@
 import subprocess
 
 from xctestrunner.shared import ios_errors
+from xctestrunner.shared import xcode_info_util
 
 
 def ExposeXcresult(xcresult_path, output_path):
@@ -50,11 +51,12 @@ def _ExposeDiagnostics(xcresult_path, output_path, action_result):
   if 'diagnosticsRef' not in action_result:
     return
   diagnostics_id = action_result['diagnosticsRef']['id']['_value']
-  subprocess.check_call([
-      'xcrun', 'xcresulttool', 'export', '--path', xcresult_path,
-      '--output-path', output_path, '--type', 'directory', '--id',
-      diagnostics_id
+  export_command = _MakeXcresulttoolCommand([
+    'export', '--path', xcresult_path,
+    '--output-path', output_path, '--type', 'directory', '--id',
+    diagnostics_id
   ])
+  subprocess.check_call(export_command)
 
 
 def _ExposeAttachments(xcresult_path, output_path, action_result):
@@ -90,11 +92,12 @@ def _ExposeAttachments(xcresult_path, output_path, action_result):
           target_file_path = os.path.join(target_file_dir, file_name)
 
           payload_ref_id = attachment['payloadRef']['id']['_value']
-          subprocess.check_call([
-              'xcrun', 'xcresulttool', 'export', '--path', xcresult_path,
-              '--output-path', target_file_path, '--type', 'file', '--id',
-              payload_ref_id
+          export_command = _MakeXcresulttoolCommand([
+            'export', '--path', xcresult_path,
+            '--output-path', target_file_path, '--type', 'file', '--id',
+            payload_ref_id
           ])
+          subprocess.check_call(export_command)
 
 
 def _GetResultBundleObject(xcresult_path, bundle_id=None):
@@ -107,10 +110,9 @@ def _GetResultBundleObject(xcresult_path, bundle_id=None):
   Returns:
     A dict, result bundle object in json format.
   """
-  command = [
-      'xcrun', 'xcresulttool', 'get', '--format', 'json', '--path',
-      xcresult_path
-  ]
+  command = _MakeXcresulttoolCommand([
+    'get', '--format', 'json', '--path', xcresult_path
+  ])
   if bundle_id:
     command.extend(['--id', bundle_id])
   return json.loads(subprocess.check_output(command).decode('utf-8'))
@@ -135,3 +137,17 @@ def _GetFailureTestRefs(test_summary):
       summary_ref_id = test_summary['summaryRef']['id']['_value']
       failure_test_refs.append(summary_ref_id)
   return failure_test_refs
+
+def _MakeXcresulttoolCommand(args):
+  """Constructs xcresulttool command for selected Xcode version.
+
+  Args:
+    args: array, a list of arguments to pass to xcresulttool.
+  Returns:
+    The xcresulttool command.
+  """
+  command = ['xcrun', 'xcresulttool'] + args
+  xcode_version = xcode_info_util.GetXcodeVersionNumber()
+  if xcode_version >= 1600:
+    command.extend(['--legacy'])
+  return command