Fix TestDataItemType.

Author: ericsnowcurrently

src/client/testing/common/types.ts

@@ -69,10 +69,10 @@ export type TestsToRun = {
 // test results
 
 export enum TestingType {
-    folder = 'testFolder',
-    file = 'testFile',
-    suite = 'testSuite',
-    function = 'testFunction'
+    folder = 'folder',
+    file = 'file',
+    suite = 'suite',
+    function = 'function'
 }
 
 export enum TestStatus {

src/client/testing/types.ts

@@ -158,11 +158,11 @@ export interface ILocationStackFrameDetails {
 export type WorkspaceTestStatus = { workspace: Uri; status: TestStatus };
 
 export enum TestDataItemType {
-    workspaceFolder = 'testWorkspaceFolder',
-    folder = 'testFolder',
-    file = 'testFile',
-    suite = 'testSuite',
-    function = 'testFunction'
+    workspaceFolder = 'workspaceFolder',
+    folder = 'folder',
+    file = 'file',
+    suite = 'suite',
+    function = 'function'
 }
 export type TestDataItem = TestWorkspaceFolder | TestFolder | TestFile | TestSuite | TestFunction;
 

src/test/testing/common/testUtils.unit.test.ts

@@ -89,7 +89,7 @@ export function createMockTestDataItem<T extends TestDataItem>(
         case TestDataItemType.workspaceFolder:
             return (new TestWorkspaceFolder({ uri: Uri.file(''), name: 'a', index: 0 })) as T;
         default:
-            throw new Error('Unknown type');
+            throw new Error(`Unknown type ${type}`);
     }
 }
 

src/test/testing/explorer/testTreeViewItem.unit.test.ts

@@ -31,27 +31,27 @@ suite('Unit Tests Test Explorer View Items', () => {
 
     test('Test root folder created into test view item', () => {
         const viewItem = new TestTreeItem(resource, testFolder);
-        expect(viewItem.contextValue).is.equal('testFolder');
+        expect(viewItem.contextValue).is.equal('folder');
     });
 
     test('Test file created into test view item', () => {
         const viewItem = new TestTreeItem(resource, testFile);
-        expect(viewItem.contextValue).is.equal('testFile');
+        expect(viewItem.contextValue).is.equal('file');
     });
 
     test('Test suite created into test view item', () => {
         const viewItem = new TestTreeItem(resource, testSuite);
-        expect(viewItem.contextValue).is.equal('testSuite');
+        expect(viewItem.contextValue).is.equal('suite');
     });
 
     test('Test function created into test view item', () => {
         const viewItem = new TestTreeItem(resource, testFunction);
-        expect(viewItem.contextValue).is.equal('testFunction');
+        expect(viewItem.contextValue).is.equal('function');
     });
 
     test('Test suite function created into test view item', () => {
         const viewItem = new TestTreeItem(resource, testSuiteFunction);
-        expect(viewItem.contextValue).is.equal('testFunction');
+        expect(viewItem.contextValue).is.equal('function');
     });
 
     test('Test subtest parent created into test view item', () => {
@@ -62,7 +62,7 @@ suite('Unit Tests Test Explorer View Items', () => {
 
         const viewItem = new TestTreeItem(resource, subtestParent.asSuite);
 
-        expect(viewItem.contextValue).is.equal('testSuite');
+        expect(viewItem.contextValue).is.equal('suite');
         expect(viewItem.command!.command).is.equal(Commands.navigateToTestFunction);
     });
 
@@ -71,6 +71,6 @@ suite('Unit Tests Test Explorer View Items', () => {
 
         const viewItem = new TestTreeItem(resource, testFunction);
 
-        expect(viewItem.contextValue).is.equal('testFunction');
+        expect(viewItem.contextValue).is.equal('function');
     });
 });