Make search option props optional, test optional typings
This commit is contained in:
@@ -6,17 +6,17 @@
|
||||
import { assert, expect } from 'chai';
|
||||
import * as search from './search';
|
||||
import { SearchHelper } from './SearchHelper';
|
||||
import { ISearchHelper } from './Interfaces';
|
||||
import { ISearchOptions, ISearchResult } from './Interfaces';
|
||||
|
||||
|
||||
class MockTerminalPlain {}
|
||||
|
||||
class MockTerminal {
|
||||
private _core: any;
|
||||
public searchHelper: ISearchHelper;
|
||||
public searchHelper: TestSearchHelper;
|
||||
constructor(options: any) {
|
||||
this._core = new (require('../../../lib/Terminal').Terminal)(options);
|
||||
this.searchHelper = new SearchHelper(this as any);
|
||||
this.searchHelper = new TestSearchHelper(this as any);
|
||||
}
|
||||
get core(): any {
|
||||
return this._core;
|
||||
@@ -26,6 +26,12 @@ class MockTerminal {
|
||||
}
|
||||
}
|
||||
|
||||
class TestSearchHelper extends SearchHelper {
|
||||
public findInLine(term: string, y: number, searchOptions?: ISearchOptions): ISearchResult {
|
||||
return this._findInLine(term, y, searchOptions);
|
||||
}
|
||||
}
|
||||
|
||||
describe('search addon', function(): void {
|
||||
describe('apply', () => {
|
||||
it('should register findNext and findPrevious', () => {
|
||||
@@ -39,9 +45,9 @@ describe('search addon', function(): void {
|
||||
const term = new MockTerminal({cols: 20, rows: 3});
|
||||
term.core.write('Hello World\r\ntest\n123....hello');
|
||||
term.pushWriteData();
|
||||
const hello0 = (term.searchHelper as any)._findInLine('Hello', 0);
|
||||
const hello1 = (term.searchHelper as any)._findInLine('Hello', 1);
|
||||
const hello2 = (term.searchHelper as any)._findInLine('Hello', 2);
|
||||
const hello0 = term.searchHelper.findInLine('Hello', 0);
|
||||
const hello1 = term.searchHelper.findInLine('Hello', 1);
|
||||
const hello2 = term.searchHelper.findInLine('Hello', 2);
|
||||
expect(hello0).eql({col: 0, row: 0, term: 'Hello'});
|
||||
expect(hello1).eql(undefined);
|
||||
expect(hello2).eql({col: 11, row: 2, term: 'Hello'});
|
||||
@@ -62,12 +68,12 @@ describe('search addon', function(): void {
|
||||
wholeWord: false,
|
||||
caseSensitive: false
|
||||
};
|
||||
const hello0 = (term.searchHelper as any)._findInLine('dee*', 0, searchOptions);
|
||||
const hello1 = (term.searchHelper as any)._findInLine('jkk*', 0, searchOptions);
|
||||
const hello2 = (term.searchHelper as any)._findInLine('mnn*', 1, searchOptions);
|
||||
const tilda0 = (term.searchHelper as any)._findInLine('^~', 3, searchOptions);
|
||||
const tilda1 = (term.searchHelper as any)._findInLine('^[~]', 3, searchOptions);
|
||||
const tilda2 = (term.searchHelper as any)._findInLine('^\\~', 3, searchOptions);
|
||||
const hello0 = term.searchHelper.findInLine('dee*', 0, searchOptions);
|
||||
term.searchHelper.findInLine('jkk*', 0, searchOptions);
|
||||
term.searchHelper.findInLine('mnn*', 1, searchOptions);
|
||||
const tilda0 = term.searchHelper.findInLine('^~', 3, searchOptions);
|
||||
const tilda1 = term.searchHelper.findInLine('^[~]', 3, searchOptions);
|
||||
const tilda2 = term.searchHelper.findInLine('^\\~', 3, searchOptions);
|
||||
expect(hello0).eql({col: 3, row: 0, term: 'de'});
|
||||
// TODO: uncomment this test when line wrap search is checked in expect(hello1).eql({col: 9, row: 0, term: 'jk'});
|
||||
// TODO: uncomment this test when line wrap search is checked in expect(hello2).eql(undefined);
|
||||
|
||||
Reference in New Issue
Block a user