test: relocate Apple engine unit tests into platforms/apple/core (#980)

src/platforms/ios/__tests__/apple-runner-platform.test.ts → src/platforms/apple/core/__tests__/apple-runner-platform.test.ts

@@ -5,8 +5,8 @@ import {
   resolveRunnerPlatformName,
   resolveRunnerSdkName,
   resolveRunnerXctestrunHints,
-} from '../../apple/core/apple-runner-platform.ts';
-import type { DeviceInfo } from '../../../kernel/device.ts';
+} from '../apple-runner-platform.ts';
+import type { DeviceInfo } from '../../../../kernel/device.ts';
 
 function iosSim(overrides: Partial<DeviceInfo> = {}): DeviceInfo {
   return {

src/platforms/ios/__tests__/debug-symbols.test.ts → src/platforms/apple/core/__tests__/debug-symbols.test.ts

@@ -3,9 +3,9 @@ import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { test } from 'vitest';
-import { symbolicateCrashArtifact } from '../../apple/core/debug-symbols.ts';
-import { AppError } from '../../../kernel/errors.ts';
-import { withCommandExecutorOverride } from '../../../utils/exec.ts';
+import { symbolicateCrashArtifact } from '../debug-symbols.ts';
+import { AppError } from '../../../../kernel/errors.ts';
+import { withCommandExecutorOverride } from '../../../../utils/exec.ts';
 
 const UUID = 'ABCDEFAB-CDEF-ABCD-EFAB-CDEFABCDEFAB';
 const NORMALIZED_UUID = 'ABCDEFABCDEFABCDEFABCDEFABCDEFAB';

src/platforms/ios/__tests__/devices.test.ts → src/platforms/apple/core/__tests__/devices.test.ts

@@ -10,8 +10,8 @@ import {
   parseXctracePhysicalAppleDevices,
   resolveAppleTargetFromDevicectlDevice,
   withAppleToolProvider,
-} from '../../apple/core/devices.ts';
-import type { ExecResult } from '../../../utils/exec.ts';
+} from '../devices.ts';
+import type { ExecResult } from '../../../../utils/exec.ts';
 
 const toolCalls: Array<[string, string[]]> = [];
 let mockRunCommand: (cmd: string, args: string[]) => Promise<ExecResult>;

src/platforms/ios/__tests__/index.test.ts → src/platforms/apple/core/__tests__/index.test.ts

@@ -4,47 +4,47 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-vi.mock('../../../utils/exec.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
+vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
   return { ...actual, runCmd: vi.fn(actual.runCmd) };
 });
-vi.mock('../../../utils/retry.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../utils/retry.ts')>();
+vi.mock('../../../../utils/retry.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../../utils/retry.ts')>();
   return { ...actual, retryWithPolicy: vi.fn(actual.retryWithPolicy) };
 });
-vi.mock('../../apple/core/runner/runner-client.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../apple/core/runner/runner-client.ts')>();
+vi.mock('../runner/runner-client.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../runner/runner-client.ts')>();
   return { ...actual, runIosRunnerCommand: vi.fn(actual.runIosRunnerCommand) };
 });
-vi.mock('../../apple/core/simulator.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../apple/core/simulator.ts')>();
+vi.mock('../simulator.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../simulator.ts')>();
   return {
     ...actual,
     ensureBootedSimulator: vi.fn(actual.ensureBootedSimulator),
     openIosSimulatorApp: vi.fn(actual.openIosSimulatorApp),
   };
 });
-vi.mock('../../apple/core/screenshot-status-bar.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../apple/core/screenshot-status-bar.ts')>();
+vi.mock('../screenshot-status-bar.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../screenshot-status-bar.ts')>();
   return {
     ...actual,
     prepareSimulatorStatusBarForScreenshot: vi.fn(actual.prepareSimulatorStatusBarForScreenshot),
   };
 });
 
