Skip to content

Commit 67805c7

Browse files
eleanorjboydeleanorjboyd
authored
fix failing tests for inline debugging (#806)
1 parent 4b02c62 commit 67805c7

File tree

1 file changed

+23
-212
lines changed

1 file changed

+23
-212
lines changed

‎src/test/unittest/inlineValue/pythonInlineValueProvider.unit.test.ts‎

Lines changed: 23 additions & 212 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as sinon from 'sinon';
1010
import { use, expect } from 'chai';
1111
import { EXTENSION_ROOT_DIR_FOR_TESTS } from '../../constants';
1212
import { PythonInlineValueProvider } from '../../../extension/debugger/inlineValue/pythonInlineValueProvider';
13-
import { workspace, Range, InlineValueContext, WorkspaceConfiguration } from 'vscode';
13+
import { workspace, Range, InlineValueContext, WorkspaceConfiguration, InlineValue } from 'vscode';
1414
import * as vscodeapi from '../../../extension/common/vscodeapi';
1515

1616
use(chaiAsPromised);
@@ -98,102 +98,39 @@ suite('Debugging - pythonInlineProvider', () => {
9898
const context = { frameId: 0, stoppedLocation: new Range(4, 1, 4, 1) } as InlineValueContext;
9999

100100
const result = await inlineValueProvider.provideInlineValues(document, viewPort, context);
101-
const expected = [
101+
const expected: InlineValue[] = [
102102
{
103-
range: {
104-
c: {
105-
c: 0,
106-
e: 0,
107-
},
108-
e: {
109-
c: 0,
110-
e: 4,
111-
},
112-
},
103+
range: new Range(0, 0, 0, 4),
113104
variableName: 'var1',
114105
caseSensitiveLookup: false,
115106
},
116107
{
117-
range: {
118-
c: {
119-
c: 0,
120-
e: 6,
121-
},
122-
e: {
123-
c: 0,
124-
e: 10,
125-
},
126-
},
108+
range: new Range(0, 6, 0, 10),
127109
variableName: 'var2',
128110
caseSensitiveLookup: false,
129111
},
130112
{
131-
range: {
132-
c: {
133-
c: 1,
134-
e: 0,
135-
},
136-
e: {
137-
c: 1,
138-
e: 4,
139-
},
140-
},
113+
range: new Range(1, 0, 1, 4),
141114
variableName: 'var3',
142115
caseSensitiveLookup: false,
143116
},
144117
{
145-
range: {
146-
c: {
147-
c: 2,
148-
e: 0,
149-
},
150-
e: {
151-
c: 2,
152-
e: 4,
153-
},
154-
},
118+
range: new Range(2, 0, 2, 4),
155119
variableName: 'var4',
156120
caseSensitiveLookup: false,
157121
},
158122
{
159-
range: {
160-
c: {
161-
c: 3,
162-
e: 0,
163-
},
164-
e: {
165-
c: 3,
166-
e: 4,
167-
},
168-
},
123+
range: new Range(3, 0, 3, 4),
169124
variableName: 'var5',
170125
caseSensitiveLookup: false,
171126
},
172127
{
173-
range: {
174-
c: {
175-
c: 4,
176-
e: 7,
177-
},
178-
e: {
179-
c: 4,
180-
e: 11,
181-
},
182-
},
128+
range: new Range(4, 7, 4, 11),
183129
variableName: 'var1',
184130
caseSensitiveLookup: false,
185131
},
186132
{
187-
range: {
188-
c: {
189-
c: 4,
190-
e: 14,
191-
},
192-
e: {
193-
c: 4,
194-
e: 18,
195-
},
196-
},
133+
range: new Range(4, 14, 4, 18),
197134
variableName: 'var2',
198135
caseSensitiveLookup: false,
199136
},
@@ -244,55 +181,19 @@ suite('Debugging - pythonInlineProvider', () => {
244181
const result = await inlineValueProvider.provideInlineValues(document, viewPort, context);
245182
const expected = [
246183
{
247-
range: {
248-
c: {
249-
c: 3,
250-
e: 8,
251-
},
252-
e: {
253-
c: 3,
254-
e: 17,
255-
},
256-
},
184+
range: new Range(3, 8, 3, 17),
257185
expression: 'self.name',
258186
},
259187
{
260-
range: {
261-
c: {
262-
c: 4,
263-
e: 8,
264-
},
265-
e: {
266-
c: 4,
267-
e: 16,
268-
},
269-
},
188+
range: new Range(4, 8, 4, 16),
270189
expression: 'self.age',
271190
},
272191
{
273-
range: {
274-
c: {
275-
c: 7,
276-
e: 18,
277-
},
278-
e: {
279-
c: 7,
280-
e: 27,
281-
},
282-
},
192+
range: new Range(7, 18, 7, 27),
283193
expression: 'self.name',
284194
},
285195
{
286-
range: {
287-
c: {
288-
c: 7,
289-
e: 29,
290-
},
291-
e: {
292-
c: 7,
293-
e: 37,
294-
},
295-
},
196+
range: new Range(7, 29, 7, 37),
296197
expression: 'self.age',
297198
},
298199
];
@@ -352,16 +253,7 @@ suite('Debugging - pythonInlineProvider', () => {
352253
const result = await inlineValueProvider.provideInlineValues(document, viewPort, context);
353254
const expected = [
354255
{
355-
range: {
356-
c: {
357-
c: 11,
358-
e: 0,
359-
},
360-
e: {
361-
c: 11,
362-
e: 10,
363-
},
364-
},
256+
range: new Range(11, 0, 11, 10),
365257
expression: 'person1.id',
366258
},
367259
];
@@ -411,128 +303,47 @@ suite('Debugging - pythonInlineProvider', () => {
411303
const result = await inlineValueProvider.provideInlineValues(document, viewPort, context);
412304
const expected = [
413305
{
414-
range: {
415-
c: {
416-
c: 0,
417-
e: 0,
418-
},
419-
e: {
420-
c: 0,
421-
e: 9,
422-
},
423-
},
306+
range: new Range(0, 0, 0, 9),
424307
variableName: 'some_list',
425308
caseSensitiveLookup: false,
426309
},
427310
{
428-
range: {
429-
c: {
430-
c: 1,
431-
e: 0,
432-
},
433-
e: {
434-
c: 1,
435-
e: 1,
436-
},
437-
},
311+
range: new Range(1, 0, 1, 1),
438312
variableName: 'x',
439313
caseSensitiveLookup: false,
440314
},
441315
{
442-
range: {
443-
c: {
444-
c: 2,
445-
e: 4,
446-
},
447-
e: {
448-
c: 2,
449-
e: 5,
450-
},
451-
},
316+
range: new Range(2, 4, 2, 5),
452317
variableName: 'n',
453318
caseSensitiveLookup: false,
454319
},
455320
{
456-
range: {
457-
c: {
458-
c: 2,
459-
e: 13,
460-
},
461-
e: {
462-
c: 2,
463-
e: 22,
464-
},
465-
},
321+
range: new Range(2, 13, 2, 22),
466322
variableName: 'some_list',
467323
caseSensitiveLookup: false,
468324
},
469325
{
470-
range: {
471-
c: {
472-
c: 2,
473-
e: 27,
474-
},
475-
e: {
476-
c: 2,
477-
e: 28,
478-
},
479-
},
326+
range: new Range(2, 27, 2, 28),
480327
variableName: 'x',
481328
caseSensitiveLookup: false,
482329
},
483330
{
484-
range: {
485-
c: {
486-
c: 3,
487-
e: 13,
488-
},
489-
e: {
490-
c: 3,
491-
e: 14,
492-
},
493-
},
331+
range: new Range(3, 13, 3, 14),
494332
variableName: 'n',
495333
caseSensitiveLookup: false,
496334
},
497335
{
498-
range: {
499-
c: {
500-
c: 3,
501-
e: 16,
502-
},
503-
e: {
504-
c: 3,
505-
e: 17,
506-
},
507-
},
336+
range: new Range(3, 16, 3, 17),
508337
variableName: 'x',
509338
caseSensitiveLookup: false,
510339
},
511340
{
512-
range: {
513-
c: {
514-
c: 5,
515-
e: 13,
516-
},
517-
e: {
518-
c: 5,
519-
e: 14,
520-
},
521-
},
341+
range: new Range(5, 13, 5, 14),
522342
variableName: 'n',
523343
caseSensitiveLookup: false,
524344
},
525345
{
526-
range: {
527-
c: {
528-
c: 5,
529-
e: 16,
530-
},
531-
e: {
532-
c: 5,
533-
e: 17,
534-
},
535-
},
346+
range: new Range(5, 16, 5, 17),
536347
variableName: 'x',
537348
caseSensitiveLookup: false,
538349
},

0 commit comments

Comments
 (0)