@@ -102,13 +102,13 @@ suite('Terminal Service', () => {
102102 disposables = [ ] ;
103103
104104 mockServiceContainer = TypeMoq . Mock . ofType < IServiceContainer > ( ) ;
105- interpreterService = TypeMoq . Mock . ofType < IInterpreterService > ( ) ;
106- interpreterService
107- . setup ( ( i ) => i . getActiveInterpreter ( TypeMoq . It . isAny ( ) ) )
108- . returns ( ( ) => Promise . resolve ( ( { path : 'ps' } as unknown ) as PythonEnvironment ) ) ;
105+ // interpreterService = TypeMoq.Mock.ofType<IInterpreterService>();
106+ // interpreterService
107+ // .setup((i) => i.getActiveInterpreter(TypeMoq.It.isAny()))
108+ // .returns(() => Promise.resolve(({ path: 'ps' } as unknown) as PythonEnvironment));
109109
110- options = TypeMoq . Mock . ofType < TerminalCreationOptions > ( ) ;
111- options . setup ( ( o ) => o . resource ) . returns ( ( ) => Uri . parse ( 'a' ) ) ;
110+ // options = TypeMoq.Mock.ofType<TerminalCreationOptions>();
111+ // options.setup((o) => o.resource).returns(() => Uri.parse('a'));
112112
113113 mockServiceContainer . setup ( ( c ) => c . get ( ITerminalManager ) ) . returns ( ( ) => terminalManager . object ) ;
114114 mockServiceContainer . setup ( ( c ) => c . get ( ITerminalHelper ) ) . returns ( ( ) => terminalHelper . object ) ;
@@ -136,7 +136,7 @@ suite('Terminal Service', () => {
136136 disposables . filter ( ( item ) => ! ! item ) . forEach ( ( item ) => item . dispose ( ) ) ;
137137 sinon . restore ( ) ;
138138 // reset setup for interpreterService
139- interpreterService . reset ( ) ;
139+ // interpreterService.reset();
140140 } ) ;
141141
142142 test ( 'Ensure terminal is disposed' , async ( ) => {
@@ -259,57 +259,57 @@ suite('Terminal Service', () => {
259259 terminal . verify ( ( t ) => t . sendText ( TypeMoq . It . isValue ( textToSend ) ) , TypeMoq . Times . exactly ( 1 ) ) ;
260260 } ) ;
261261
262- test ( 'Ensure sendText is NOT called when Python shell integration and terminal shell integration are both enabled - Mac, Linux && Python < 3.13' , async ( ) => {
263- isWindowsStub . returns ( false ) ;
264- pythonConfig
265- . setup ( ( p ) => p . get ( 'terminal.shellIntegration.enabled' ) )
266- . returns ( ( ) => true )
267- . verifiable ( TypeMoq . Times . once ( ) ) ;
268-
269- terminalHelper
270- . setup ( ( helper ) => helper . getEnvironmentActivationCommands ( TypeMoq . It . isAny ( ) , TypeMoq . It . isAny ( ) ) )
271- . returns ( ( ) => Promise . resolve ( undefined ) ) ;
272- service = new TerminalService ( mockServiceContainer . object ) ;
273- const textToSend = 'Some Text' ;
274- terminalHelper . setup ( ( h ) => h . identifyTerminalShell ( TypeMoq . It . isAny ( ) ) ) . returns ( ( ) => TerminalShellType . bash ) ;
275- terminalManager . setup ( ( t ) => t . createTerminal ( TypeMoq . It . isAny ( ) ) ) . returns ( ( ) => terminal . object ) ;
276-
277- service . ensureTerminal ( ) ;
278- service . executeCommand ( textToSend , true ) ;
279-
280- terminal . verify ( ( t ) => t . show ( TypeMoq . It . isValue ( true ) ) , TypeMoq . Times . exactly ( 1 ) ) ;
281- terminal . verify ( ( t ) => t . sendText ( TypeMoq . It . isValue ( textToSend ) ) , TypeMoq . Times . never ( ) ) ;
282- } ) ;
283-
284- test ( 'Ensure sendText is called when Python shell integration and terminal shell integration are both enabled - Mac, Linux && Python >= 3.13' , async ( ) => {
285- interpreterService . reset ( ) ;
286-
287- interpreterService
288- . setup ( ( i ) => i . getActiveInterpreter ( TypeMoq . It . isAny ( ) ) )
289- . returns ( ( ) =>
290- Promise . resolve ( { path : 'yo' , version : { major : 3 , minor : 13 , patch : 0 } } as PythonEnvironment ) ,
291- ) ;
292-
293- isWindowsStub . returns ( false ) ;
294- pythonConfig
295- . setup ( ( p ) => p . get ( 'terminal.shellIntegration.enabled' ) )
296- . returns ( ( ) => true )
297- . verifiable ( TypeMoq . Times . once ( ) ) ;
298-
299- terminalHelper
300- . setup ( ( helper ) => helper . getEnvironmentActivationCommands ( TypeMoq . It . isAny ( ) , TypeMoq . It . isAny ( ) ) )
301- . returns ( ( ) => Promise . resolve ( undefined ) ) ;
302-
303- service = new TerminalService ( mockServiceContainer . object , options . object ) ;
304- const textToSend = 'Some Text' ;
305- terminalHelper . setup ( ( h ) => h . identifyTerminalShell ( TypeMoq . It . isAny ( ) ) ) . returns ( ( ) => TerminalShellType . bash ) ;
306- terminalManager . setup ( ( t ) => t . createTerminal ( TypeMoq . It . isAny ( ) ) ) . returns ( ( ) => terminal . object ) ;
307-
308- await service . ensureTerminal ( ) ;
309- await service . executeCommand ( textToSend , true ) ;
310-
311- terminal . verify ( ( t ) => t . sendText ( TypeMoq . It . isValue ( textToSend ) ) , TypeMoq . Times . once ( ) ) ;
312- } ) ;
262+ // test('Ensure sendText is NOT called when Python shell integration and terminal shell integration are both enabled - Mac, Linux && Python < 3.13', async () => {
263+ // isWindowsStub.returns(false);
264+ // pythonConfig
265+ // .setup((p) => p.get('terminal.shellIntegration.enabled'))
266+ // .returns(() => true)
267+ // .verifiable(TypeMoq.Times.once());
268+
269+ // terminalHelper
270+ // .setup((helper) => helper.getEnvironmentActivationCommands(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
271+ // .returns(() => Promise.resolve(undefined));
272+ // service = new TerminalService(mockServiceContainer.object);
273+ // const textToSend = 'Some Text';
274+ // terminalHelper.setup((h) => h.identifyTerminalShell(TypeMoq.It.isAny())).returns(() => TerminalShellType.bash);
275+ // terminalManager.setup((t) => t.createTerminal(TypeMoq.It.isAny())).returns(() => terminal.object);
276+
277+ // service.ensureTerminal();
278+ // service.executeCommand(textToSend, true);
279+
280+ // terminal.verify((t) => t.show(TypeMoq.It.isValue(true)), TypeMoq.Times.exactly(1));
281+ // terminal.verify((t) => t.sendText(TypeMoq.It.isValue(textToSend)), TypeMoq.Times.never());
282+ // });
283+
284+ // test('Ensure sendText is called when Python shell integration and terminal shell integration are both enabled - Mac, Linux && Python >= 3.13', async () => {
285+ // interpreterService.reset();
286+
287+ // interpreterService
288+ // .setup((i) => i.getActiveInterpreter(TypeMoq.It.isAny()))
289+ // .returns(() =>
290+ // Promise.resolve({ path: 'yo', version: { major: 3, minor: 13, patch: 0 } } as PythonEnvironment),
291+ // );
292+
293+ // isWindowsStub.returns(false);
294+ // pythonConfig
295+ // .setup((p) => p.get('terminal.shellIntegration.enabled'))
296+ // .returns(() => true)
297+ // .verifiable(TypeMoq.Times.once());
298+
299+ // terminalHelper
300+ // .setup((helper) => helper.getEnvironmentActivationCommands(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
301+ // .returns(() => Promise.resolve(undefined));
302+
303+ // service = new TerminalService(mockServiceContainer.object, options.object);
304+ // const textToSend = 'Some Text';
305+ // terminalHelper.setup((h) => h.identifyTerminalShell(TypeMoq.It.isAny())).returns(() => TerminalShellType.bash);
306+ // terminalManager.setup((t) => t.createTerminal(TypeMoq.It.isAny())).returns(() => terminal.object);
307+
308+ // await service.ensureTerminal();
309+ // await service.executeCommand(textToSend, true);
310+
311+ // terminal.verify((t) => t.sendText(TypeMoq.It.isValue(textToSend)), TypeMoq.Times.once());
312+ // });
313313
314314 test ( 'Ensure sendText IS called even when Python shell integration and terminal shell integration are both enabled - Window' , async ( ) => {
315315 isWindowsStub . returns ( true ) ;
0 commit comments