Skip to content

Commit 5060630

Browse files
committed
test: relocate Apple engine unit tests from platforms/ios to platforms/apple/core (#980)
After #968 moved the OS-agnostic Apple engine to src/platforms/apple/core/, its tests still lived in src/platforms/ios/__tests__/. Move the 19 that test Apple engine code into src/platforms/apple/core/__tests__/ so tests sit beside their source, re-relativizing every import / dynamic import / vi.mock / vi.importActual specifier to the new depth. Deferred (still in src/platforms/ios/__tests__/): recording-scripts.test.ts and runner-client.test.ts — both compute runtime fs paths (__dirname / fileURLToPath) to ios-runner artifacts, so they need path-string fixes, not just specifier re-relativization. Tracked under #980. Pure test relocation — no source or behavior change. tsc + oxlint + oxfmt green; the moved suites pass (384 tests across the apple + deferred dirs).
1 parent 62b3eb5 commit 5060630

19 files changed

Lines changed: 126 additions & 132 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
resolveRunnerPlatformName,
66
resolveRunnerSdkName,
77
resolveRunnerXctestrunHints,
8-
} from '../../apple/core/apple-runner-platform.ts';
9-
import type { DeviceInfo } from '../../../kernel/device.ts';
8+
} from '../apple-runner-platform.ts';
9+
import type { DeviceInfo } from '../../../../kernel/device.ts';
1010

1111
function iosSim(overrides: Partial<DeviceInfo> = {}): DeviceInfo {
1212
return {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import fs from 'node:fs/promises';
33
import os from 'node:os';
44
import path from 'node:path';
55
import { test } from 'vitest';
6-
import { symbolicateCrashArtifact } from '../../apple/core/debug-symbols.ts';
7-
import { AppError } from '../../../kernel/errors.ts';
8-
import { withCommandExecutorOverride } from '../../../utils/exec.ts';
6+
import { symbolicateCrashArtifact } from '../debug-symbols.ts';
7+
import { AppError } from '../../../../kernel/errors.ts';
8+
import { withCommandExecutorOverride } from '../../../../utils/exec.ts';
99

1010
const UUID = 'ABCDEFAB-CDEF-ABCD-EFAB-CDEFABCDEFAB';
1111
const NORMALIZED_UUID = 'ABCDEFABCDEFABCDEFABCDEFABCDEFAB';

src/platforms/ios/__tests__/devices.test.ts renamed to src/platforms/apple/core/__tests__/devices.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
parseXctracePhysicalAppleDevices,
1111
resolveAppleTargetFromDevicectlDevice,
1212
withAppleToolProvider,
13-
} from '../../apple/core/devices.ts';
14-
import type { ExecResult } from '../../../utils/exec.ts';
13+
} from '../devices.ts';
14+
import type { ExecResult } from '../../../../utils/exec.ts';
1515

1616
const toolCalls: Array<[string, string[]]> = [];
1717
let mockRunCommand: (cmd: string, args: string[]) => Promise<ExecResult>;

src/platforms/ios/__tests__/index.test.ts renamed to src/platforms/apple/core/__tests__/index.test.ts

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@ import { promises as fs } from 'node:fs';
44
import os from 'node:os';
55
import path from 'node:path';
66

