Split test helper module

Author: ryu1kn

src/test/acceptance/features/highlight-selected-text.test.ts

@@ -1,4 +1,4 @@
-import {verify, wrapVerify} from '../../helpers/helper';
+import {verify, wrapVerify} from '../../helpers/mock';
 
 import AppIntegrator from '../../../lib/app-integrator';
 import {createFakeEditor} from '../helpers/fake-editor';

src/test/acceptance/helpers/fake-editor.ts

@@ -1,4 +1,4 @@
-import {mockMethods} from '../../helpers/helper';
+import {mockMethods} from '../../helpers/mock';
 import * as vscode from 'vscode';
 import {Position, Selection} from 'vscode';
 

src/test/acceptance/helpers/fake-vscode.ts

@@ -1,4 +1,4 @@
-import {stubReturns} from '../../helpers/helper';
+import {stubReturns} from '../../helpers/mock';
 import {Range} from 'vscode';
 
 export const createFakeVsCode = ({editors}: any = {}) => {

src/test/helpers/assertions.ts

@@ -0,0 +1,9 @@
+import * as assert from 'assert';
+
+export const assertKeyExists = (obj: object, key: string) => {
+    assert.ok(obj.hasOwnProperty(key), `Key (${key}) does not exist in the object`);
+};
+
+export function assertInstanceOf<T>(obj: any, c: new (...args: any[]) => T) {
+    assert.ok(obj instanceof c, `Object is not an instance of ${c.name}`);
+}

src/test/helpers/helper.ts renamed to src/test/helpers/mock.ts

@@ -7,14 +7,6 @@ export const when = td.when;
 
 export const verify = td.verify;
 
-export const assertKeyExists = (obj: object, key: string) => {
-    assert.ok(obj.hasOwnProperty(key), `Key (${key}) does not exist in the object`);
-};
-
-export function assertInstanceOf<T>(obj: any, c: new (...args: any[]) => T) {
-    assert.ok(obj instanceof c, `Object is not an instance of ${c.name}`);
-}
-
 export function wrapVerify(invokeCallback: (...args: any[]) => void, expectedCalls: any[][] | {[key: string]: any[]}) {
     const captors = [td.matchers.captor(), td.matchers.captor(), td.matchers.captor()];
 

src/test/stub-vscode.ts

@@ -8,7 +8,7 @@ const mockVscode = {
     StatusBarAlignment: {Right: 2},
     TextEditorRevealType: {InCenterIfOutsideViewport: 2},
     Position: function (line: number, character: number) {
-        return {line, character};
+        return {line, character} as Position;
     },
     Selection: function (start: Position, end: Position) {
         return {start, end} as Selection;

src/test/unit/colour-registry.test.ts

@@ -1,4 +1,4 @@
-import {mockType} from '../helpers/helper';
+import {mockType} from '../helpers/mock';
 
 import ColourRegistry from '../../lib/colour-registry';
 import ConfigStore from '../../lib/config-store';

src/test/unit/command-wrapper.test.ts

@@ -1,4 +1,4 @@
-import {contains, mockMethods, mockType, verify} from '../helpers/helper';
+import {contains, mockMethods, mockType, verify} from '../helpers/mock';
 
 import CommandWrapper from '../../lib/command-wrapper';
 import {Logger} from '../../lib/Logger';

src/test/unit/commands/auto-refresh-decoration-with-delay.test.ts

@@ -1,4 +1,4 @@
-import {any, callback, contains, mock, mockMethods, mockType, verify, when} from '../../helpers/helper';
+import {any, callback, contains, mock, mockMethods, mockType, verify, when} from '../../helpers/mock';
 
 import WindowComponent from '../../../lib/editor-components/window';
 import Debouncer from '../../../lib/debouncer';

src/test/unit/commands/auto-refresh-decoration.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify, when} from '../../helpers/helper';
+import {mock, verify, when} from '../../helpers/mock';
 import DecorationOperatorFactory from '../../../lib/decoration-operator-factory';
 import TextEditor from '../../../lib/text-editor';
 import DecorationOperator from '../../../lib/decoration-operator';

src/test/unit/commands/go-to-next-highlight.test.ts

@@ -1,5 +1,5 @@
 import TextEditor from '../../../lib/text-editor';
-import {mock, mockMethods, mockType, verify, when} from '../../helpers/helper';
+import {mock, mockMethods, mockType, verify, when} from '../../helpers/mock';
 import TextLocationRegistry from '../../../lib/text-location-registry';
 import {GoToNextHighlightCommand} from '../../../lib/commands/go-to-next-highlight';
 import MatchingModeRegistry from '../../../lib/matching-mode-registry';

src/test/unit/commands/go-to-previous-highlight.test.ts

@@ -1,5 +1,5 @@
 import TextEditor from '../../../lib/text-editor';
-import {mock, mockMethods, mockType, verify, when} from '../../helpers/helper';
+import {mock, mockMethods, mockType, verify, when} from '../../helpers/mock';
 import TextLocationRegistry from '../../../lib/text-location-registry';
 import MatchingModeRegistry from '../../../lib/matching-mode-registry';
 import StringPattern from '../../../lib/patterns/string';

src/test/unit/commands/highlight-using-regex.test.ts

@@ -1,4 +1,4 @@
-import {mock, when, verify} from '../../helpers/helper';
+import {mock, when, verify} from '../../helpers/mock';
 import HighlightUsingRegexCommand from '../../../lib/commands/highlight-using-regex';
 import DecorationOperatorFactory from '../../../lib/decoration-operator-factory';
 import RegexReader from '../../../lib/regex-reader';

src/test/unit/commands/remove-all-highlights.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify, when} from '../../helpers/helper';
+import {mock, verify, when} from '../../helpers/mock';
 import RemoveAllHighlightsCommand from '../../../lib/commands/remove-all-highlights';
 import DecorationOperatorFactory from '../../../lib/decoration-operator-factory';
 import DecorationOperator from '../../../lib/decoration-operator';

src/test/unit/commands/save-all-highlights.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify, when} from '../../helpers/helper';
+import {mock, verify, when} from '../../helpers/mock';
 import SaveAllHighlightsCommand from '../../../lib/commands/save-all-highlights';
 import DecorationRegistry from '../../../lib/decoration-registry';
 import ConfigStore from '../../../lib/config-store';

src/test/unit/commands/toggle-case-sensitivity-mode.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify} from '../../helpers/helper';
+import {mock, verify} from '../../helpers/mock';
 
 import ToggleCaseSensitivityModeCommand from '../../../lib/commands/toggle-case-sensitivity-mode';
 import MatchingModeRegistry from '../../../lib/matching-mode-registry';

