From 784d8fd91e92f7088a76c645004ba22de724785b Mon Sep 17 00:00:00 2001
From: maatheusgois-dd <matheus.gois@doordash.com>
Date: Wed, 20 May 2026 18:09:00 -0300
Subject: [PATCH] refactor: extract testFilterArgs helper for consistent test
 filter handling

Centralizes test filter argument construction into a single `testFilterArgs()` function in `src/core/bazel.ts`, replacing duplicated inline logic across 5 handler/streaming files. Adds support for pipe-separated values (e.g. "SuiteA |SuiteB") which are converted to comma-separated format for rules_apple compatibility.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 src/core/bazel.test.ts               | 24 ++++++++++++++++++++++++
 src/core/bazel.ts                    | 10 ++++++++++
 src/tools/handlers/build.ts          | 13 +++++--------
 src/tools/handlers/device.ts         |  5 +++--
 src/tools/handlers/macos.ts          | 12 +++++-------
 src/tools/handlers/multi-platform.ts | 12 +++++-------
 src/tools/streaming.ts               | 21 ++++++---------------
 7 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/src/core/bazel.test.ts b/src/core/bazel.test.ts
index d7bf22c..93cd84a 100644
--- a/src/core/bazel.test.ts
+++ b/src/core/bazel.test.ts
@@ -14,6 +14,7 @@ import {
   requireLabel,
   sanitizeQueryExpression,
   simulatorArgs,
+  testFilterArgs,
   runBazel,
   runBazelStreaming,
   getLastCommand,
@@ -168,6 +169,29 @@ describe('Bazel argument helpers', () => {
     expect(() => configArgs(['bad;config'])).toThrow('Invalid config value');
   });
 
+  it('testFilterArgs returns single --test_filter for simple string', () => {
+    expect(testFilterArgs('MyTestSuite')).toEqual(['--test_filter=MyTestSuite']);
+  });
+
+  it('testFilterArgs joins pipe-separated values with commas for rules_apple', () => {
+    expect(testFilterArgs('SuiteA|SuiteB')).toEqual([
+      '--test_filter=SuiteA,SuiteB',
+    ]);
+  });
+
+  it('testFilterArgs handles whitespace around pipes', () => {
+    expect(testFilterArgs(' A | B | C ')).toEqual([
+      '--test_filter=A,B,C',
+    ]);
+  });
+
+  it('testFilterArgs returns empty array for falsy values', () => {
+    expect(testFilterArgs(undefined)).toEqual([]);
+    expect(testFilterArgs('')).toEqual([]);
+    expect(testFilterArgs('  ')).toEqual([]);
+    expect(testFilterArgs(null)).toEqual([]);
+  });
+
   it('builds a simulator build command with stable flag ordering', () => {
     expect(
       buildCommandArgs({
diff --git a/src/core/bazel.ts b/src/core/bazel.ts
index c8c5a5e..19af5b3 100644
--- a/src/core/bazel.ts
+++ b/src/core/bazel.ts
@@ -90,6 +90,16 @@ export function platformArgs(platform?: BuildPlatform): string[] {
   }
 }
 
+export function testFilterArgs(testFilter: unknown): string[] {
+  if (typeof testFilter !== 'string' || !testFilter.trim()) return [];
+  const trimmed = testFilter.trim();
+  if (trimmed.includes('|')) {
+    const joined = trimmed.split('|').map(p => p.trim()).filter(Boolean).join(',');
+    return [`--test_filter=${joined}`];
+  }
+  return [`--test_filter=${trimmed}`];
+}
+
 export function configArgs(value: unknown): string[] {
   return asStringArray(value, 'configs').map((config) => {
     if (!/^[A-Za-z0-9_.-]+$/.test(config)) {
diff --git a/src/tools/handlers/build.ts b/src/tools/handlers/build.ts
index 5f0dcc3..045d771 100644
--- a/src/tools/handlers/build.ts
+++ b/src/tools/handlers/build.ts
@@ -9,6 +9,7 @@ import {
   runBazel,
   sanitizeQueryExpression,
   simulatorArgs,
+  testFilterArgs,
 } from '../../core/bazel.js';
 import {
   bootSimulatorIfNeeded,
@@ -136,7 +137,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         simulatorName: { type: 'string' },
         simulatorVersion: { type: 'string' },
         configs: { type: 'array', items: { type: 'string' } },
@@ -251,7 +252,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         simulatorName: { type: 'string' },
         simulatorVersion: { type: 'string' },
         configs: { type: 'array', items: { type: 'string' } },
@@ -365,10 +366,8 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         ...simulatorArgs(testArgs),
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       const commandResult = await runBazel(
         bazelArgs,
@@ -460,10 +459,8 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         ...simulatorArgs(testArgs),
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       const commandResult = await runBazel(
         bazelArgs,
diff --git a/src/tools/handlers/device.ts b/src/tools/handlers/device.ts
index fb37d18..6f86bed 100644
--- a/src/tools/handlers/device.ts
+++ b/src/tools/handlers/device.ts
@@ -5,6 +5,7 @@ import {
   configArgs,
   requireLabel,
   runBazel,
+  testFilterArgs,
 } from '../../core/bazel.js';
 import {
   deviceInfo,
@@ -125,7 +126,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         deviceId: { type: 'string', description: 'Device UDID.' },
         deviceName: { type: 'string', description: 'Device name.' },
         configs: { type: 'array', items: { type: 'string' } },
@@ -374,7 +375,7 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         ...configArgs(args.configs),
         ...asStringArray(args.extraArgs, 'extraArgs'),
       ];
-      if (args.testFilter) testArgs.push(`--test_filter=${args.testFilter}`);
+      testArgs.push(...testFilterArgs(args.testFilter));
       testArgs.push(`--test_arg=--destination`, `--test_arg=id=${device.udid}`);
       testArgs.push(target);
       const result = await runBazel(
diff --git a/src/tools/handlers/macos.ts b/src/tools/handlers/macos.ts
index f317bc8..f4aefe3 100644
--- a/src/tools/handlers/macos.ts
+++ b/src/tools/handlers/macos.ts
@@ -1,6 +1,6 @@
 import type { JsonObject, ToolCallResult, ToolDefinition, BuildArgs, TestArgs, TargetKind, BuildMode } from '../../types/index.js';
 import { stringOrUndefined, numberOrUndefined } from '../helpers.js';
-import { buildCommandArgs, configArgs, discoverExpression, modeArgs, requireLabel, runBazel, asStringArray } from '../../core/bazel.js';
+import { buildCommandArgs, configArgs, discoverExpression, modeArgs, requireLabel, runBazel, asStringArray, testFilterArgs } from '../../core/bazel.js';
 import { findAppBundle, readBundleId } from '../../core/simulators.js';
 import { formatCommandResult, structuredCommandResult, toolResult, toolText } from '../../utils/output.js';
 import { runCommand } from '../../utils/process.js';
@@ -49,7 +49,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         configs: { type: 'array', items: { type: 'string' } },
         startupArgs: { type: 'array', items: { type: 'string' } },
         extraArgs: { type: 'array', items: { type: 'string' } },
@@ -79,7 +79,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         configs: { type: 'array', items: { type: 'string' } },
         startupArgs: { type: 'array', items: { type: 'string' } },
         extraArgs: { type: 'array', items: { type: 'string' } },
@@ -236,10 +236,8 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         '--test_output=errors',
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       const commandResult = await runBazel(
         bazelArgs,
@@ -269,7 +267,7 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         ...configArgs(asStringArray(args.configs, 'configs')),
         ...asStringArray(args.extraArgs, 'extraArgs'),
       ];
-      if (args.testFilter) coverageArgs.push(`--test_filter=${args.testFilter}`);
+      coverageArgs.push(...testFilterArgs(args.testFilter));
       coverageArgs.push(target);
       const result = await runBazel(
         coverageArgs,
diff --git a/src/tools/handlers/multi-platform.ts b/src/tools/handlers/multi-platform.ts
index 859bc10..119e950 100644
--- a/src/tools/handlers/multi-platform.ts
+++ b/src/tools/handlers/multi-platform.ts
@@ -1,6 +1,6 @@
 import type { JsonObject, ToolCallResult, ToolDefinition, BuildArgs, TestArgs, BuildPlatform, BuildMode, TargetKind } from '../../types/index.js';
 import { stringOrUndefined, numberOrUndefined } from '../helpers.js';
-import { buildCommandArgs, configArgs, discoverExpression, modeArgs, platformArgs, requireLabel, runBazel, asStringArray } from '../../core/bazel.js';
+import { buildCommandArgs, configArgs, discoverExpression, modeArgs, platformArgs, requireLabel, runBazel, asStringArray, testFilterArgs } from '../../core/bazel.js';
 import { formatCommandResult, structuredCommandResult, toolResult, toolText } from '../../utils/output.js';
 
 export const definitions: ToolDefinition[] = [
@@ -28,7 +28,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         configs: { type: 'array', items: { type: 'string' } },
         startupArgs: { type: 'array', items: { type: 'string' } },
         extraArgs: { type: 'array', items: { type: 'string' } },
@@ -93,7 +93,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         configs: { type: 'array', items: { type: 'string' } },
         startupArgs: { type: 'array', items: { type: 'string' } },
         extraArgs: { type: 'array', items: { type: 'string' } },
@@ -158,7 +158,7 @@ export const definitions: ToolDefinition[] = [
       type: 'object',
       properties: {
         target: { type: 'string', description: 'Bazel test target label.' },
-        testFilter: { type: 'string', description: 'Optional --test_filter value.' },
+        testFilter: { type: 'string', description: 'Optional test filter. Supports pipe-separated values (e.g. "SuiteA|SuiteB") to run multiple suites.' },
         configs: { type: 'array', items: { type: 'string' } },
         startupArgs: { type: 'array', items: { type: 'string' } },
         extraArgs: { type: 'array', items: { type: 'string' } },
@@ -265,10 +265,8 @@ export async function handle(name: string, args: JsonObject): Promise<ToolCallRe
         ...platformArgs(plat),
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       const commandResult = await runBazel(
         bazelArgs,
diff --git a/src/tools/streaming.ts b/src/tools/streaming.ts
index 369d27a..92ea0dc 100644
--- a/src/tools/streaming.ts
+++ b/src/tools/streaming.ts
@@ -18,6 +18,7 @@ import {
   runBazelStreaming,
   sanitizeQueryExpression,
   simulatorArgs,
+  testFilterArgs,
 } from '../core/bazel.js';
 import { bootSimulatorIfNeeded, findAppBundle, installApp, launchApp, readBundleId, resolveSimulator } from '../core/simulators.js';
 import { installAppOnDevice, launchAppOnDevice, resolveDevice } from '../core/devices.js';
@@ -166,10 +167,8 @@ function buildStreamingBazelArgs(name: string, args: JsonObject): string[] {
         ...simulatorArgs(testArgs),
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       return bazelArgs;
     }
@@ -200,10 +199,8 @@ function buildStreamingBazelArgs(name: string, args: JsonObject): string[] {
         '--ios_multi_cpus=arm64',
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       return bazelArgs;
     }
@@ -214,10 +211,8 @@ function buildStreamingBazelArgs(name: string, args: JsonObject): string[] {
         'coverage',
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       return bazelArgs;
     }
@@ -248,10 +243,8 @@ function buildStreamingBazelArgs(name: string, args: JsonObject): string[] {
         '--test_output=errors',
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       return bazelArgs;
     }
@@ -293,10 +286,8 @@ function buildStreamingBazelArgs(name: string, args: JsonObject): string[] {
         ...platformArgs(plat),
         ...configArgs(testArgs.configs),
         ...asStringArray(testArgs.extraArgs, 'extraArgs'),
+        ...testFilterArgs(testArgs.testFilter),
       ];
-      if (typeof testArgs.testFilter === 'string' && testArgs.testFilter.trim()) {
-        bazelArgs.push(`--test_filter=${testArgs.testFilter.trim()}`);
-      }
       bazelArgs.push(target);
       return bazelArgs;
     }