Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .nx/version-plans/version-plan-1777795200000.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
__default__: patch
---

Harness will stop trying to treat connected physical Android devices as emulators. If you run against an Android emulator and also have a physical device plugged in, Harness will now pick the emulator cleanly instead of failing during device resolution.
51 changes: 51 additions & 0 deletions packages/platform-android/src/__tests__/adb-id.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { getAdbId, isAdbIdEmulator } from '../adb-id.js';
import * as adb from '../adb.js';

describe('adb id resolution', () => {
beforeEach(() => {
vi.restoreAllMocks();
});

it('identifies emulator adb ids', () => {
expect(isAdbIdEmulator('emulator-5554')).toBe(true);
expect(isAdbIdEmulator('device-serial-001')).toBe(false);
});

it('skips non-emulator ids when resolving an emulator device', async () => {
vi.spyOn(adb, 'getDeviceIds').mockResolvedValue([
'device-serial-001',
'emulator-5554',
]);
vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Test_AVD_API_35');

await expect(
getAdbId({
type: 'emulator',
name: 'Test_AVD_API_35',
}),
).resolves.toBe('emulator-5554');
});

it('resolves matching physical device by manufacturer and model', async () => {
vi.spyOn(adb, 'getDeviceIds').mockResolvedValue([
'device-serial-001',
'emulator-5554',
]);
vi.spyOn(adb, 'getDeviceInfo').mockImplementation(async (adbId) => {
const results: Record<string, { manufacturer: string; model: string }> = {
'device-serial-001': { manufacturer: 'Acme', model: 'Model A1' },
'emulator-5554': { manufacturer: 'Emulator', model: 'Emulator Model' },
};
return results[adbId] || null;
});

await expect(
getAdbId({
type: 'physical',
manufacturer: 'acme',
model: 'model a1',
}),
).resolves.toBe('device-serial-001');
});
});
4 changes: 4 additions & 0 deletions packages/platform-android/src/adb-id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ export const getAdbId = async (

for (const adbId of adbIds) {
if (isAndroidDeviceEmulator(device)) {
if (!isAdbIdEmulator(adbId)) {
continue;
}

const emulatorName = await adb.getEmulatorName(adbId);

if (emulatorName === device.name) {
Expand Down
18 changes: 18 additions & 0 deletions packages/platform-android/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/// <reference types='vitest' />
import { defineConfig } from 'vite';

export default defineConfig(() => ({
root: __dirname,
cacheDir: '../../node_modules/.vite/packages/platform-android',
test: {
watch: false,
globals: true,
environment: 'node',
include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
reporters: ['default'],
coverage: {
reportsDirectory: './test-output/vitest/coverage',
provider: 'v8' as const,
},
},
}));
Loading