src/test/unit/commands/toggle-case-sensitivity.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify, when} from '../../helpers/helper';
+import {mock, verify, when} from '../../helpers/mock';
 import {PatternAction} from '../../../lib/const';
 import ToggleCaseSensitivityCommand from '../../../lib/commands/toggle-case-sensitivity';
 import HighlightPatternPicker from '../../../lib/highlight-pattern-picker';

src/test/unit/commands/toggle-highlight.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, mockMethods, mockType, verify, when} from '../../helpers/helper';
+import {any, mock, mockMethods, mockType, verify, when} from '../../helpers/mock';
 
 import ToggleHighlightCommand from '../../../lib/commands/toggle-highlight';
 import TextEditor from '../../../lib/text-editor';

src/test/unit/commands/toggle-whole-match-mode.test.ts

@@ -1,4 +1,4 @@
-import {mock, verify} from '../../helpers/helper';
+import {mock, verify} from '../../helpers/mock';
 
 import ToggleWholeMatchModeCommand from '../../../lib/commands/toggle-whole-match-mode';
 import MatchingModeRegistry from '../../../lib/matching-mode-registry';

src/test/unit/commands/toggle-whole-match.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, verify, when} from '../../helpers/helper';
+import {any, mock, verify, when} from '../../helpers/mock';
 
 import {PatternAction} from '../../../lib/const';
 import ToggleWholeMatchCommand from '../../../lib/commands/toggle-whole-match';

src/test/unit/commands/unhighlight.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, verify, when} from '../../helpers/helper';
+import {any, mock, verify, when} from '../../helpers/mock';
 
 import UnhighlightCommand from '../../../lib/commands/unhighlight';
 import DecorationOperatorFactory from '../../../lib/decoration-operator-factory';

src/test/unit/commands/update-highlight.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, mockType, verify, when} from '../../helpers/helper';
+import {any, mock, mockType, verify, when} from '../../helpers/mock';
 
 import UpdateHighlightCommand from '../../../lib/commands/update-highlight';
 import DecorationOperatorFactory from '../../../lib/decoration-operator-factory';

src/test/unit/config-store.test.ts

@@ -1,4 +1,4 @@
-import {mock, mockMethods, verify, when} from '../helpers/helper';
+import {mock, mockMethods, verify, when} from '../helpers/mock';
 
 import ConfigStore from '../../lib/config-store';
 import * as vscode from 'vscode';

src/test/unit/config-target-picker.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, when} from '../helpers/helper';
+import {any, mock, when} from '../helpers/mock';
 
 import ConfigTargetPicker from '../../lib/config-target-picker';
 import WindowComponent from '../../lib/editor-components/window';

src/test/unit/debouncer.test.ts

@@ -1,4 +1,4 @@
-import {mockFunction, mockType, verify} from '../helpers/helper';
+import {mockFunction, mockType, verify} from '../helpers/mock';
 
 import Debouncer from '../../lib/debouncer';
 import ConfigStore from '../../lib/config-store';

src/test/unit/decoration-operator.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, mockType, verify, when, wrapVerify} from '../helpers/helper';
+import {any, mock, mockType, verify, when, wrapVerify} from '../helpers/mock';
 
 import DecorationOperator from '../../lib/decoration-operator';
 import PatternConverter from '../../lib/pattern-converter';

src/test/unit/decoration-registry.test.ts

@@ -1,4 +1,4 @@
-import {mockMethods, mockType, stubReturns, when} from '../helpers/helper';
+import {mockMethods, mockType, stubReturns, when} from '../helpers/mock';
 
 import DecorationRegistry from '../../lib/decoration-registry';
 import PatternFactory from '../../lib/pattern-factory';

