@@ -37,7 +37,6 @@ describe('recommendationHandler', function () {
37
37
resetCodeWhispererGlobalVariables ( )
38
38
mockClient . listRecommendations . resolves ( { } )
39
39
mockClient . generateRecommendations . resolves ( { } )
40
- RecommendationHandler . instance . clearRecommendations ( )
41
40
} )
42
41
43
42
afterEach ( function ( ) {
@@ -56,16 +55,10 @@ describe('recommendationHandler', function () {
56
55
} ,
57
56
} ,
58
57
}
59
- sinon . stub ( RecommendationHandler . instance , 'getServerResponse' ) . resolves ( mockServerResult )
60
- await RecommendationHandler . instance . getRecommendations (
61
- mockClient ,
62
- mockEditor ,
63
- 'AutoTrigger' ,
64
- config ,
65
- 'Enter' ,
66
- false
67
- )
68
- const actual = RecommendationHandler . instance . recommendations
58
+ const handler = new RecommendationHandler ( )
59
+ sinon . stub ( handler , 'getServerResponse' ) . resolves ( mockServerResult )
60
+ await handler . getRecommendations ( mockClient , mockEditor , 'AutoTrigger' , config , 'Enter' , false )
61
+ const actual = handler . recommendations
69
62
const expected : RecommendationsList = [ { content : "print('Hello World!')" } , { content : '' } ]
70
63
assert . deepStrictEqual ( actual , expected )
71
64
} )
@@ -82,17 +75,11 @@ describe('recommendationHandler', function () {
82
75
} ,
83
76
} ,
84
77
}
85
- sinon . stub ( RecommendationHandler . instance , 'getServerResponse' ) . resolves ( mockServerResult )
86
- await RecommendationHandler . instance . getRecommendations (
87
- mockClient ,
88
- mockEditor ,
89
- 'AutoTrigger' ,
90
- config ,
91
- 'Enter' ,
92
- false
93
- )
94
- assert . strictEqual ( RecommendationHandler . instance . requestId , 'test_request' )
95
- assert . strictEqual ( RecommendationHandler . instance . sessionId , 'test_request' )
78
+ const handler = new RecommendationHandler ( )
79
+ sinon . stub ( handler , 'getServerResponse' ) . resolves ( mockServerResult )
80
+ await handler . getRecommendations ( mockClient , mockEditor , 'AutoTrigger' , config , 'Enter' , false )
81
+ assert . strictEqual ( handler . requestId , 'test_request' )
82
+ assert . strictEqual ( handler . sessionId , 'test_request' )
96
83
assert . strictEqual ( TelemetryHelper . instance . triggerType , 'AutoTrigger' )
97
84
} )
98
85
@@ -108,17 +95,12 @@ describe('recommendationHandler', function () {
108
95
} ,
109
96
} ,
110
97
}
111
- sinon . stub ( RecommendationHandler . instance , 'getServerResponse' ) . resolves ( mockServerResult )
98
+ const handler = new RecommendationHandler ( )
99
+ sinon . stub ( handler , 'getServerResponse' ) . resolves ( mockServerResult )
112
100
sinon . stub ( performance , 'now' ) . returns ( 0.0 )
113
- RecommendationHandler . instance . startPos = new vscode . Position ( 1 , 0 )
101
+ handler . startPos = new vscode . Position ( 1 , 0 )
114
102
TelemetryHelper . instance . cursorOffset = 2
115
- await RecommendationHandler . instance . getRecommendations (
116
- mockClient ,
117
- mockEditor ,
118
- 'AutoTrigger' ,
119
- config ,
120
- 'Enter'
121
- )
103
+ await handler . getRecommendations ( mockClient , mockEditor , 'AutoTrigger' , config , 'Enter' )
122
104
const assertTelemetry = assertTelemetryCurried ( 'codewhisperer_serviceInvocation' )
123
105
assertTelemetry ( {
124
106
codewhispererRequestId : 'test_request' ,
@@ -140,24 +122,27 @@ describe('recommendationHandler', function () {
140
122
sinon . restore ( )
141
123
} )
142
124
it ( 'should return true if any response is not empty' , function ( ) {
143
- RecommendationHandler . instance . recommendations = [
125
+ const handler = new RecommendationHandler ( )
126
+ handler . recommendations = [
144
127
{
145
128
content :
146
129
'\n // Use the console to output debug info…n of the command with the "command" variable' ,
147
130
} ,
148
131
{ content : '' } ,
149
132
]
150
- assert . ok ( RecommendationHandler . instance . isValidResponse ( ) )
133
+ assert . ok ( handler . isValidResponse ( ) )
151
134
} )
152
135
153
136
it ( 'should return false if response is empty' , function ( ) {
154
- RecommendationHandler . instance . recommendations = [ ]
155
- assert . ok ( ! RecommendationHandler . instance . isValidResponse ( ) )
137
+ const handler = new RecommendationHandler ( )
138
+ handler . recommendations = [ ]
139
+ assert . ok ( ! handler . isValidResponse ( ) )
156
140
} )
157
141
158
142
it ( 'should return false if all response has no string length' , function ( ) {
159
- RecommendationHandler . instance . recommendations = [ { content : '' } , { content : '' } ]
160
- assert . ok ( ! RecommendationHandler . instance . isValidResponse ( ) )
143
+ const handler = new RecommendationHandler ( )
144
+ handler . recommendations = [ { content : '' } , { content : '' } ]
145
+ assert . ok ( ! handler . isValidResponse ( ) )
161
146
} )
162
147
} )
163
148
} )
0 commit comments