Search tree - fix tests and match actions

This commit is contained in:
Rob Lourens
2018-12-17 18:49:02 -08:00
parent edd6891f3d
commit f4dd1d1351
7 changed files with 155 additions and 74 deletions

View File

@@ -4,10 +4,9 @@
*--------------------------------------------------------------------------------------------*/
import * as sinon from 'sinon';
import * as types from 'vs/base/common/types';
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
interface IServiceMock<T> {
id: ServiceIdentifier<T>;
@@ -122,13 +121,6 @@ export class TestInstantiationService extends InstantiationService {
}
}
export function stubFunction<T>(ctor: any, fnProperty: string, value: any): T | sinon.SinonStub {
let stub = sinon.createStubInstance(ctor);
stub[fnProperty].restore();
sinon.stub(stub, fnProperty, types.isFunction(value) ? value : () => { return value; });
return stub;
}
interface SinonOptions {
mock?: boolean;
stub?: boolean;