1414
1515import * as util from "../../../src/utilities/utilities" ;
1616import * as lldb from "../../../src/debugger/lldb" ;
17- import * as sinon from "sinon" ;
1817import * as vscode from "vscode" ;
1918import { expect } from "chai" ;
2019import {
@@ -23,20 +22,24 @@ import {
2322 mockFn ,
2423 mockGlobalModule ,
2524 mockObject ,
26- MockedFunction ,
2725 mockGlobalValue ,
2826} from "../../MockUtils" ;
2927import { SwiftToolchain } from "../../../src/toolchain/toolchain" ;
3028
3129suite ( "debugger.lldb Tests" , ( ) => {
30+ const wsMock = mockGlobalValue ( vscode . workspace , "fs" ) ;
31+ const fsMock = mockObject < vscode . FileSystem > ( { readDirectory : mockFn ( ) , stat : mockFn ( ) } ) ;
32+
33+ setup ( ( ) => {
34+ wsMock . setValue ( fsMock ) ;
35+ } ) ;
36+
3237 suite ( "getLLDBLibPath Tests" , ( ) => {
3338 let mockToolchain : MockedObject < SwiftToolchain > ;
34- let mockFindLibLLDB : MockedFunction < ( typeof lldb ) [ "findLibLLDB" ] > ;
3539 const mockedPlatform = mockGlobalValue ( process , "platform" ) ;
3640 const mockUtil = mockGlobalModule ( util ) ;
3741
3842 setup ( ( ) => {
39- mockFindLibLLDB = sinon . stub ( ) ;
4043 mockToolchain = mockObject < SwiftToolchain > ( {
4144 getLLDB : mockFn ( ) ,
4245 swiftFolderPath : "" ,
@@ -62,14 +65,9 @@ suite("debugger.lldb Tests", () => {
6265 test ( "should return failure if findLibLLDB returns falsy values" , async ( ) => {
6366 mockToolchain . getLLDB . resolves ( "/path/to/lldb" ) ;
6467 mockUtil . execFile . resolves ( { stdout : "" , stderr : "" } ) ;
65- mockFindLibLLDB . onFirstCall ( ) . resolves ( undefined ) ;
66-
67- let result = await lldb . getLLDBLibPath ( instance ( mockToolchain ) ) ;
68- expect ( result . failure ) . to . not . equal ( undefined ) ;
69-
70- mockFindLibLLDB . onSecondCall ( ) . resolves ( "" ) ;
68+ fsMock . stat . resolves ( { type : vscode . FileType . Directory } as any ) ;
7169
72- result = await lldb . getLLDBLibPath ( instance ( mockToolchain ) ) ;
70+ const result = await lldb . getLLDBLibPath ( instance ( mockToolchain ) ) ;
7371 expect ( result . failure ) . to . not . equal ( undefined ) ;
7472 } ) ;
7573 // NB(separate itest): contract test with toolchains of various platforms
@@ -106,13 +104,6 @@ suite("debugger.lldb Tests", () => {
106104 } ) ;
107105
108106 suite ( "findFileByPattern Tests" , ( ) => {
109- const wsMock = mockGlobalValue ( vscode . workspace , "fs" ) ;
110- const fsMock = mockObject < vscode . FileSystem > ( { readDirectory : mockFn ( ) , stat : mockFn ( ) } ) ;
111-
112- setup ( ( ) => {
113- wsMock . setValue ( fsMock ) ;
114- } ) ;
115-
116107 test ( "should return null if no file matches the pattern" , async ( ) => {
117108 fsMock . readDirectory . resolves ( [
118109 [ "file1" , vscode . FileType . File ] ,
0 commit comments