瀏覽代碼

#396: Update test utils & tests.

Maciej Gołaszewski 9 年之前
父節點
當前提交
6c43dbc8d7
共有 25 個文件被更改,包括 132 次插入153 次删除
  1. 33 32
      packages/ckeditor5-engine/tests/treemodel/_utils/utils.js
  2. 25 33
      packages/ckeditor5-engine/tests/treemodel/delta/delta.js
  3. 2 2
      packages/ckeditor5-engine/tests/treemodel/delta/insertdelta.js
  4. 1 3
      packages/ckeditor5-engine/tests/treemodel/delta/movedelta.js
  5. 1 3
      packages/ckeditor5-engine/tests/treemodel/delta/removedelta.js
  6. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/insertdelta.js
  7. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/mergedelta.js
  8. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/movedelta.js
  9. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/removedelta.js
  10. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/splitdelta.js
  11. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/unwrapdelta.js
  12. 1 2
      packages/ckeditor5-engine/tests/treemodel/delta/transform/wrapdelta.js
  13. 7 7
      packages/ckeditor5-engine/tests/treemodel/element.js
  14. 11 12
      packages/ckeditor5-engine/tests/treemodel/nodelist.js
  15. 4 4
      packages/ckeditor5-engine/tests/treemodel/operation/attributeoperation.js
  16. 5 5
      packages/ckeditor5-engine/tests/treemodel/operation/insertoperation.js
  17. 6 6
      packages/ckeditor5-engine/tests/treemodel/operation/moveoperation.js
  18. 3 3
      packages/ckeditor5-engine/tests/treemodel/operation/nooperation.js
  19. 4 4
      packages/ckeditor5-engine/tests/treemodel/operation/operation.js
  20. 6 6
      packages/ckeditor5-engine/tests/treemodel/operation/reinsertoperation.js
  21. 6 6
      packages/ckeditor5-engine/tests/treemodel/operation/removeoperation.js
  22. 4 4
      packages/ckeditor5-engine/tests/treemodel/operation/rootattributeoperation.js
  23. 3 3
      packages/ckeditor5-engine/tests/treemodel/position.js
  24. 2 2
      packages/ckeditor5-engine/tests/treemodel/range.js
  25. 2 4
      packages/ckeditor5-engine/tests/treemodel/utils-tests/utils.js

+ 33 - 32
packages/ckeditor5-engine/tests/treemodel/_utils/utils.js

@@ -7,38 +7,39 @@
 
 import TreeWalker from '/ckeditor5/engine/treemodel/treewalker.js';
 
