remove usage of usergroup from tests

Author: Will-ShaoHua

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -8,7 +8,6 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import {
     onAcceptance,
-    UserGroup,
     AcceptedSuggestionEntry,
     session,
     CodeWhispererTracker,
@@ -17,8 +16,6 @@ import {
 } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import { globals } from 'aws-core-vscode/shared'
-import { extensionVersion } from 'aws-core-vscode/shared'
 
 describe('onAcceptance', function () {
     describe('onAcceptance', function () {
@@ -73,11 +70,6 @@ describe('onAcceptance', function () {
         })
 
         it('Should report telemetry that records this user decision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Control,
-                version: extensionVersion,
-            })
-
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const mockEditor = createMockTextEditor()

packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts

@@ -13,14 +13,12 @@ import {
     resetCodeWhispererGlobalVariables,
 } from 'aws-core-vscode/test'
 import * as EditorContext from 'aws-core-vscode/codewhisperer'
-import * as CodeWhispererConstants from 'aws-core-vscode/codewhisperer'
 import {
     ConfigurationEntry,
     DocumentChangedSource,
     KeyStrokeHandler,
     DefaultDocumentChangedType,
     RecommendationService,
-    CodeWhispererUserGroupSettings,
     ClassifierTrigger,
     isInlineCompletionEnabled,
     RecommendationHandler,
@@ -52,7 +50,6 @@ describe('keyStrokeHandler', function () {
         })
         afterEach(function () {
             sinon.restore()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Whatever the input is, should skip when automatic trigger is turned off, should not call invokeAutomatedTrigger', async function () {
@@ -145,19 +142,13 @@ describe('keyStrokeHandler', function () {
             }
         })
 
-        async function testShouldInvoke(
-            input: string,
-            shouldTrigger: boolean,
-            rightContext: string = '',
-            userGroup: CodeWhispererConstants.UserGroup = CodeWhispererConstants.UserGroup.Control
-        ) {
+        async function testShouldInvoke(input: string, shouldTrigger: boolean, rightContext: string = '') {
             const mockEditor = createMockTextEditor(rightContext, 'test.js', 'javascript', 0, 0)
             const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
                 mockEditor.document,
                 new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
                 input
             )
-            CodeWhispererUserGroupSettings.instance.userGroup = userGroup
             await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
             assert.strictEqual(
                 invokeSpy.called,

packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts

@@ -6,14 +6,9 @@
 import assert from 'assert'
 import * as sinon from 'sinon'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import {
-    AuthUtil,
-    CodeWhispererTracker,
-    UserGroup,
-    CodeWhispererUserGroupSettings,
-} from 'aws-core-vscode/codewhisperer'
+import { AuthUtil, CodeWhispererTracker } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createAcceptedSuggestionEntry } from 'aws-core-vscode/test'
-import { globals, extensionVersion } from 'aws-core-vscode/shared'
+import { globals } from 'aws-core-vscode/shared'
 
 describe('codewhispererTracker', function () {
     describe('enqueue', function () {
@@ -86,20 +81,7 @@ describe('codewhispererTracker', function () {
     })
 
     describe('emitTelemetryOnSuggestion', function () {
-        beforeEach(function () {
-            CodeWhispererUserGroupSettings.instance.reset()
-        })
-
-        afterEach(function () {
-            CodeWhispererUserGroupSettings.instance.reset()
-        })
-
         it('Should call recordCodewhispererUserModification with suggestion event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const suggestion = createAcceptedSuggestionEntry()

packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts

@@ -127,7 +127,7 @@ describe('crossFileContextUtil', function () {
         })
     })
 
-    describe('partial support - control group', function () {
+    describe.skip('partial support - control group', function () {
         const fileExtLists: string[] = []
 
         before(async function () {
@@ -158,7 +158,7 @@ describe('crossFileContextUtil', function () {
         })
     })
 
-    describe('partial support - crossfile group', function () {
+    describe.skip('partial support - crossfile group', function () {
         const fileExtLists: string[] = []
 
         before(async function () {