7-
vi.mock('../../../utils/exec.ts', async (importOriginal) => {
8-
const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
7+
vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
8+
const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
99
return { ...actual, runCmd: vi.fn(actual.runCmd) };
1010
});
11-
vi.mock('../../../utils/retry.ts', async (importOriginal) => {
12-
const actual = await importOriginal<typeof import('../../../utils/retry.ts')>();
11+
vi.mock('../../../../utils/retry.ts', async (importOriginal) => {
12+
const actual = await importOriginal<typeof import('../../../../utils/retry.ts')>();
1313
return { ...actual, retryWithPolicy: vi.fn(actual.retryWithPolicy) };
1414
});
15-
vi.mock('../../apple/core/runner/runner-client.ts', async (importOriginal) => {
16-
const actual = await importOriginal<typeof import('../../apple/core/runner/runner-client.ts')>();
15+
vi.mock('../runner/runner-client.ts', async (importOriginal) => {
16+
const actual = await importOriginal<typeof import('../runner/runner-client.ts')>();
1717
return { ...actual, runIosRunnerCommand: vi.fn(actual.runIosRunnerCommand) };
1818
});
19-
vi.mock('../../apple/core/simulator.ts', async (importOriginal) => {
20-
const actual = await importOriginal<typeof import('../../apple/core/simulator.ts')>();
19+
vi.mock('../simulator.ts', async (importOriginal) => {
20+
const actual = await importOriginal<typeof import('../simulator.ts')>();
2121
return {
2222
...actual,
2323
ensureBootedSimulator: vi.fn(actual.ensureBootedSimulator),
2424
openIosSimulatorApp: vi.fn(actual.openIosSimulatorApp),
2525
};
2626
});
27-
vi.mock('../../apple/core/screenshot-status-bar.ts', async (importOriginal) => {
28-
const actual = await importOriginal<typeof import('../../apple/core/screenshot-status-bar.ts')>();
27+
vi.mock('../screenshot-status-bar.ts', async (importOriginal) => {
28+
const actual = await importOriginal<typeof import('../screenshot-status-bar.ts')>();
2929
return {
3030
...actual,
3131
prepareSimulatorStatusBarForScreenshot: vi.fn(actual.prepareSimulatorStatusBarForScreenshot),
3232
};
3333
});
3434

35-
const execActual =
36-
await vi.importActual<typeof import('../../../utils/exec.ts')>('../../../utils/exec.ts');
37-
const retryActual =
38-
await vi.importActual<typeof import('../../../utils/retry.ts')>('../../../utils/retry.ts');
39-
const runnerActual = await vi.importActual<
40-
typeof import('../../apple/core/runner/runner-client.ts')
41-
>('../../apple/core/runner/runner-client.ts');
42-
const simulatorActual = await vi.importActual<typeof import('../../apple/core/simulator.ts')>(
43-
'../../apple/core/simulator.ts',
35+
const execActual = await vi.importActual<typeof import('../../../../utils/exec.ts')>(
36+
'../../../../utils/exec.ts',
4437
);
38+
const retryActual = await vi.importActual<typeof import('../../../../utils/retry.ts')>(
39+
'../../../../utils/retry.ts',
40+
);
41+
const runnerActual = await vi.importActual<typeof import('../runner/runner-client.ts')>(
42+
'../runner/runner-client.ts',
43+
);
44+
const simulatorActual = await vi.importActual<typeof import('../simulator.ts')>('../simulator.ts');
4545
const screenshotStatusBarActual = await vi.importActual<
46-
typeof import('../../apple/core/screenshot-status-bar.ts')
47-
>('../../apple/core/screenshot-status-bar.ts');
46+
typeof import('../screenshot-status-bar.ts')
47+
>('../screenshot-status-bar.ts');
4848

4949
import {
5050
closeIosApp,
@@ -60,36 +60,30 @@ import {
6060
setIosSetting,
6161
shouldFallbackToRunnerForIosScreenshot,
6262
shouldRetryIosSimulatorScreenshot,
63-
} from '../../apple/core/apps.ts';
63+
} from '../apps.ts';
6464
import { withMockedMacOsHelper } from './macos-helper-test-utils.ts';
65-
import { quitMacOsApp, resolveMacOsHelperPackageRootFrom } from '../../apple/os/macos/helper.ts';
65+
import { quitMacOsApp, resolveMacOsHelperPackageRootFrom } from '../../os/macos/helper.ts';
6666
import {
6767
captureSimulatorScreenshotWithFallback,
6868
captureSimulatorScreenshotWithRetry,
6969
captureScreenshotViaRunner,
7070
prepareSimulatorStatusBarForScreenshot,
7171
resolveSimulatorRunnerScreenshotCandidatePaths,
72-
} from '../../apple/core/screenshot.ts';
73-
import { ensureBootedSimulator, openIosSimulatorApp } from '../../apple/core/simulator.ts';
72+
} from '../screenshot.ts';
73+
import { ensureBootedSimulator, openIosSimulatorApp } from '../simulator.ts';
7474
import {
7575
invalidateSimulatorStatusBarOverrideCache,
7676
prepareSimulatorStatusBarForScreenshot as prepareStatusBarForScreenshot,
77-
} from '../../apple/core/screenshot-status-bar.ts';
78-
import { runIosRunnerCommand } from '../../apple/core/runner/runner-client.ts';
79-
import { iosRunnerOverrides } from '../interactions.ts';
80-
import {
81-
IOS_DEVICE_INSTALL_TIMEOUT_MS,
82-
IOS_SIMULATOR_TERMINATE_TIMEOUT_MS,
83-
} from '../../apple/core/config.ts';
84-
import type { DeviceInfo } from '../../../kernel/device.ts';
85-
import { withDiagnosticsScope } from '../../../utils/diagnostics.ts';
86-
import { AppError } from '../../../kernel/errors.ts';
87-
import { runCmd } from '../../../utils/exec.ts';
88-
import { retryWithPolicy } from '../../../utils/retry.ts';
89-
import {
90-
parseIosDeviceAppsPayload,
91-
parseIosDeviceProcessesPayload,
92-
} from '../../apple/core/devicectl.ts';
77+
} from '../screenshot-status-bar.ts';
78+
import { runIosRunnerCommand } from '../runner/runner-client.ts';
79+
import { iosRunnerOverrides } from '../../../ios/interactions.ts';
80+
import { IOS_DEVICE_INSTALL_TIMEOUT_MS, IOS_SIMULATOR_TERMINATE_TIMEOUT_MS } from '../config.ts';
81+
import type { DeviceInfo } from '../../../../kernel/device.ts';
82+
import { withDiagnosticsScope } from '../../../../utils/diagnostics.ts';
83+
import { AppError } from '../../../../kernel/errors.ts';
84+
import { runCmd } from '../../../../utils/exec.ts';
85+
import { retryWithPolicy } from '../../../../utils/retry.ts';
86+
import { parseIosDeviceAppsPayload, parseIosDeviceProcessesPayload } from '../devicectl.ts';
9387

9488
const IOS_TEST_DEVICE: DeviceInfo = {
9589
platform: 'ios',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {
44
isSimulatorLaunchFBSError,
55
classifyLaunchFailure,
66
launchFailureHint,
7-
} from '../../apple/core/launch-diagnostics.ts';
8-
import { AppError } from '../../../kernel/errors.ts';
7+
} from '../launch-diagnostics.ts';
8+
import { AppError } from '../../../../kernel/errors.ts';
99

1010
test('isSimulatorLaunchFBSError identifies FBS code=4 errors', () => {
1111
const error = new AppError('COMMAND_FAILED', 'xcrun exited with code 4', {

src/platforms/ios/__tests__/macos-helper-test-utils.ts renamed to src/platforms/apple/core/__tests__/macos-helper-test-utils.ts

File renamed without changes.

src/platforms/ios/__tests__/perf.test.ts renamed to src/platforms/apple/core/__tests__/perf.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { promises as fs } from 'node:fs';
44
import os from 'node:os';
55
import path from 'node:path';
66

7-
vi.mock('../../../utils/exec.ts', async (importOriginal) => {
8-
const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
7+
vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
8+
const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
99
return {
1010
...actual,
1111
runCmd: vi.fn(actual.runCmd),
@@ -18,17 +18,17 @@ import {
1818
parseApplePsOutput,
1919
sampleAppleFramePerf,
2020
sampleApplePerfMetrics,
21-
} from '../../apple/core/perf.ts';
21+
} from '../perf.ts';
2222
import {
2323
startAppleXctracePerfCapture,
2424
stopAppleXctracePerfCapture,
2525
writeAppleXctracePerfReport,
2626
type AppleXctracePerfCapture,
27-
} from '../../apple/core/perf-xctrace.ts';
28-
import { parseAppleFramePerfSample } from '../../apple/core/perf-frame.ts';
29-
import { runCmd, runCmdBackground } from '../../../utils/exec.ts';
30-
import type { DeviceInfo } from '../../../kernel/device.ts';
31-
import { AppError } from '../../../kernel/errors.ts';
27+
} from '../perf-xctrace.ts';
28+
import { parseAppleFramePerfSample } from '../perf-frame.ts';
29+
import { runCmd, runCmdBackground } from '../../../../utils/exec.ts';
30+
import type { DeviceInfo } from '../../../../kernel/device.ts';
31+
import { AppError } from '../../../../kernel/errors.ts';
3232

3333
const mockRunCmd = vi.mocked(runCmd);
3434
const mockRunCmdBackground = vi.mocked(runCmdBackground);

src/platforms/ios/__tests__/plist.test.ts renamed to src/platforms/apple/core/__tests__/plist.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { promises as fs } from 'node:fs';
44
import os from 'node:os';
55
import path from 'node:path';
66

7-
vi.mock('../../../utils/exec.ts', async (importOriginal) => {
8-
const actual = await importOriginal<typeof import('../../../utils/exec.ts')>();
7+
vi.mock('../../../../utils/exec.ts', async (importOriginal) => {
8+
const actual = await importOriginal<typeof import('../../../../utils/exec.ts')>();
99
return { ...actual, runCmd: vi.fn(actual.runCmd) };
1010
});
1111

12-
import { runCmd } from '../../../utils/exec.ts';
13-
import { readInfoPlistString } from '../../apple/core/plist.ts';
12+
import { runCmd } from '../../../../utils/exec.ts';
13+
import { readInfoPlistString } from '../plist.ts';
1414

1515
const mockRunCmd = vi.mocked(runCmd);
1616

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { beforeEach, test, vi } from 'vitest';
22
import assert from 'node:assert/strict';
3-
import { IOS_SIMULATOR } from '../../../__tests__/test-utils/index.ts';
4-
import { clearRequestCanceled, markRequestCanceled } from '../../../daemon/request-cancel.ts';
5-
import { AppError } from '../../../kernel/errors.ts';
6-
import { Deadline } from '../../../utils/retry.ts';
7-
import type { RunnerSession } from '../../apple/core/runner/runner-session-types.ts';
3+
import { IOS_SIMULATOR } from '../../../../__tests__/test-utils/index.ts';
4+
import { clearRequestCanceled, markRequestCanceled } from '../../../../daemon/request-cancel.ts';
5+
import { AppError } from '../../../../kernel/errors.ts';
6+
import { Deadline } from '../../../../utils/retry.ts';
7+
import type { RunnerSession } from '../runner/runner-session-types.ts';
88

99
const {
1010
mockEnsureRunnerSession,
@@ -20,19 +20,19 @@ const {
2020
mockMarkRunnerXctestrunArtifactBadForRun: vi.fn(),
2121
}));
2222

23-
vi.mock('../../../utils/diagnostics.ts', async () => {
24-
const actual = await vi.importActual<typeof import('../../../utils/diagnostics.ts')>(
25-
'../../../utils/diagnostics.ts',
23+
vi.mock('../../../../utils/diagnostics.ts', async () => {
24+
const actual = await vi.importActual<typeof import('../../../../utils/diagnostics.ts')>(
25+
'../../../../utils/diagnostics.ts',
2626
);
2727
return {
2828
...actual,
2929
emitDiagnostic: mockEmitDiagnostic,
3030
};
3131
});
3232

33-
vi.mock('../../apple/core/runner/runner-session.ts', async () => {
34-
const actual = await vi.importActual<typeof import('../../apple/core/runner/runner-session.ts')>(
35-
'../../apple/core/runner/runner-session.ts',
33+
vi.mock('../runner/runner-session.ts', async () => {
34+
const actual = await vi.importActual<typeof import('../runner/runner-session.ts')>(
35+
'../runner/runner-session.ts',
3636
);
3737
return {
3838
...actual,
@@ -42,10 +42,10 @@ vi.mock('../../apple/core/runner/runner-session.ts', async () => {
4242
};
4343
});
4444

45-
vi.mock('../../apple/core/runner/runner-xctestrun.ts', async () => {
46-
const actual = await vi.importActual<
47-
typeof import('../../apple/core/runner/runner-xctestrun.ts')
48-
>('../../apple/core/runner/runner-xctestrun.ts');
45+
vi.mock('../runner/runner-xctestrun.ts', async () => {
46+
const actual = await vi.importActual<typeof import('../runner/runner-xctestrun.ts')>(
47+
'../runner/runner-xctestrun.ts',
48+
);
4949
return {
5050
...actual,
5151
markRunnerXctestrunArtifactBadForRun: mockMarkRunnerXctestrunArtifactBadForRun,
@@ -56,8 +56,8 @@ import {
5656
prepareIosRunner,
5757
prewarmIosRunnerSession,
5858
runIosRunnerCommand,
59-
} from '../../apple/core/runner/runner-client.ts';
60-
import type { RunnerXctestrunArtifact } from '../../apple/core/runner/runner-xctestrun.ts';
59+
} from '../runner/runner-client.ts';
60+
import type { RunnerXctestrunArtifact } from '../runner/runner-xctestrun.ts';
6161

6262
beforeEach(() => {
6363
vi.resetAllMocks();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import assert from 'node:assert/strict';
22
import { test } from 'vitest';
3-
import type { RunnerCommand } from '../../apple/core/runner/runner-contract.ts';
3+
import type { RunnerCommand } from '../runner/runner-contract.ts';
44
import {
55
canSkipRunnerReadinessPreflightAfterHealthyMutation,
66
isReadOnlyRunnerCommand,
77
isRunnerReadinessProbeCommand,
88
readRunnerCommandTraits,
99
type RunnerCommandTraits,
10-
} from '../../apple/core/runner/runner-command-traits.ts';
11-
import { RUNNER_COMMAND_TRAIT_MANIFEST } from '../../apple/core/runner/runner-command-manifest.ts';
10+
} from '../runner/runner-command-traits.ts';
11+
import { RUNNER_COMMAND_TRAIT_MANIFEST } from '../runner/runner-command-manifest.ts';
1212

1313
const EXPECTED_RUNNER_COMMAND_TRAITS = Object.fromEntries(
1414
Object.entries(RUNNER_COMMAND_TRAIT_MANIFEST).map(([command, traitClass]) => [

0 commit comments

Comments
 (0)