-const execActual =
-  await vi.importActual<typeof import('../../../utils/exec.ts')>('../../../utils/exec.ts');
-const retryActual =
-  await vi.importActual<typeof import('../../../utils/retry.ts')>('../../../utils/retry.ts');
-const runnerActual = await vi.importActual<
-  typeof import('../../apple/core/runner/runner-client.ts')
->('../../apple/core/runner/runner-client.ts');
-const simulatorActual = await vi.importActual<typeof import('../../apple/core/simulator.ts')>(
-  '../../apple/core/simulator.ts',
+const execActual = await vi.importActual<typeof import('../../../../utils/exec.ts')>(
+  '../../../../utils/exec.ts',
 );
+const retryActual = await vi.importActual<typeof import('../../../../utils/retry.ts')>(
+  '../../../../utils/retry.ts',
+);
+const runnerActual = await vi.importActual<typeof import('../runner/runner-client.ts')>(
+  '../runner/runner-client.ts',
+);
+const simulatorActual = await vi.importActual<typeof import('../simulator.ts')>('../simulator.ts');
 const screenshotStatusBarActual = await vi.importActual<
-  typeof import('../../apple/core/screenshot-status-bar.ts')
->('../../apple/core/screenshot-status-bar.ts');
+  typeof import('../screenshot-status-bar.ts')
+>('../screenshot-status-bar.ts');
 
 import {
   closeIosApp,
@@ -60,36 +60,30 @@ import {
   setIosSetting,
   shouldFallbackToRunnerForIosScreenshot,
   shouldRetryIosSimulatorScreenshot,
-} from '../../apple/core/apps.ts';
+} from '../apps.ts';
 import { withMockedMacOsHelper } from './macos-helper-test-utils.ts';
-import { quitMacOsApp, resolveMacOsHelperPackageRootFrom } from '../../apple/os/macos/helper.ts';
+import { quitMacOsApp, resolveMacOsHelperPackageRootFrom } from '../../os/macos/helper.ts';
 import {
   captureSimulatorScreenshotWithFallback,
   captureSimulatorScreenshotWithRetry,
   captureScreenshotViaRunner,
   prepareSimulatorStatusBarForScreenshot,
   resolveSimulatorRunnerScreenshotCandidatePaths,
-} from '../../apple/core/screenshot.ts';
-import { ensureBootedSimulator, openIosSimulatorApp } from '../../apple/core/simulator.ts';
+} from '../screenshot.ts';
+import { ensureBootedSimulator, openIosSimulatorApp } from '../simulator.ts';
 import {
   invalidateSimulatorStatusBarOverrideCache,
   prepareSimulatorStatusBarForScreenshot as prepareStatusBarForScreenshot,
-} from '../../apple/core/screenshot-status-bar.ts';
-import { runIosRunnerCommand } from '../../apple/core/runner/runner-client.ts';
-import { iosRunnerOverrides } from '../interactions.ts';
-import {
-  IOS_DEVICE_INSTALL_TIMEOUT_MS,
-  IOS_SIMULATOR_TERMINATE_TIMEOUT_MS,
-} from '../../apple/core/config.ts';
-import type { DeviceInfo } from '../../../kernel/device.ts';
-import { withDiagnosticsScope } from '../../../utils/diagnostics.ts';
-import { AppError } from '../../../kernel/errors.ts';
-import { runCmd } from '../../../utils/exec.ts';
-import { retryWithPolicy } from '../../../utils/retry.ts';
-import {
-  parseIosDeviceAppsPayload,
-  parseIosDeviceProcessesPayload,
-} from '../../apple/core/devicectl.ts';
+} from '../screenshot-status-bar.ts';
+import { runIosRunnerCommand } from '../runner/runner-client.ts';
+import { iosRunnerOverrides } from '../../../ios/interactions.ts';
+import { IOS_DEVICE_INSTALL_TIMEOUT_MS, IOS_SIMULATOR_TERMINATE_TIMEOUT_MS } from '../config.ts';
+import type { DeviceInfo } from '../../../../kernel/device.ts';
+import { withDiagnosticsScope } from '../../../../utils/diagnostics.ts';
+import { AppError } from '../../../../kernel/errors.ts';
+import { runCmd } from '../../../../utils/exec.ts';
+import { retryWithPolicy } from '../../../../utils/retry.ts';
+import { parseIosDeviceAppsPayload, parseIosDeviceProcessesPayload } from '../devicectl.ts';
 
 const IOS_TEST_DEVICE: DeviceInfo = {
   platform: 'ios',

src/platforms/ios/__tests__/launch-diagnostics.test.ts → src/platforms/apple/core/__tests__/launch-diagnostics.test.ts

@@ -4,8 +4,8 @@ import {
   isSimulatorLaunchFBSError,
   classifyLaunchFailure,
   launchFailureHint,
-} from '../../apple/core/launch-diagnostics.ts';
-import { AppError } from '../../../kernel/errors.ts';
+} from '../launch-diagnostics.ts';
+import { AppError } from '../../../../kernel/errors.ts';
 
 test('isSimulatorLaunchFBSError identifies FBS code=4 errors', () => {
   const error = new AppError('COMMAND_FAILED', 'xcrun exited with code 4', {

src/platforms/ios/__tests__/perf.test.ts → src/platforms/apple/core/__tests__/perf.test.ts

@@ -4,8 +4,8 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-vi.mock('../../../utils/exec.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
+vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
   return {
     ...actual,
     runCmd: vi.fn(actual.runCmd),
@@ -18,17 +18,17 @@ import {
   parseApplePsOutput,
   sampleAppleFramePerf,
   sampleApplePerfMetrics,
-} from '../../apple/core/perf.ts';
+} from '../perf.ts';
 import {
   startAppleXctracePerfCapture,
   stopAppleXctracePerfCapture,
   writeAppleXctracePerfReport,
   type AppleXctracePerfCapture,
-} from '../../apple/core/perf-xctrace.ts';
-import { parseAppleFramePerfSample } from '../../apple/core/perf-frame.ts';
-import { runCmd, runCmdBackground } from '../../../utils/exec.ts';
-import type { DeviceInfo } from '../../../kernel/device.ts';
-import { AppError } from '../../../kernel/errors.ts';
+} from '../perf-xctrace.ts';
+import { parseAppleFramePerfSample } from '../perf-frame.ts';
+import { runCmd, runCmdBackground } from '../../../../utils/exec.ts';
+import type { DeviceInfo } from '../../../../kernel/device.ts';
+import { AppError } from '../../../../kernel/errors.ts';
 
 const mockRunCmd = vi.mocked(runCmd);
 const mockRunCmdBackground = vi.mocked(runCmdBackground);

src/platforms/ios/__tests__/plist.test.ts → src/platforms/apple/core/__tests__/plist.test.ts

@@ -4,13 +4,13 @@ import { promises as fs } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-vi.mock('../../../utils/exec.ts', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
+vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
   return { ...actual, runCmd: vi.fn(actual.runCmd) };
 });
 
-import { runCmd } from '../../../utils/exec.ts';
-import { readInfoPlistString } from '../../apple/core/plist.ts';
+import { runCmd } from '../../../../utils/exec.ts';
+import { readInfoPlistString } from '../plist.ts';
 
 const mockRunCmd = vi.mocked(runCmd);
 

src/platforms/ios/__tests__/runner-command-retry.test.ts → src/platforms/apple/core/__tests__/runner-command-retry.test.ts

@@ -1,10 +1,10 @@
 import { beforeEach, test, vi } from 'vitest';
 import assert from 'node:assert/strict';
-import { IOS_SIMULATOR } from '../../../__tests__/test-utils/index.ts';
-import { clearRequestCanceled, markRequestCanceled } from '../../../daemon/request-cancel.ts';
-import { AppError } from '../../../kernel/errors.ts';
-import { Deadline } from '../../../utils/retry.ts';
-import type { RunnerSession } from '../../apple/core/runner/runner-session-types.ts';
+import { IOS_SIMULATOR } from '../../../../__tests__/test-utils/index.ts';
+import { clearRequestCanceled, markRequestCanceled } from '../../../../daemon/request-cancel.ts';
+import { AppError } from '../../../../kernel/errors.ts';
+import { Deadline } from '../../../../utils/retry.ts';
+import type { RunnerSession } from '../runner/runner-session-types.ts';
 
 const {
   mockEnsureRunnerSession,
@@ -20,19 +20,19 @@ const {
   mockMarkRunnerXctestrunArtifactBadForRun: vi.fn(),
 }));
 
-vi.mock('../../../utils/diagnostics.ts', async () => {
-  const actual = await vi.importActual<typeof import('../../../utils/diagnostics.ts')>(
-    '../../../utils/diagnostics.ts',
+vi.mock('../../../../utils/diagnostics.ts', async () => {
+  const actual = await vi.importActual<typeof import('../../../../utils/diagnostics.ts')>(
+    '../../../../utils/diagnostics.ts',
   );
   return {
     ...actual,
     emitDiagnostic: mockEmitDiagnostic,
   };
 });
 
-vi.mock('../../apple/core/runner/runner-session.ts', async () => {
-  const actual = await vi.importActual<typeof import('../../apple/core/runner/runner-session.ts')>(
-    '../../apple/core/runner/runner-session.ts',
+vi.mock('../runner/runner-session.ts', async () => {
+  const actual = await vi.importActual<typeof import('../runner/runner-session.ts')>(
+    '../runner/runner-session.ts',
   );
   return {
     ...actual,
@@ -42,10 +42,10 @@ vi.mock('../../apple/core/runner/runner-session.ts', async () => {
   };
 });
 
-vi.mock('../../apple/core/runner/runner-xctestrun.ts', async () => {
-  const actual = await vi.importActual<
-    typeof import('../../apple/core/runner/runner-xctestrun.ts')
-  >('../../apple/core/runner/runner-xctestrun.ts');
+vi.mock('../runner/runner-xctestrun.ts', async () => {
+  const actual = await vi.importActual<typeof import('../runner/runner-xctestrun.ts')>(
+    '../runner/runner-xctestrun.ts',
+  );
   return {
     ...actual,
     markRunnerXctestrunArtifactBadForRun: mockMarkRunnerXctestrunArtifactBadForRun,
@@ -56,8 +56,8 @@ import {
   prepareIosRunner,
   prewarmIosRunnerSession,
   runIosRunnerCommand,
-} from '../../apple/core/runner/runner-client.ts';
-import type { RunnerXctestrunArtifact } from '../../apple/core/runner/runner-xctestrun.ts';
+} from '../runner/runner-client.ts';
+import type { RunnerXctestrunArtifact } from '../runner/runner-xctestrun.ts';
 
 beforeEach(() => {
   vi.resetAllMocks();

src/platforms/ios/__tests__/runner-command-traits.test.ts → src/platforms/apple/core/__tests__/runner-command-traits.test.ts

@@ -1,14 +1,14 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import type { RunnerCommand } from '../../apple/core/runner/runner-contract.ts';
+import type { RunnerCommand } from '../runner/runner-contract.ts';
 import {
   canSkipRunnerReadinessPreflightAfterHealthyMutation,
   isReadOnlyRunnerCommand,
   isRunnerReadinessProbeCommand,
   readRunnerCommandTraits,
   type RunnerCommandTraits,
-} from '../../apple/core/runner/runner-command-traits.ts';
-import { RUNNER_COMMAND_TRAIT_MANIFEST } from '../../apple/core/runner/runner-command-manifest.ts';
+} from '../runner/runner-command-traits.ts';
+import { RUNNER_COMMAND_TRAIT_MANIFEST } from '../runner/runner-command-manifest.ts';
 
 const EXPECTED_RUNNER_COMMAND_TRAITS = Object.fromEntries(
   Object.entries(RUNNER_COMMAND_TRAIT_MANIFEST).map(([command, traitClass]) => [

src/platforms/ios/__tests__/runner-icon.test.ts → src/platforms/apple/core/__tests__/runner-icon.test.ts

@@ -4,14 +4,11 @@ import os from 'node:os';
 import path from 'node:path';
 import { test } from 'vitest';
 
-import {
-  createLocalAppleToolProvider,
-  withAppleToolProvider,
-} from '../../apple/core/tool-provider.ts';
+import { createLocalAppleToolProvider, withAppleToolProvider } from '../tool-provider.ts';
 import {
   applyXctestRunnerAppIcon,
   applyXctestRunnerAppIconFromDerivedPath,
-} from '../../apple/core/runner/runner-icon.ts';
+} from '../runner/runner-icon.ts';
 
 type AppleToolCall = [string, string[]];
 

src/platforms/ios/__tests__/runner-provider.test.ts → src/platforms/apple/core/__tests__/runner-provider.test.ts

@@ -1,11 +1,11 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
-import { IOS_SIMULATOR } from '../../../__tests__/test-utils/index.ts';
+import { IOS_SIMULATOR } from '../../../../__tests__/test-utils/index.ts';
 import {
   resolveAppleRunnerProvider,
   withAppleRunnerProvider,
   type AppleRunnerProvider,
-} from '../../apple/core/runner/runner-provider.ts';
+} from '../runner/runner-provider.ts';
 
 test('scoped Apple runner provider requires matching request id when scoped by request', async () => {
   const calls: string[] = [];

src/platforms/ios/__tests__/runner-sequence.test.ts → src/platforms/apple/core/__tests__/runner-sequence.test.ts

@@ -1,14 +1,14 @@
 import { test } from 'vitest';
 import assert from 'node:assert/strict';
-import { AppError } from '../../../kernel/errors.ts';
+import { AppError } from '../../../../kernel/errors.ts';
 import {
   MAX_RUNNER_SEQUENCE_STEPS,
   SEQUENCEABLE_RUNNER_STEP_KINDS,
   buildRunnerSequenceCommand,
   parseRunnerSequenceResult,
   validateRunnerSequenceSteps,
-} from '../../apple/core/runner/runner-sequence.ts';
-import type { RunnerSequenceStep } from '../../apple/core/runner/runner-contract.ts';
+} from '../runner/runner-sequence.ts';
+import type { RunnerSequenceStep } from '../runner/runner-contract.ts';
 
 function tap(x: number, y: number): RunnerSequenceStep {
   return { kind: 'tap', x, y };