-const utils = {
-	/**
-	 * Returns tree structure as a simplified string. Elements are uppercase and characters are lowercase.
-	 * Start and end of an element is marked the same way, by the element's name (in uppercase).
-	 *
-	 *		let element = new Element( 'div', [], [ 'abc', new Element( 'p', [], 'foo' ), 'xyz' ] );
-	 *		treemodelUtils.getNodesAndText( element ); // abcPfooPxyz
-	 *
-	 * @param {engine.treeModel.Range} range Range to stringify.
-	 * @returns {String} String representing element inner structure.
-	 */
-	getNodesAndText( range ) {
-		let txt = '';
-		const treeWalker = new TreeWalker( { boundaries: range } );
-
-		for ( let value of treeWalker ) {
-			let node = value.item;
-			let nodeText = node.text || node.character;
-
-			if ( nodeText ) {
-				txt += nodeText.toLowerCase();
-			} else {
-				txt += node.name.toUpperCase();
-			}
+/**
+ * Returns tree structure as a simplified string. Elements are uppercase and characters are lowercase.
+ * Start and end of an element is marked the same way, by the element's name (in uppercase).
+ *
+ *		let element = new Element( 'div', [], [ 'abc', new Element( 'p', [], 'foo' ), 'xyz' ] );
+ *		treemodelUtils.getNodesAndText( element ); // abcPfooPxyz
+ *
+ * @param {engine.treeModel.Range} range Range to stringify.
+ * @returns {String} String representing element inner structure.
+ */
+export default function getNodesAndText( range ) {
+	let txt = '';
+	const treeWalker = new TreeWalker( { boundaries: range } );
+
+	for ( let value of treeWalker ) {
+		let node = value.item;
+		let nodeText = node.text || node.character;
+
+		if ( nodeText ) {
+			txt += nodeText.toLowerCase();
+		} else {
+			txt += node.name.toUpperCase();
 		}
-
-		return txt;
-	},
-
-	jsonParseStringify( object ) {
-		return JSON.parse( JSON.stringify( object ) );
 	}
-};
 
-export default utils;
+	return txt;
+}
+
+/**
+ * Returns object JSON representation. It pases an object by JSON.stringify and JSON.parse functions.
+ *
+ * @param {Object|Array} object
+ */
+export function jsonParseStringify( object ) {
+	return JSON.parse( JSON.stringify( object ) );
+}

+ 25 - 33
packages/ckeditor5-engine/tests/treemodel/delta/delta.js

@@ -22,7 +22,7 @@ import { registerDeserializer } from '/ckeditor5/engine/treemodel/delta/delta.js
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import Range from '/ckeditor5/engine/treemodel/range.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 // Some test examples of operations.
 class FooOperation extends Operation {
@@ -148,7 +148,7 @@ describe( 'Delta', () => {
 		} );
 
 		it( 'should return JSON representation for empty delta', () => {
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
 				operations: []
 			} );
@@ -165,9 +165,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -180,9 +180,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -196,9 +196,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -207,9 +207,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -223,9 +223,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -238,9 +238,9 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
@@ -249,16 +249,16 @@ describe( 'Delta', () => {
 
 			delta.addOperation( operation );
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
-				operations: [ treeModelTestUtils.jsonParseStringify( operation ) ]
+				operations: [ jsonParseStringify( operation ) ]
 			} );
 		} );
 
 		it( 'should remove batch reference', () => {
 			delta.batch = { foo: 'bar' };
 
-			expect( treeModelTestUtils.jsonParseStringify( delta ) ).to.deep.equal( {
+			expect( jsonParseStringify( delta ) ).to.deep.equal( {
 				__className: FooDelta.className,
 				operations: []
 			} );
@@ -281,7 +281,7 @@ describe( 'Delta', () => {
 
 		it( 'should throw error for unregistered delta', () => {
 			expect( () => {
-				Delta.fromJSON( treeModelTestUtils.jsonParseStringify( new BarDelta() ), {} );
+				Delta.fromJSON( jsonParseStringify( new BarDelta() ), {} );
 			} ).to.throw( CKEditorError, /^delta-fromjson-no-deserializer/ );
 		} );
 
@@ -294,7 +294,7 @@ describe( 'Delta', () => {
 				doc.version
 			) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -306,7 +306,7 @@ describe( 'Delta', () => {
 				doc.version
 			) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -319,7 +319,7 @@ describe( 'Delta', () => {
 				doc.version
 			) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -327,7 +327,7 @@ describe( 'Delta', () => {
 		it( 'should create delta with NoOperation', () => {
 			delta.addOperation( new NoOperation( 0 ) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -340,7 +340,7 @@ describe( 'Delta', () => {
 				doc.version
 			) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -352,7 +352,7 @@ describe( 'Delta', () => {
 				doc.version
 			) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -360,7 +360,7 @@ describe( 'Delta', () => {
 		it( 'should create delta with RootAttributeOperation', () => {
 			delta.addOperation( new RootAttributeOperation( root, 'key', null, 'newValue', doc.version ) );
 
-			let deserialized = Delta.fromJSON( treeModelTestUtils.jsonParseStringify( delta ), doc );
+			let deserialized = Delta.fromJSON( jsonParseStringify( delta ), doc );
 
 			expect( deserialized ).to.deep.equal( delta );
 		} );
@@ -376,13 +376,5 @@ describe( 'Delta', () => {
 				done();
 			}
 		} );
-
-		it( 'should throw error for adding already defined deserializer', () => {
-			registerDeserializer( 'BAR', FooDelta );
-
-			expect( () => {
-				registerDeserializer( 'BAR', FooDelta );
-			} ).to.throw( CKEditorError, /^delta-register-deserializer-defined/ );
-		} );
 	} );
 } );

+ 2 - 2
packages/ckeditor5-engine/tests/treemodel/delta/insertdelta.js

@@ -19,7 +19,7 @@ import Delta from '/ckeditor5/engine/treemodel/delta/delta.js';
 import RemoveDelta from '/ckeditor5/engine/treemodel/delta/removedelta.js';
 import RemoveOperation from '/ckeditor5/engine/treemodel/operation/removeoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'Batch', () => {
 	let doc, root, batch, p, ul, chain;
@@ -129,7 +129,7 @@ describe( 'InsertDelta', () => {
 
 	describe( 'fromJSON', () => {
 		it( 'should create InsertDelta instance from serialized JSON object', () => {
-			let serialized = treeModelTestUtils.jsonParseStringify( insertDelta );
+			let serialized = jsonParseStringify( insertDelta );
 			let deserialized = Delta.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.be.instanceOf( InsertDelta );

+ 1 - 3
packages/ckeditor5-engine/tests/treemodel/delta/movedelta.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { default as getNodesAndText } from '/tests/engine/treemodel/_utils/utils.js';
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import Range from '/ckeditor5/engine/treemodel/range.js';
@@ -17,8 +17,6 @@ import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
 import MoveDelta from '/ckeditor5/engine/treemodel/delta/movedelta.js';
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
-
 describe( 'Batch', () => {
 	let doc, root, div, p, batch, chain;
 

+ 1 - 3
packages/ckeditor5-engine/tests/treemodel/delta/removedelta.js

@@ -7,15 +7,13 @@
 
 'use strict';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { default as getNodesAndText } from '/tests/engine/treemodel/_utils/utils.js';
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import Range from '/ckeditor5/engine/treemodel/range.js';
 import Element from '/ckeditor5/engine/treemodel/element.js';
 import RemoveDelta from '/ckeditor5/engine/treemodel/delta/removedelta.js';
 
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
-
 describe( 'Batch', () => {
 	let doc, root, div, p, batch, chain, range;
 

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/insertdelta.js

@@ -23,8 +23,7 @@ import InsertOperation from '/ckeditor5/engine/treemodel/operation/insertoperati
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 import ReinsertOperation from '/ckeditor5/engine/treemodel/operation/reinsertoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/mergedelta.js

@@ -22,8 +22,7 @@ import MergeDelta from '/ckeditor5/engine/treemodel/delta/mergedelta.js';
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 import RemoveOperation from '/ckeditor5/engine/treemodel/operation/removeoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/movedelta.js

@@ -20,8 +20,7 @@ import SplitDelta from '/ckeditor5/engine/treemodel/delta/splitdelta.js';
 
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/removedelta.js

@@ -20,8 +20,7 @@ import SplitDelta from '/ckeditor5/engine/treemodel/delta/splitdelta.js';
 
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/splitdelta.js

@@ -22,8 +22,7 @@ import SplitDelta from '/ckeditor5/engine/treemodel/delta/splitdelta.js';
 import InsertOperation from '/ckeditor5/engine/treemodel/operation/insertoperation.js';
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/unwrapdelta.js

@@ -21,8 +21,7 @@ import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.j
 import MergeDelta from '/ckeditor5/engine/treemodel/delta/mergedelta.js';
 import UnwrapDelta from '/ckeditor5/engine/treemodel/delta/unwrapdelta.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 1 - 2
packages/ckeditor5-engine/tests/treemodel/delta/transform/wrapdelta.js

@@ -22,8 +22,7 @@ import InsertOperation from '/ckeditor5/engine/treemodel/operation/insertoperati
 import MergeDelta from '/ckeditor5/engine/treemodel/delta/mergedelta.js';
 import WrapDelta from '/ckeditor5/engine/treemodel/delta/wrapdelta.js';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 import {
 	applyDelta,

+ 7 - 7
packages/ckeditor5-engine/tests/treemodel/element.js

@@ -11,7 +11,7 @@ import Node from '/ckeditor5/engine/treemodel/node.js';
 import NodeList from '/ckeditor5/engine/treemodel/nodelist.js';
 import Element from '/ckeditor5/engine/treemodel/element.js';
 import DocumentFragment from '/ckeditor5/engine/treemodel/documentfragment.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'Element', () => {
 	describe( 'constructor', () => {
@@ -245,7 +245,7 @@ describe( 'Element', () => {
 		it( 'should serialize empty node', () => {
 			let element = new Element( 'one' );
 
-			expect( treeModelTestUtils.jsonParseStringify( element ) ).to.deep.equal( {
+			expect( jsonParseStringify( element ) ).to.deep.equal( {
 				_attrs: [],
 				_children: {
 					_indexMap: [],
@@ -258,7 +258,7 @@ describe( 'Element', () => {
 		it( 'should serialize node with attributes', () => {
 			let node = new Element( 'one', { foo: true, bar: false } );
 
-			expect( treeModelTestUtils.jsonParseStringify( node ) ).to.deep.equal( {
+			expect( jsonParseStringify( node ) ).to.deep.equal( {
 				_attrs: [ [ 'foo', true ], [ 'bar', false ] ],
 				_children: {
 					_indexMap: [],
@@ -276,7 +276,7 @@ describe( 'Element', () => {
 
 			let node = new Element( null, null, [ one, two, three ] );
 
-			expect( treeModelTestUtils.jsonParseStringify( node ) ).to.deep.equal( {
+			expect( jsonParseStringify( node ) ).to.deep.equal( {
 				_attrs: [],
 				_children: {
 					_indexMap: [ 0, 1, 2 ],
@@ -306,7 +306,7 @@ describe( 'Element', () => {
 		it( 'should create element without attributes', () => {
 			const el = new Element( 'el' );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( el );
+			let serialized = jsonParseStringify( el );
 
 			let deserialized = Element.fromJSON( serialized );
 
@@ -319,7 +319,7 @@ describe( 'Element', () => {
 		it( 'should create element with attributes', () => {
 			const el = new Element( 'el', { foo: true } );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( el );
+			let serialized = jsonParseStringify( el );
 
 			let deserialized = Element.fromJSON( serialized );
 
@@ -334,7 +334,7 @@ describe( 'Element', () => {
 			const p = new Element( 'p' );
 			const el = new Element( 'el', null, p );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( el );
+			let serialized = jsonParseStringify( el );
 
 			let deserialized = Element.fromJSON( serialized );
 

+ 11 - 12
packages/ckeditor5-engine/tests/treemodel/nodelist.js

@@ -12,7 +12,7 @@ import DocumentFragment from '/ckeditor5/engine/treemodel/documentfragment.js';
 import Element from '/ckeditor5/engine/treemodel/element.js';
 import Text from '/ckeditor5/engine/treemodel/text.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'NodeList', () => {
 	describe( 'constructor', () => {
@@ -364,8 +364,8 @@ describe( 'NodeList', () => {
 			let p = new Element( 'p' );
 			let nodeList = new NodeList( p );
 
-			expect( treeModelTestUtils.jsonParseStringify( nodeList ) ).to.deep.equal( {
-				_nodes: [ treeModelTestUtils.jsonParseStringify( p ) ],
+			expect( jsonParseStringify( nodeList ) ).to.deep.equal( {
+				_nodes: [ jsonParseStringify( p ) ],
 				_indexMap: [ 0 ]
 			} );
 		} );
@@ -385,16 +385,15 @@ describe( 'NodeList', () => {
 					name: 'p'
 				} ]
 			};
-			let jsonParseStringify = treeModelTestUtils.jsonParseStringify( nodeList );
 
-			expect( jsonParseStringify ).to.deep.equal( newVar );
+			expect( jsonParseStringify( nodeList ) ).to.deep.equal( newVar );
 		} );
 
 		it( 'should return serialized object for text', () => {
 			let text = new Text( 'bar' );
 			let nodeList = new NodeList( text );
 
-			expect( treeModelTestUtils.jsonParseStringify( nodeList ) ).to.deep.equal( {
+			expect( jsonParseStringify( nodeList ) ).to.deep.equal( {
 				_nodes: [
 					{ _attrs: [], text: 'bar' }
 				],
@@ -406,7 +405,7 @@ describe( 'NodeList', () => {
 			let text = new Text( 'bar', { bold: true } );
 			let nodeList = new NodeList( text );
 
-			expect( treeModelTestUtils.jsonParseStringify( nodeList ) ).to.deep.equal( {
+			expect( jsonParseStringify( nodeList ) ).to.deep.equal( {
 				_nodes: [
 					{ _attrs: [ [ 'bold', true ] ], text: 'bar' }
 				],
@@ -418,7 +417,7 @@ describe( 'NodeList', () => {
 			let text = new Text( 'bar', { bold: true } );
 			let nodeList = new NodeList( text );
 
-			expect( treeModelTestUtils.jsonParseStringify( nodeList ) ).to.deep.equal( {
+			expect( jsonParseStringify( nodeList ) ).to.deep.equal( {
 				_nodes: [
 					{ _attrs: [ [ 'bold', true ] ], text: 'bar' }
 				],
@@ -432,7 +431,7 @@ describe( 'NodeList', () => {
 			let text = new Text( 'bar', { bold: true } );
 			let nodeList = new NodeList( text );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( nodeList );
+			let serialized = jsonParseStringify( nodeList );
 
 			let deserialized = NodeList.fromJSON( serialized );
 
@@ -446,7 +445,7 @@ describe( 'NodeList', () => {
 			let p = new Element( 'p' );
 			let nodeList = new NodeList( p );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( nodeList );
+			let serialized = jsonParseStringify( nodeList );
 
 			let deserialized = NodeList.fromJSON( serialized );
 
@@ -460,7 +459,7 @@ describe( 'NodeList', () => {
 			let p = new Element( 'p', { bold: true } );
 			let nodeList = new NodeList( p );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( nodeList );
+			let serialized = jsonParseStringify( nodeList );
 
 			let deserialized = NodeList.fromJSON( serialized );
 
@@ -474,7 +473,7 @@ describe( 'NodeList', () => {
 			let p = new Element( 'p', null, 'bar' );
 			let nodeList = new NodeList( p );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( nodeList );
+			let serialized = jsonParseStringify( nodeList );
 			let deserialized = NodeList.fromJSON( serialized );
 
 			expect( deserialized._indexMap ).to.deep.equal( nodeList._indexMap );

+ 4 - 4
packages/ckeditor5-engine/tests/treemodel/operation/attributeoperation.js

@@ -14,7 +14,7 @@ import Position from '/ckeditor5/engine/treemodel/position.js';
 import Range from '/ckeditor5/engine/treemodel/range.js';
 import Text from '/ckeditor5/engine/treemodel/text.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'AttributeOperation', () => {
 	let doc, root;
@@ -378,7 +378,7 @@ describe( 'AttributeOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized.__className ).to.equal( 'engine.treeModel.operation.AttributeOperation' );
 			expect( serialized ).to.deep.equal( {
@@ -387,7 +387,7 @@ describe( 'AttributeOperation', () => {
 				key: 'key',
 				newValue: 'newValue',
 				oldValue: null,
-				range: treeModelTestUtils.jsonParseStringify( range )
+				range: jsonParseStringify( range )
 			} );
 		} );
 	} );
@@ -403,7 +403,7 @@ describe( 'AttributeOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = AttributeOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( op );

+ 5 - 5
packages/ckeditor5-engine/tests/treemodel/operation/insertoperation.js

@@ -14,7 +14,7 @@ import InsertOperation from '/ckeditor5/engine/treemodel/operation/insertoperati
 import RemoveOperation from '/ckeditor5/engine/treemodel/operation/removeoperation.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import Text from '/ckeditor5/engine/treemodel/text.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'InsertOperation', () => {
 	let doc, root;
@@ -185,13 +185,13 @@ describe( 'InsertOperation', () => {
 			const position = new Position( root, [ 0 ] );
 			const op = new InsertOperation( position, new Text( 'x' ), doc.version );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.InsertOperation',
 				baseVersion: 0,
-				nodeList: treeModelTestUtils.jsonParseStringify( new NodeList( 'x' ) ),
-				position: treeModelTestUtils.jsonParseStringify( position )
+				nodeList: jsonParseStringify( new NodeList( 'x' ) ),
+				position: jsonParseStringify( position )
 			} );
 		} );
 	} );
@@ -201,7 +201,7 @@ describe( 'InsertOperation', () => {
 			const position = new Position( root, [ 0 ] );
 			const op = new InsertOperation( position, new Text( 'x' ), doc.version );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = InsertOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( op );

+ 6 - 6
packages/ckeditor5-engine/tests/treemodel/operation/moveoperation.js

@@ -12,7 +12,7 @@ import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.j
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import Element from '/ckeditor5/engine/treemodel/element.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'MoveOperation', () => {
 	let doc, root;
@@ -265,16 +265,16 @@ describe( 'MoveOperation', () => {
 			const targetPosition = new Position( root, [ 1, 0 ] );
 			const op = new MoveOperation( sourcePosition, 1, targetPosition, doc.version );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.MoveOperation',
 				baseVersion: 0,
 				howMany: 1,
 				isSticky: false,
-				movedRangeStart: treeModelTestUtils.jsonParseStringify( op.movedRangeStart ),
-				sourcePosition: treeModelTestUtils.jsonParseStringify( sourcePosition ),
-				targetPosition: treeModelTestUtils.jsonParseStringify( targetPosition )
+				movedRangeStart: jsonParseStringify( op.movedRangeStart ),
+				sourcePosition: jsonParseStringify( sourcePosition ),
+				targetPosition: jsonParseStringify( targetPosition )
 			} );
 		} );
 	} );
@@ -285,7 +285,7 @@ describe( 'MoveOperation', () => {
 			const targetPosition = new Position( root, [ 1, 0 ] );
 			const op = new MoveOperation( sourcePosition, 1, targetPosition, doc.version );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = MoveOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( op );

+ 3 - 3
packages/ckeditor5-engine/tests/treemodel/operation/nooperation.js

@@ -9,7 +9,7 @@
 
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import NoOperation from '/ckeditor5/engine/treemodel/operation/nooperation.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'NoOperation', () => {
 	let noop, doc, root;
@@ -40,7 +40,7 @@ describe( 'NoOperation', () => {
 
 	describe( 'toJSON', () => {
 		it( 'should create proper json object', () => {
-			const serialized = treeModelTestUtils.jsonParseStringify( noop );
+			const serialized = jsonParseStringify( noop );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.NoOperation',
@@ -51,7 +51,7 @@ describe( 'NoOperation', () => {
 
 	describe( 'fromJSON', () => {
 		it( 'should create proper NoOperation from json object', () => {
-			const serialized = treeModelTestUtils.jsonParseStringify( noop );
+			const serialized = jsonParseStringify( noop );
 			const deserialized = NoOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( noop );

+ 4 - 4
packages/ckeditor5-engine/tests/treemodel/operation/operation.js

@@ -9,7 +9,7 @@
 
 import Delta from '/ckeditor5/engine/treemodel/delta/delta.js';
 import Operation from '/ckeditor5/engine/treemodel/operation/operation.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'Operation', () => {
 	it( 'should save its base version', () => {
@@ -25,7 +25,7 @@ describe( 'Operation', () => {
 
 		let opOutsideDelta = new Operation( 0 );
 
-		let parsedOutside = treeModelTestUtils.jsonParseStringify( opOutsideDelta );
+		let parsedOutside = jsonParseStringify( opOutsideDelta );
 
 		expect( parsedOutside.delta ).to.be.undefined;
 	} );
@@ -34,7 +34,7 @@ describe( 'Operation', () => {
 		it( 'should create proper json object', () => {
 			const op = new Operation( 4 );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.Operation',
@@ -47,7 +47,7 @@ describe( 'Operation', () => {
 		it( 'should create proper Operation from json object', () => {
 			const op = new Operation( 4 );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = Operation.fromJSON( serialized );
 
 			expect( deserialized ).to.deep.equal( op );

+ 6 - 6
packages/ckeditor5-engine/tests/treemodel/operation/reinsertoperation.js

@@ -12,7 +12,7 @@ import ReinsertOperation from '/ckeditor5/engine/treemodel/operation/reinsertope
 import RemoveOperation from '/ckeditor5/engine/treemodel/operation/removeoperation.js';
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'ReinsertOperation', () => {
 	let doc, root, graveyard, operation, graveyardPosition, rootPosition;
@@ -96,23 +96,23 @@ describe( 'ReinsertOperation', () => {
 
 	describe( 'toJSON', () => {
 		it( 'should create proper json object', () => {
-			const serialized = treeModelTestUtils.jsonParseStringify( operation );
+			const serialized = jsonParseStringify( operation );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.ReinsertOperation',
 				baseVersion: 0,
 				howMany: 2,
 				isSticky: false,
-				movedRangeStart: treeModelTestUtils.jsonParseStringify( operation.movedRangeStart ),
-				sourcePosition: treeModelTestUtils.jsonParseStringify( operation.sourcePosition ),
-				targetPosition: treeModelTestUtils.jsonParseStringify( operation.targetPosition )
+				movedRangeStart: jsonParseStringify( operation.movedRangeStart ),
+				sourcePosition: jsonParseStringify( operation.sourcePosition ),
+				targetPosition: jsonParseStringify( operation.targetPosition )
 			} );
 		} );
 	} );
 
 	describe( 'fromJSON', () => {
 		it( 'should create proper ReinsertOperation from json object', () => {
-			const serialized = treeModelTestUtils.jsonParseStringify( operation );
+			const serialized = jsonParseStringify( operation );
 			const deserialized = ReinsertOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( operation );

+ 6 - 6
packages/ckeditor5-engine/tests/treemodel/operation/removeoperation.js

@@ -12,7 +12,7 @@ import ReinsertOperation from '/ckeditor5/engine/treemodel/operation/reinsertope
 import RemoveOperation from '/ckeditor5/engine/treemodel/operation/removeoperation.js';
 import MoveOperation from '/ckeditor5/engine/treemodel/operation/moveoperation.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'RemoveOperation', () => {
 	let doc, root, graveyard;
@@ -126,16 +126,16 @@ describe( 'RemoveOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized ).to.deep.equal( {
 				__className: 'engine.treeModel.operation.RemoveOperation',
 				baseVersion: 0,
 				howMany: 2,
 				isSticky: false,
-				movedRangeStart: treeModelTestUtils.jsonParseStringify( op.movedRangeStart ),
-				sourcePosition: treeModelTestUtils.jsonParseStringify( op.sourcePosition ),
-				targetPosition: treeModelTestUtils.jsonParseStringify( op.targetPosition )
+				movedRangeStart: jsonParseStringify( op.movedRangeStart ),
+				sourcePosition: jsonParseStringify( op.sourcePosition ),
+				targetPosition: jsonParseStringify( op.targetPosition )
 			} );
 		} );
 	} );
@@ -148,7 +148,7 @@ describe( 'RemoveOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = RemoveOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( op );

+ 4 - 4
packages/ckeditor5-engine/tests/treemodel/operation/rootattributeoperation.js

@@ -10,7 +10,7 @@
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import RootAttributeOperation from '/ckeditor5/engine/treemodel/operation/rootattributeoperation.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'RootAttributeOperation', () => {
 	let doc, root;
@@ -235,7 +235,7 @@ describe( 'RootAttributeOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 
 			expect( serialized.__className ).to.equal( 'engine.treeModel.operation.RootAttributeOperation' );
 			expect( serialized ).to.deep.equal( {
@@ -253,7 +253,7 @@ describe( 'RootAttributeOperation', () => {
 		it( 'should create proper RootAttributeOperation from json object', () => {
 			const op = new RootAttributeOperation( root, 'key', null, 'newValue', doc.version );
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			const deserialized = RootAttributeOperation.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( op );
@@ -268,7 +268,7 @@ describe( 'RootAttributeOperation', () => {
 				doc.version
 			);
 
-			const serialized = treeModelTestUtils.jsonParseStringify( op );
+			const serialized = jsonParseStringify( op );
 			serialized.root = 'no-root';
 
 			expect( () => {

+ 3 - 3
packages/ckeditor5-engine/tests/treemodel/position.js

@@ -14,7 +14,7 @@ import Text from '/ckeditor5/engine/treemodel/text.js';
 import Position from '/ckeditor5/engine/treemodel/position.js';
 import CKEditorError from '/ckeditor5/utils/ckeditorerror.js';
 import testUtils from '/tests/ckeditor5/_utils/utils.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 testUtils.createSinonSandbox();
 
@@ -687,7 +687,7 @@ describe( 'position', () => {
 		it( 'should serialize position', () => {
 			let position = new Position( root, [ 0 ] );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( position );
+			let serialized = jsonParseStringify( position );
 
 			expect( serialized ).to.deep.equal( { root: 'root', path: [ 0 ] } );
 		} );
@@ -695,7 +695,7 @@ describe( 'position', () => {
 		it( 'should serialize position from graveyard', () => {
 			let position = new Position( doc.graveyard, [ 0 ] );
 
-			let serialized = treeModelTestUtils.jsonParseStringify( position );
+			let serialized = jsonParseStringify( position );
 
 			expect( serialized ).to.deep.equal( { root: '$$graveyard', path: [ 0 ] } );
 		} );

+ 2 - 2
packages/ckeditor5-engine/tests/treemodel/range.js

@@ -13,7 +13,7 @@ import Element from '/ckeditor5/engine/treemodel/element.js';
 import Text from '/ckeditor5/engine/treemodel/text.js';
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import TreeWalker from '/ckeditor5/engine/treemodel/treewalker.js';
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 
 describe( 'Range', () => {
 	let doc, range, start, end, root, otherRoot;
@@ -703,7 +703,7 @@ describe( 'Range', () => {
 
 	describe( 'fromJSON', () => {
 		it( 'should create range from given JSON object', () => {
-			const serialized = treeModelTestUtils.jsonParseStringify( range );
+			const serialized = jsonParseStringify( range );
 			const deserialized = Range.fromJSON( serialized, doc );
 
 			expect( deserialized ).to.deep.equal( range );

+ 2 - 4
packages/ckeditor5-engine/tests/treemodel/utils-tests/utils.js

@@ -5,13 +5,11 @@
 
 'use strict';
 
-import treeModelTestUtils from '/tests/engine/treemodel/_utils/utils.js';
+import { default as getNodesAndText, jsonParseStringify } from '/tests/engine/treemodel/_utils/utils.js';
 import Document from '/ckeditor5/engine/treemodel/document.js';
 import Range from '/ckeditor5/engine/treemodel/range.js';
 import Element from '/ckeditor5/engine/treemodel/element.js';
 
-const getNodesAndText = treeModelTestUtils.getNodesAndText;
-
 describe( 'getNodesAndText', () => {
 	let doc, root, div, p;
 
@@ -40,7 +38,7 @@ describe( 'jsonParseStringify', () => {
 	it( 'should return cleaned object', () => {
 		let foo = new Foo( { bar: 'bar' } );
 
-		let fooJsoned = treeModelTestUtils.jsonParseStringify( foo );
+		let fooJsoned = jsonParseStringify( foo );
 		expect( fooJsoned ).to.not.be.instanceOf( Foo );
 		expect( fooJsoned ).to.deep.equal( { ra: { bar: 'bar' } } );
 	} );