Increase ser/extension.ts unit tests code coverage

Author: dgolovin

package.json

@@ -45,8 +45,8 @@
     "onCommand:openshift.component.delete",
     "onCommand:openshift.component.push",
     "onCommand:openshift.component.watch",
-    "onCommand:openshift.catalog.list.components",
-    "onCommand:openshift.catalog.list.services",
+    "onCommand:openshift.catalog.listComponents",
+    "onCommand:openshift.catalog.listServices",
     "onCommand:openshift.url.create",
     "onCommand:openshift.component.openUrl",
     "onCommand:openshift.storage.create",
@@ -175,12 +175,12 @@
         "category": "OpenShift"
       },
       {
-        "command": "openshift.catalog.list.components",
+        "command": "openshift.catalog.listComponents",
         "title": "List Catalog Components ",
         "category": "OpenShift"
       },
       {
-        "command": "openshift.catalog.list.services",
+        "command": "openshift.catalog.listCervices",
         "title": "List Catalog Services",
         "category": "OpenShift"
       },
@@ -352,12 +352,12 @@
           "group": "c1"
         },
         {
-          "command": "openshift.catalog.list.components",
+          "command": "openshift.catalog.listComponents",
           "when": "view == openshiftProjectExplorer && viewItem == cluster && isLoggedIn",
           "group": "c2@1"
         },
         {
-          "command": "openshift.catalog.list.services",
+          "command": "openshift.catalog.listServices",
           "when": "view == openshiftProjectExplorer && viewItem == cluster && isLoggedIn",
           "group": "c2@2"
         },

src/extension.ts

@@ -25,8 +25,8 @@ export function activate(context: vscode.ExtensionContext) {
         vscode.commands.registerCommand('openshift.explorer.login', (context) => execute(Cluster.login, context)),
         vscode.commands.registerCommand('openshift.explorer.logout', (context) => execute(Cluster.logout, context)),
         vscode.commands.registerCommand('openshift.explorer.refresh', (context) => executeSync(Cluster.refresh, context)),
-        vscode.commands.registerCommand('openshift.catalog.list.components', (context) => executeSync(Catalog.listComponents, context)),
-        vscode.commands.registerCommand('openshift.catalog.list.services', (context) => executeSync(Catalog.listServices, context)),
+        vscode.commands.registerCommand('openshift.catalog.listComponents', (context) => executeSync(Catalog.listComponents, context)),
+        vscode.commands.registerCommand('openshift.catalog.listCervices', (context) => executeSync(Catalog.listServices, context)),
         vscode.commands.registerCommand('openshift.project.create', (context) => execute(Project.create, context)),
         vscode.commands.registerCommand('openshift.project.delete', (context) => execute(Project.del, context)),
         vscode.commands.registerCommand('openshift.project.delete.palette', (context) => execute(Project.del, context)),

test/extension.test.ts

@@ -15,12 +15,20 @@ import * as sinonChai from 'sinon-chai';
 import * as sinon from 'sinon';
 import { activate } from '../src/extension';
 import { Cluster } from '../src/openshift/cluster';
+import { Application } from '../src/openshift/application';
+import { Catalog } from '../src/openshift/catalog';
+import { Component} from '../src/openshift/component';
+import { Project} from '../src/openshift/project';
+import { Service} from '../src/openshift/service';
+import { Storage} from '../src/openshift/storage';
+import { Url} from '../src/openshift/url';
 import packagejson = require('../package.json');
+import { isContext } from 'vm';
 
 const expect = chai.expect;
 chai.use(sinonChai);
 
-suite('openshift connector Extension', () => {
+suite('openshift connector Extension', async () => {
 
     let sandbox: sinon.SinonSandbox;
 
@@ -57,10 +65,36 @@ suite('openshift connector Extension', () => {
 		assert.ok(vscode.extensions.getExtension('redhat.vscode-openshift-connector'));
 	});
 
+    async function getStaticMethosToStub(osc: string[]): Promise<string[]> {
+        let mths: Set<string> = new Set();
+        osc.forEach(name => {
+            name.replace('.palette', '');
+            let segs: string[] = name.split('.');
+            let methName: string = segs[segs.length-1];
+            methName = methName === 'delete'? 'del' : methName;
+            !mths.has(methName) && mths.add(methName);
+
+        });
+        return Array.from(mths);
+    }
+
     test('should activate extension', async () => {
         const registerTreeDataProviderStub = sandbox.stub(vscode.window, 'registerTreeDataProvider');
+        sandbox.stub(vscode.window, 'showErrorMessage');
         await activate(context);
+        let cmds:string[] = await vscode.commands.getCommands();
+        let osc:string[] = cmds.filter((item) => item.includes('openshift.'));
         expect(registerTreeDataProviderStub).calledOnce;
+        const mths: string[] = await getStaticMethosToStub(osc);
+        (<any>[Application, Catalog, Cluster, Component, Project, Service, Storage, Url]).forEach(async (item) => {
+            mths.forEach((name) => {
+                if (item[name]) {
+                    sandbox.stub(item, name);
+                }
+            });
+        })
+        osc.forEach((item) => vscode.commands.executeCommand(item));
+        expect(vscode.window.showErrorMessage).has.not.been.called;
     });
 
     test('should register all server commands', async () => {
@@ -71,7 +105,7 @@ suite('openshift connector Extension', () => {
                 serverCommands.push(value.command);
             });
             const foundServerCommands = commands.filter((value) => {
-                return serverCommands.indexOf(value) >= 0 || value.startsWith('openshift.');
+                return serverCommands.indexOf(value) >= 0;
             });
             assert.equal(foundServerCommands.length , serverCommands.length, 'Some openshift commands are not registered properly or a new command is not added to the test');
         });
@@ -107,6 +141,13 @@ suite('openshift connector Extension', () => {
         const simStub: sinon.SinonStub = sandbox.stub(vscode.window, 'showInformationMessage');
         await vscode.commands.executeCommand('openshift.about');
         expect(simStub).not.called;
-    })
+    });
 
+    test('sync command wrapper shows message returned from command', async () => {
+        const error = new Error('Message');
+        sandbox.stub(Cluster, 'refresh').throws(error);
+        const semStub: sinon.SinonStub = sandbox.stub(vscode.window, 'showErrorMessage');
+        await vscode.commands.executeCommand('openshift.explorer.refresh');
+        expect(semStub).calledWith(error);
+    });
 });