src/test/unit/highlight-pattern-picker.test.ts

@@ -1,4 +1,4 @@
-import {any, mock, mockType, verify, when} from '../helpers/helper';
+import {any, mock, mockType, verify, when} from '../helpers/mock';
 
 import HighlightPatternPicker from '../../lib/highlight-pattern-picker';
 import PatternFactory from '../../lib/pattern-factory';

src/test/unit/matching-mode-registry.test.ts

@@ -1,4 +1,4 @@
-import {assertKeyExists} from '../helpers/helper';
+import {assertKeyExists} from '../helpers/assertions';
 import {Event} from '../../lib/const';
 import MatchingModeRegistry from '../../lib/matching-mode-registry';
 import {EventEmitter} from 'events';

src/test/unit/pattern-factory.test.ts

@@ -1,10 +1,11 @@
-import {assertInstanceOf, mockType} from '../helpers/helper';
+import {mockType} from '../helpers/mock';
 
 import PatternFactory from '../../lib/pattern-factory';
 import StringPattern from '../../lib/patterns/string';
 import RegexPattern from '../../lib/patterns/regex';
 import MatchingModeRegistry from '../../lib/matching-mode-registry';
 import * as assert from 'assert';
+import {assertInstanceOf} from '../helpers/assertions';
 
 suite('PatternFactory', () => {
 

src/test/unit/pattern-variation-reader.test.ts

@@ -1,4 +1,4 @@
-import {mockType} from '../helpers/helper';
+import {mockType} from '../helpers/mock';
 
 import PatternVariationReader from '../../lib/pattern-variation-reader';
 import PatternFactory from '../../lib/pattern-factory';

src/test/unit/regex-reader.test.ts

@@ -1,4 +1,4 @@
-import {mock, mockType, when} from '../helpers/helper';
+import {mock, mockType, when} from '../helpers/mock';
 
 import RegexReader from '../../lib/regex-reader';
 import WindowComponent from '../../lib/editor-components/window';

src/test/unit/saved-highlights-restorer.test.ts

@@ -1,4 +1,4 @@
-import {mock, mockType, verify, when} from '../helpers/helper';
+import {mock, mockType, verify, when} from '../helpers/mock';
 import {Event} from '../../lib/const';
 import SavedHighlightsRestorer from '../../lib/saved-highlights-restorer';
 import ConfigStore from '../../lib/config-store';

src/test/unit/selected-text-finder.test.ts

@@ -1,4 +1,4 @@
-import {mockType} from '../helpers/helper';
+import {mockType} from '../helpers/mock';
 
 import SelectedTextFinder from '../../lib/selected-text-finder';
 import * as vscode from 'vscode';

src/test/unit/statusbar-buttons/toggle-case-sensitivity-mode.test.ts

@@ -1,4 +1,4 @@
-import {mockMethods, verify} from '../../helpers/helper';
+import {mockMethods, verify} from '../../helpers/mock';
 import {Event} from '../../../lib/const';
 import ToggleCaseSensitivityModeButton from '../../../lib/statusbar-buttons/toggle-case-sensitivity-mode';
 import {StatusBarItem} from 'vscode';

src/test/unit/statusbar-buttons/toggle-whole-match-mode.test.ts

@@ -1,4 +1,4 @@
-import {mockMethods, verify} from '../../helpers/helper';
+import {mockMethods, verify} from '../../helpers/mock';
 import {Event} from '../../../lib/const';
 import ToggleWholeMatchModeButton from '../../../lib/statusbar-buttons/toggle-whole-match-mode';
 import {StatusBarItem} from 'vscode';

src/test/unit/text-decorator.test.ts

@@ -1,4 +1,4 @@
-import {mock, mockMethods, mockType, verify, wrapVerify} from '../helpers/helper';
+import {mock, mockMethods, mockType, verify, wrapVerify} from '../helpers/mock';
 
 import TextDecorator from '../../lib/text-decorator';
 import PatternFactory from '../../lib/pattern-factory';

src/test/unit/text-editor.test.ts

@@ -1,6 +1,6 @@
 import TextEditor from '../../lib/text-editor';
 import {Position, Range, Selection, TextDocument, TextEditor as VsTextEditor, TextEditorRevealType} from 'vscode';
-import {mockMethods, verify, when} from '../helpers/helper';
+import {mockMethods, verify, when} from '../helpers/mock';
 import * as assert from 'assert';
 
 suite('TextEditor', () => {
@@ -17,8 +17,8 @@ suite('TextEditor', () => {
 
     test('reveals the area if the given cursor position is out of visible area', () => {
         editor.selection = {start: 0, end: 5};
-        assert.deepEqual(rawEditor.selection, range(position1, position2));
-        verify(rawEditor.revealRange(selection(position1, position2), TextEditorRevealType.InCenterIfOutsideViewport));
+        assert.deepEqual(rawEditor.selection, selection(position1, position2));
+        verify(rawEditor.revealRange(range(position1, position2), TextEditorRevealType.InCenterIfOutsideViewport));
     });
 
     function position(line: number, character: number): Position {