fix tests from merge

Author: Hweinstock

src/ec2/prompter.ts

@@ -20,10 +20,14 @@ export interface Ec2Selection {
 export class Ec2Prompter {
     public constructor(protected filter?: instanceFilter) {}
 
-    protected static asQuickPickItem(instance: Ec2Instance): DataQuickPickItem<string> {
+    public static getLabel(instance: Ec2Instance): string {
         const icon = `$(${getIconCode(instance)})`
+        return `${instance.name ?? '(no name)'} \t ${icon} ${instance.status!.toUpperCase()}`
+    }
+
+    protected static asQuickPickItem(instance: Ec2Instance): DataQuickPickItem<string> {
         return {
-            label: `${instance.name ?? '(no name)'} \t ${icon} ${instance.status!.toUpperCase()}`,
+            label: this.getLabel(instance),
             detail: instance.InstanceId,
             data: instance.InstanceId,
         }

src/test/ec2/explorer/ec2ParentNode.test.ts

@@ -58,8 +58,8 @@ describe('ec2ParentNode', function () {
     beforeEach(function () {
         getInstanceStub = sinon.stub(Ec2Client.prototype, 'getInstances')
         defaultInstances = [
-            { name: 'firstOne', InstanceId: '0' },
-            { name: 'secondOne', InstanceId: '1' },
+            { name: 'firstOne', InstanceId: '0', status: 'running' },
+            { name: 'secondOne', InstanceId: '1', status: 'stopped' },
         ]
 
         testNode = new Ec2ParentNode(testRegion, testPartition, client)

src/test/ec2/prompter.test.ts

@@ -57,10 +57,11 @@ describe('Ec2Prompter', async function () {
                 InstanceId: 'testInstanceId',
                 status: 'running',
             }
+            const icon = `$(${getIconCode(testInstance)})`
 
             const result = prompter.testAsQuickPickItem(testInstance)
             const expected = {
-                label: `$(${getIconCode(testInstance)}) \t ${testInstance.name}`,
+                label: `${testInstance.name ?? '(no name)'} \t ${icon} ${testInstance.status!.toUpperCase()}`,
                 detail: testInstance.InstanceId,
                 data: testInstance.InstanceId,
             }
@@ -71,11 +72,12 @@ describe('Ec2Prompter', async function () {
             const testInstance = {
                 InstanceId: 'testInstanceId',
                 status: 'running',
+                name: 'testInstance',
             }
 
             const result = prompter.testAsQuickPickItem(testInstance)
             const expected = {
-                label: `$(${getIconCode(testInstance)}) \t (no name)`,
+                label: Ec2Prompter.getLabel(testInstance),
                 detail: testInstance.InstanceId,
                 data: testInstance.InstanceId,
             }
@@ -144,17 +146,17 @@ describe('Ec2Prompter', async function () {
         it('returns items mapped to QuickPick items without filter', async function () {
             const expected = [
                 {
-                    label: `$(${getIconCode(prompter.instances[0])}) \t ${prompter.instances[0].name!}`,
+                    label: Ec2Prompter.getLabel(prompter.instances[0]),
                     detail: prompter.instances[0].InstanceId!,
                     data: prompter.instances[0].InstanceId!,
                 },
                 {
-                    label: `$(${getIconCode(prompter.instances[1])}) \t ${prompter.instances[1].name!}`,
+                    label: Ec2Prompter.getLabel(prompter.instances[1]),
                     detail: prompter.instances[1].InstanceId!,
                     data: prompter.instances[1].InstanceId!,
                 },
                 {
-                    label: `$(${getIconCode(prompter.instances[2])}) \t ${prompter.instances[2].name!}`,
+                    label: Ec2Prompter.getLabel(prompter.instances[2]),
                     detail: prompter.instances[2].InstanceId!,
                     data: prompter.instances[2].InstanceId!,
                 },
@@ -169,12 +171,12 @@ describe('Ec2Prompter', async function () {
 
             const expected = [
                 {
-                    label: `$(${getIconCode(prompter.instances[0])}) \t ${prompter.instances[0].name!}`,
+                    label: Ec2Prompter.getLabel(prompter.instances[0]),
                     detail: prompter.instances[0].InstanceId!,
                     data: prompter.instances[0].InstanceId!,
                 },
                 {
-                    label: `$(${getIconCode(prompter.instances[2])}) \t ${prompter.instances[2].name!}`,
+                    label: Ec2Prompter.getLabel(prompter.instances[2]),
                     detail: prompter.instances[2].InstanceId!,
                     data: prompter.instances[2].InstanceId!,
                 },