From fab8849c733780876961da8ed30969625ba52318 Mon Sep 17 00:00:00 2001 From: Andrey Goncharov Date: Mon, 20 Jun 2022 12:18:40 -0700 Subject: [PATCH] Use TestDevice from flipper-frontend-core in flipper-ui-core Summary: See D37139129 Reviewed By: lblasa Differential Revision: D37235567 fbshipit-source-id: a0596ba71fcb8722088e51361774389a7daaebb8 --- desktop/flipper-frontend-core/src/index.tsx | 1 + .../src/__tests__/disconnect.node.tsx | 2 +- .../src/__tests__/test-utils/MockFlipper.tsx | 3 +- .../src/deprecated-exports.tsx | 3 +- .../src/devices/TestDevice.tsx | 39 ------------------- .../src/devices/__tests__/BaseDevice.node.tsx | 3 +- .../reducers/__tests__/connections.node.tsx | 3 +- .../appinspect/__tests__/PluginList.spec.tsx | 3 +- .../src/utils/__tests__/exportData.node.tsx | 3 +- 9 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 desktop/flipper-ui-core/src/devices/TestDevice.tsx diff --git a/desktop/flipper-frontend-core/src/index.tsx b/desktop/flipper-frontend-core/src/index.tsx index 9f9de0c67..a83b9940c 100644 --- a/desktop/flipper-frontend-core/src/index.tsx +++ b/desktop/flipper-frontend-core/src/index.tsx @@ -16,6 +16,7 @@ export { } from './AbstractClient'; export {default as ArchivedDevice} from './devices/ArchivedDevice'; export {default as BaseDevice, DeviceExport} from './devices/BaseDevice'; +export {TestDevice} from './devices/TestDevice'; export * from './globalObject'; export * from './plugins'; export {getPluginKey} from './utils/pluginKey'; diff --git a/desktop/flipper-ui-core/src/__tests__/disconnect.node.tsx b/desktop/flipper-ui-core/src/__tests__/disconnect.node.tsx index c9f8a48a5..672c88779 100644 --- a/desktop/flipper-ui-core/src/__tests__/disconnect.node.tsx +++ b/desktop/flipper-ui-core/src/__tests__/disconnect.node.tsx @@ -16,7 +16,7 @@ import { PluginClient, } from 'flipper-plugin'; import {handleClientConnected} from '../dispatcher/flipperServer'; -import {TestDevice} from '../devices/TestDevice'; +import {TestDevice} from 'flipper-frontend-core'; test('Devices can disconnect', async () => { const deviceplugin = new _SandyPluginDefinition( diff --git a/desktop/flipper-ui-core/src/__tests__/test-utils/MockFlipper.tsx b/desktop/flipper-ui-core/src/__tests__/test-utils/MockFlipper.tsx index ec806b2fe..fc40b5ec0 100644 --- a/desktop/flipper-ui-core/src/__tests__/test-utils/MockFlipper.tsx +++ b/desktop/flipper-ui-core/src/__tests__/test-utils/MockFlipper.tsx @@ -8,7 +8,7 @@ */ import {createStore} from 'redux'; -import {BaseDevice} from 'flipper-frontend-core'; +import {BaseDevice, TestDevice} from 'flipper-frontend-core'; import {createRootReducer} from '../../reducers'; import {Store} from '../../reducers/index'; import Client from '../../Client'; @@ -26,7 +26,6 @@ import {initializeFlipperLibImplementation} from '../../utils/flipperLibImplemen import pluginManager from '../../dispatcher/pluginManager'; import {PluginDetails} from 'flipper-common'; import {ClientQuery, DeviceOS} from 'flipper-common'; -import {TestDevice} from '../../devices/TestDevice'; import {getRenderHostInstance} from '../../RenderHost'; export interface AppOptions { diff --git a/desktop/flipper-ui-core/src/deprecated-exports.tsx b/desktop/flipper-ui-core/src/deprecated-exports.tsx index 0fa10eb68..23fff3ae7 100644 --- a/desktop/flipper-ui-core/src/deprecated-exports.tsx +++ b/desktop/flipper-ui-core/src/deprecated-exports.tsx @@ -31,7 +31,7 @@ export {getPluginKey} from './utils/pluginKey'; export {Notification, Idler} from 'flipper-plugin'; export {IdlerImpl} from './utils/Idler'; export {Store, State as ReduxState} from './reducers/index'; -export {BaseDevice, ArchivedDevice} from 'flipper-frontend-core'; +export {BaseDevice, ArchivedDevice, TestDevice} from 'flipper-frontend-core'; export {default as isProduction} from './utils/isProduction'; export {DetailSidebar} from 'flipper-plugin'; export {BaseDevice as Device} from 'flipper-frontend-core'; @@ -120,5 +120,4 @@ export {callVSCode} from './utils/vscodeUtils'; export {IDEFileResolver, IDEType} from './fb-stubs/IDEFileResolver'; export {Tracked} from 'flipper-plugin'; // To be able to use it in legacy plugins export {RequireLogin} from './ui/components/RequireLogin'; -export {TestDevice} from './devices/TestDevice'; export {connect} from 'react-redux'; diff --git a/desktop/flipper-ui-core/src/devices/TestDevice.tsx b/desktop/flipper-ui-core/src/devices/TestDevice.tsx deleted file mode 100644 index 22d9fc4f5..000000000 --- a/desktop/flipper-ui-core/src/devices/TestDevice.tsx +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @format - */ - -import {DeviceOS, DeviceType} from 'flipper-plugin'; -import {DeviceSpec} from 'flipper-common'; -import {BaseDevice} from 'flipper-frontend-core'; -import {getRenderHostInstance} from '../RenderHost'; - -export class TestDevice extends BaseDevice { - constructor( - serial: string, - deviceType: DeviceType, - title: string, - os: DeviceOS, - specs?: DeviceSpec[], - ) { - super(getRenderHostInstance().flipperServer, { - serial, - deviceType, - title, - os, - specs, - features: { - screenCaptureAvailable: false, - screenshotAvailable: false, - }, - }); - } - - async startLogging() { - // noop - } -} diff --git a/desktop/flipper-ui-core/src/devices/__tests__/BaseDevice.node.tsx b/desktop/flipper-ui-core/src/devices/__tests__/BaseDevice.node.tsx index 8ff0fda5e..2cc4d9e21 100644 --- a/desktop/flipper-ui-core/src/devices/__tests__/BaseDevice.node.tsx +++ b/desktop/flipper-ui-core/src/devices/__tests__/BaseDevice.node.tsx @@ -10,8 +10,7 @@ import * as DeviceTestPluginModule from '../../__tests__/test-utils/DeviceTestPlugin'; import {TestUtils, _SandyPluginDefinition} from 'flipper-plugin'; import {createMockFlipperWithPlugin} from '../../__tests__/test-utils/createMockFlipperWithPlugin'; -import {TestDevice} from '../../devices/TestDevice'; -import {ArchivedDevice} from 'flipper-frontend-core'; +import {ArchivedDevice, TestDevice} from 'flipper-frontend-core'; const physicalDevicePluginDetails = TestUtils.createMockPluginDetails({ id: 'physicalDevicePlugin', diff --git a/desktop/flipper-ui-core/src/reducers/__tests__/connections.node.tsx b/desktop/flipper-ui-core/src/reducers/__tests__/connections.node.tsx index abf94e6ca..c8b14aff9 100644 --- a/desktop/flipper-ui-core/src/reducers/__tests__/connections.node.tsx +++ b/desktop/flipper-ui-core/src/reducers/__tests__/connections.node.tsx @@ -14,14 +14,13 @@ import { _setFlipperLibImplementation, TestUtils, } from 'flipper-plugin'; -import {TestDevice} from '../../devices/TestDevice'; import { createMockFlipperWithPlugin, MockFlipperResult, } from '../../__tests__/test-utils/createMockFlipperWithPlugin'; import {Store} from '..'; import {getActiveClient, getActiveDevice} from '../../selectors/connections'; -import {BaseDevice} from 'flipper-frontend-core'; +import {BaseDevice, TestDevice} from 'flipper-frontend-core'; import Client from '../../Client'; import { mockConsole, diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/PluginList.spec.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/PluginList.spec.tsx index 0c15acfc0..f29dfa8bf 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/PluginList.spec.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/__tests__/PluginList.spec.tsx @@ -12,7 +12,7 @@ import { MockFlipperResult, } from '../../../__tests__/test-utils/createMockFlipperWithPlugin'; import {FlipperPlugin} from '../../../plugin'; -import {BaseDevice} from 'flipper-frontend-core'; +import {BaseDevice, TestDevice} from 'flipper-frontend-core'; import {_SandyPluginDefinition} from 'flipper-plugin'; import {TestUtils} from 'flipper-plugin'; import {selectPlugin} from '../../../reducers/connections'; @@ -32,7 +32,6 @@ import { getMetroDevice, getPluginLists, } from '../../../selectors/connections'; -import {TestDevice} from '../../../devices/TestDevice'; const createMockPluginDetails = TestUtils.createMockPluginDetails; diff --git a/desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx b/desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx index 883e04d41..a0e11b023 100644 --- a/desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx +++ b/desktop/flipper-ui-core/src/utils/__tests__/exportData.node.tsx @@ -11,7 +11,7 @@ import {State} from '../../reducers/index'; import configureStore from 'redux-mock-store'; -import {ArchivedDevice} from 'flipper-frontend-core'; +import {ArchivedDevice, TestDevice} from 'flipper-frontend-core'; import { processStore, determinePluginsToProcess, @@ -37,7 +37,6 @@ import { } from 'flipper-plugin'; import {selectPlugin, getAllClients} from '../../reducers/connections'; import {TestIdler} from '../Idler'; -import {TestDevice} from '../../devices/TestDevice'; import {FlipperServer} from 'flipper-common'; const testIdler = new TestIdler();