Add check in iOS device and simulator discovery if platform is Android.

Author: KristianDD

definitions/mobile.d.ts

@@ -406,7 +406,7 @@ declare module Mobile {
 		startDeviceDetectionInterval(): Promise<void>;
 		getDeviceByIdentifier(identifier: string): Mobile.IDevice;
 		mapAbstractToTcpPort(deviceIdentifier: string, appIdentifier: string, framework: string): Promise<string>;
-		detectCurrentlyAttachedDevices(): Promise<void>;
+		detectCurrentlyAttachedDevices(options?: Mobile.IDeviceLookingOptions): Promise<void>;
 		startEmulator(platform?: string, emulatorImage?: string): Promise<void>;
 		isCompanionAppInstalledOnDevices(deviceIdentifiers: string[], framework: string): Promise<IAppInstalledInfo>[];
 		getDebuggableApps(deviceIdentifiers: string[]): Promise<Mobile.IDeviceApplicationInformation[]>[];

mobile/mobile-core/devices-service.ts

@@ -255,8 +255,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	 * Method expects running devices.
 	 * @param identifier parameter passed by the user to --device flag
 	 */
-	private async getDevice(deviceOption: string): Promise<Mobile.IDevice> {
-		await this.detectCurrentlyAttachedDevices();
+	private async getDevice(deviceOption: string, platform?: string): Promise<Mobile.IDevice> {
+		await this.detectCurrentlyAttachedDevices({ shouldReturnImmediateResult: false, platform: this._platform });
 		let device: Mobile.IDevice = null;
 
 		let emulatorIdentifier = null;
@@ -442,7 +442,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 
 		if (platform && deviceOption) {
 			this._platform = this.getPlatform(data.platform);
-			this._device = await this.getDevice(deviceOption);
+			this._device = await this.getDevice(deviceOption, this._platform);
 			if (this._device.deviceInfo.platform !== this._platform) {
 				this.$errors.fail(constants.ERROR_CANNOT_RESOLVE_DEVICE);
 			}

mobile/mobile-core/ios-device-discovery.ts

@@ -7,6 +7,7 @@ export class IOSDeviceDiscovery extends DeviceDiscovery {
 	constructor(private $injector: IInjector,
 		private $logger: ILogger,
 		private $iTunesValidator: Mobile.IiTunesValidator,
+		private $mobileHelper: Mobile.IMobileHelper,
 		private $iosDeviceOperations: IIOSDeviceOperations) {
 		super();
 	}
@@ -24,6 +25,9 @@ export class IOSDeviceDiscovery extends DeviceDiscovery {
 	}
 
 	public async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
+		if (options && options.platform && !this.$mobileHelper.isiOSPlatform(options.platform)) {
+			return;
+		}
 		if (this.validateiTunes()) {
 			await this.$iosDeviceOperations.startLookingForDevices((deviceInfo: IOSDeviceLib.IDeviceActionInfo) => {
 				this.createAndAddDevice(deviceInfo);

mobile/mobile-core/ios-simulator-discovery.ts

@@ -7,11 +7,16 @@ export class IOSSimulatorDiscovery extends DeviceDiscovery {
 	constructor(private $injector: IInjector,
 		private $childProcess: IChildProcess,
 		private $iOSSimResolver: Mobile.IiOSSimResolver,
+		private $mobileHelper: Mobile.IMobileHelper,
 		private $hostInfo: IHostInfo) {
 		super();
 	}
 
-	public async startLookingForDevices(): Promise<void> {
+	public async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
+		if (options && options.platform && !this.$mobileHelper.isiOSPlatform(options.platform)) {
+			return;
+		}
+
 		return new Promise<void>((resolve, reject) => {
 			return this.checkForDevices(resolve, reject);
 		});

test/unit-tests/mobile/ios-simulator-discovery.ts

@@ -25,6 +25,12 @@ function createTestInjector(): IInjector {
 
 	injector.register("devicePlatformsConstants", DevicePlatformsConstants);
 
+	injector.register("mobileHelper", {
+		isiOSPlatform: () => {
+			return true;
+		}
+	});
+
 	injector.register("iOSSimulatorDiscovery", IOSSimulatorDiscovery);
 
 	injector.register("iOSSimulatorLogProvider", {});