Move Buffer.test and test utils to common

src/BufferSet.test.ts

@@ -6,7 +6,7 @@
 import { assert } from 'chai';
 import { BufferSet } from './BufferSet';
 import { Buffer } from './common/buffer/Buffer';
-import { MockOptionsService, MockBufferService } from './TestUtils.test';
+import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
 
 describe('BufferSet', () => {
   let bufferSet: BufferSet;

src/SelectionManager.test.ts

@@ -10,7 +10,8 @@ import { BufferSet } from './BufferSet';
 import { ITerminal } from './Types';
 import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
-import { MockTerminal, MockCharSizeService, MockOptionsService, MockBufferService } from './TestUtils.test';
+import { MockTerminal, MockCharSizeService } from './TestUtils.test';
+import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
 import { BufferLine, CellData } from 'common/buffer/BufferLine';
 import { IBufferService } from 'common/services/Services';
 

src/SelectionModel.test.ts

@@ -7,7 +7,8 @@ import { assert } from 'chai';
 import { ITerminal } from './Types';
 import { SelectionModel } from './SelectionModel';
 import { BufferSet } from './BufferSet';
-import { MockTerminal, MockOptionsService, MockBufferService } from './TestUtils.test';
+import { MockTerminal } from './TestUtils.test';
+import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
 import { IBufferService } from 'common/services/Services';
 
 class TestSelectionModel extends SelectionModel {

src/TestUtils.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { IRenderer, IRenderDimensions } from './renderer/Types';
-import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBufferSet, IBrowser, ISelectionManager, ITerminalOptions as IInternalTerminalOptions, ILinkifier, IMouseHelper, ILinkMatcherOptions, CharacterJoinerHandler } from './Types';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBufferSet, IBrowser, ISelectionManager, ITerminalOptions, ILinkifier, IMouseHelper, ILinkMatcherOptions, CharacterJoinerHandler } from './Types';
 import { IBuffer, IBufferStringIterator } from 'common/buffer/Types';
 import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener } from 'common/Types';
 import { Buffer } from './common/buffer/Buffer';
@@ -13,10 +13,8 @@ import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
 import { Terminal } from './Terminal';
 import { AttributeData } from 'common/buffer/BufferLine';
 import { IColorManager, IColorSet } from 'browser/Types';
-import { IOptionsService, IPartialTerminalOptions, ITerminalOptions, IBufferService } from 'common/services/Services';
+import { IOptionsService } from 'common/services/Services';
 import { ICharSizeService } from 'browser/services/Services';
-import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
-import { clone } from 'common/Clone';
 
 export class TestTerminal extends Terminal {
   writeSync(data: string): void {
@@ -124,7 +122,7 @@ export class MockTerminal implements ITerminal {
   renderer: IRenderer;
   linkifier: ILinkifier;
   isFocused: boolean;
-  options: IInternalTerminalOptions = {};
+  options: ITerminalOptions = {};
   element: HTMLElement;
   screenElement: HTMLElement;
   rowContainer: HTMLElement;
@@ -185,7 +183,7 @@ export class MockTerminal implements ITerminal {
 
 export class MockInputHandlingTerminal implements IInputHandlingTerminal {
   element: HTMLElement;
-  options: IInternalTerminalOptions = {};
+  options: ITerminalOptions = {};
   cols: number;
   rows: number;
   charset: { [key: string]: string; };
@@ -437,29 +435,3 @@ export class MockCharSizeService implements ICharSizeService {
   constructor(public width: number, public height: number) {}
   measure(): void {}
 }
-
-export class MockOptionsService implements IOptionsService {
-  options: ITerminalOptions = clone(DEFAULT_OPTIONS);
-  onOptionChange: IEvent<string>;
-  constructor(testOptions: IPartialTerminalOptions) {
-    Object.keys(testOptions).forEach(key => this.options[key] = (<any>testOptions)[key]);
-  }
-  setOption<T>(key: string, value: T): void {
-    throw new Error('Method not implemented.');
-  }
-  getOption<T>(key: string): T {
-    throw new Error('Method not implemented.');
-  }
-}
-
-export class MockBufferService implements IBufferService {
-  constructor(
-    public cols: number,
-    public rows: number
-  ) {}
-  resize(cols: number, rows: number): void {
-    this.cols = cols;
-    this.rows = rows;
-  }
-
-}

src/common/TestUtils.test.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2019 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+import { IBufferService, IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
+import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
+import { clone } from 'common/Clone';
+import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
+
+export class MockBufferService implements IBufferService {
+  constructor(
+    public cols: number,
+    public rows: number
+  ) {}
+  resize(cols: number, rows: number): void {
+    this.cols = cols;
+    this.rows = rows;
+  }
+}
+
+export class MockOptionsService implements IOptionsService {
+  options: ITerminalOptions = clone(DEFAULT_OPTIONS);
+  onOptionChange: IEvent<string> = new EventEmitter2<string>().event;
+  constructor(testOptions: IPartialTerminalOptions) {
+    Object.keys(testOptions).forEach(key => this.options[key] = (<any>testOptions)[key]);
+  }
+  setOption<T>(key: string, value: T): void {
+    throw new Error('Method not implemented.');
+  }
+  getOption<T>(key: string): T {
+    throw new Error('Method not implemented.');
+  }
+}