move shared data to one place

Author: Hweinstock

packages/core/src/test/awsService/ec2/explorer/ec2InstanceNode.test.ts

@@ -12,33 +12,23 @@ import {
     Ec2InstanceStoppedContext,
     refreshExplorerNode,
 } from '../../../../awsService/ec2/explorer/ec2InstanceNode'
-import { Ec2Client, SafeEc2Instance, getNameOfInstance } from '../../../../shared/clients/ec2Client'
+import { Ec2Client, getNameOfInstance } from '../../../../shared/clients/ec2Client'
 import { Ec2ParentNode } from '../../../../awsService/ec2/explorer/ec2ParentNode'
 import { DefaultAwsContext } from '../../../../shared'
+import { testClient, testInstance, testParentNode } from './ec2ParentNode.test'
 
 describe('ec2InstanceNode', function () {
     let testNode: Ec2InstanceNode
-    let testInstance: SafeEc2Instance
-    const testRegion = 'testRegion'
-    const testPartition = 'testPartition'
-
     before(function () {
-        testInstance = {
-            InstanceId: 'testId',
-            Tags: [
-                {
-                    Key: 'Name',
-                    Value: 'testName',
-                },
-            ],
-            LastSeenStatus: 'running',
-        }
-        const testClient = new Ec2Client('')
-        const testParentNode = new Ec2ParentNode(testRegion, testPartition, testClient)
+        sinon.stub(DefaultAwsContext.prototype, 'getCredentialAccountId')
         testNode = new Ec2InstanceNode(testParentNode, testClient, 'testRegion', 'testPartition', testInstance)
     })
 
-    this.beforeEach(function () {
+    after(function () {
+        sinon.restore()
+    })
+
+    beforeEach(function () {
         testNode.updateInstance(testInstance)
     })
 
@@ -97,34 +87,7 @@ describe('ec2InstanceNode', function () {
     })
 
     describe('refreshExplorerNode', function () {
-        let testInstance: SafeEc2Instance
-        let testParentNode: Ec2ParentNode
-        let testClient: Ec2Client
-        let testNode: Ec2InstanceNode
-
-        before(function () {
-            sinon.stub(DefaultAwsContext.prototype, 'getCredentialAccountId')
-            testInstance = {
-                InstanceId: 'testId',
-                Tags: [
-                    {
-                        Key: 'Name',
-                        Value: 'testName',
-                    },
-                ],
-                LastSeenStatus: 'running',
-            }
-            testClient = new Ec2Client('')
-            testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
-            testNode = new Ec2InstanceNode(testParentNode, testClient, 'testRegion', 'testPartition', testInstance)
-        })
-
-        after(function () {
-            sinon.restore()
-        })
-
         it('refreshes only parent node', async function () {
-            const testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
             const parentRefresh = sinon.stub(Ec2ParentNode.prototype, 'refreshNode')
             const childRefresh = sinon.stub(Ec2InstanceNode.prototype, 'refreshNode')
 

packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts

@@ -19,6 +19,19 @@ import * as FakeTimers from '@sinonjs/fake-timers'
 import { installFakeClock } from '../../../testUtil'
 import { PollingSet } from '../../../../shared/utilities/pollingSet'
 
+export const testInstance = {
+    InstanceId: 'testId',
+    Tags: [
+        {
+            Key: 'Name',
+            Value: 'testName',
+        },
+    ],
+    LastSeenStatus: 'running',
+}
+export const testClient = new Ec2Client('')
+export const testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
+
 describe('ec2ParentNode', function () {
     let testNode: Ec2ParentNode
     let defaultInstances: SafeEc2Instance[]

packages/core/src/test/awsService/ec2/prompter.test.ts

@@ -5,14 +5,14 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { Ec2Prompter, getSelection, instanceFilter } from '../../../awsService/ec2/prompter'
-import { Ec2Client, SafeEc2Instance } from '../../../shared/clients/ec2Client'
+import { SafeEc2Instance } from '../../../shared/clients/ec2Client'
 import { RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu'
 import { Ec2Selection } from '../../../awsService/ec2/prompter'
 import { AsyncCollection } from '../../../shared/utilities/asyncCollection'
 import { intoCollection } from '../../../shared/utilities/collectionUtils'
 import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
-import { Ec2ParentNode } from '../../../awsService/ec2/explorer/ec2ParentNode'
 import { Ec2InstanceNode } from '../../../awsService/ec2/explorer/ec2InstanceNode'
+import { testClient, testInstance, testParentNode } from './explorer/ec2ParentNode.test'
 
 describe('Ec2Prompter', async function () {
     class MockEc2Prompter extends Ec2Prompter {
@@ -189,27 +189,14 @@ describe('Ec2Prompter', async function () {
 
     describe('getSelection', async function () {
         it('uses node when passed', async function () {
-            const testInstance = {
-                InstanceId: 'testId',
-                Tags: [
-                    {
-                        Key: 'Name',
-                        Value: 'testName',
-                    },
-                ],
-                LastSeenStatus: 'running',
-            }
-            const testClient = new Ec2Client('')
-            const testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
+            const prompterStub = sinon.stub(Ec2Prompter.prototype, 'promptUser')
             const testNode = new Ec2InstanceNode(
                 testParentNode,
                 testClient,
                 'testRegion',
                 'testPartition',
                 testInstance
             )
-
-            const prompterStub = sinon.stub(Ec2Prompter.prototype, 'promptUser')
             const result = await getSelection(testNode)
 
             assert.strictEqual(result.instanceId, testNode.toSelection().instanceId)

packages/core/src/test/awsService/ec2/remoteSessionManager.ts renamed to packages/core/src/test/awsService/ec2/remoteSessionManager.test.ts

@@ -5,33 +5,13 @@
 
 import assert from 'assert'
 import * as sinon from 'sinon'
-import { Ec2Client, SafeEc2Instance } from '../../../shared/clients/ec2Client'
+import { SafeEc2Instance } from '../../../shared/clients/ec2Client'
 import { getIconCode } from '../../../awsService/ec2/utils'
-import { Ec2InstanceNode } from '../../../awsService/ec2/explorer/ec2InstanceNode'
-import { Ec2ParentNode } from '../../../awsService/ec2/explorer/ec2ParentNode'
 import { DefaultAwsContext } from '../../../shared'
 
 describe('utils', async function () {
-    let testInstance: SafeEc2Instance
-    let testParentNode: Ec2ParentNode
-    let testClient: Ec2Client
-    let testNode: Ec2InstanceNode
-
     before(function () {
         sinon.stub(DefaultAwsContext.prototype, 'getCredentialAccountId')
-        testInstance = {
-            InstanceId: 'testId',
-            Tags: [
-                {
-                    Key: 'Name',
-                    Value: 'testName',
-                },
-            ],
-            LastSeenStatus: 'running',
-        }
-        testClient = new Ec2Client('')
-        testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
-        testNode = new Ec2InstanceNode(testParentNode, testClient, 'testRegion', 'testPartition', testInstance)
     })
 
     after(function () {