Browse Source

Use new, fancy, testing tools.

Piotr Jasiun 9 years ago
parent
commit
bf57b21f6a

+ 8 - 15
packages/ckeditor5-engine/tests/treeview/manual/immutable.js

@@ -6,12 +6,9 @@
 'use strict';
 
 import TreeView from '/ckeditor5/engine/treeview/treeview.js';
-import ContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
-import AttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';
-import Text from '/ckeditor5/engine/treeview/text.js';
-import Range from '/ckeditor5/engine/treeview/range.js';
 import MutationObserver from '/ckeditor5/engine/treeview/observer/mutationobserver.js';
 import SelectionObserver from '/ckeditor5/engine/treeview/observer/selectionobserver.js';
+import { parse } from '/tests/engine/_utils/view.js';
 
 const treeView = new TreeView();
 treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
@@ -19,18 +16,14 @@ treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
 treeView.addObserver( MutationObserver );
 treeView.addObserver( SelectionObserver );
 
-const p = new ContainerElement( 'p', null, [
-		new AttributeElement( 'strong', null, [ new Text( 'foo' ) ] ),
-		new AttributeElement( 'strong', null, [ new Text( 'bar' ) ] )
-	] );
+const { view, selection } = parse(
+	'<container:p><attribute:strong>foo</attribute:strong>[]<attribute:strong>bar</attribute:strong></container:p>' +
+	'<container:p></container:p>' +
+	'<container:p><attribute:strong></attribute:strong></container:p>' +
+	'<container:p>bom</container:p>' );
 
-treeView.viewRoots.get( 'editor' ).appendChildren( [
-	p,
-	new ContainerElement( 'p' ),
-	new ContainerElement( 'p', null, [ new AttributeElement( 'strong' ) ] ),
-	new ContainerElement( 'p', null, [ new Text( 'bar' ) ] )
-] );
+treeView.viewRoots.get( 'editor' ).appendChildren( view );
 
-treeView.selection.setRanges( [ Range.createFromParentsAndOffsets( p, 1, p, 1 ) ] );
+treeView.selection.setTo( selection );
 
 treeView.render();

+ 5 - 11
packages/ckeditor5-engine/tests/treeview/manual/inline-filler.js

@@ -6,13 +6,10 @@
 'use strict';
 
 import TreeView from '/ckeditor5/engine/treeview/treeview.js';
-import ContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
-import AttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';
-import Text from '/ckeditor5/engine/treeview/text.js';
-import Range from '/ckeditor5/engine/treeview/range.js';
 import SelectionObserver from '/ckeditor5/engine/treeview/observer/selectionobserver.js';
 import MutationObserver from '/ckeditor5/engine/treeview/observer/mutationobserver.js';
 import KeyObserver from '/ckeditor5/engine/treeview/observer/keyobserver.js';
+import { parse } from '/tests/engine/_utils/view.js';
 
 const treeView = new TreeView();
 treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
@@ -21,18 +18,15 @@ treeView.addObserver( MutationObserver );
 treeView.addObserver( SelectionObserver );
 treeView.addObserver( KeyObserver );
 
-const p = new ContainerElement( 'p', null, [
-		new AttributeElement( 'strong', null, [ new Text( 'foo' ) ] ),
-		new AttributeElement( 'strong', null, [ new Text( 'bar' ) ] )
-	] );
+const { view, selection } = parse(
+	'<container:p><attribute:strong>foo</attribute:strong>[]<attribute:strong>bar</attribute:strong></container:p>' );
 
-treeView.viewRoots.get( 'editor' ).appendChildren( p );
+treeView.viewRoots.get( 'editor' ).appendChildren( view );
 
-treeView.selection.setRanges( [ Range.createFromParentsAndOffsets( p, 1, p, 1 ) ] );
+treeView.selection.setTo( selection );
 
 treeView.on( 'selectionchange', ( evt, data ) => {
 	treeView.selection.setTo( data.newSelection );
 } );
 
 treeView.render();
-

+ 4 - 6
packages/ckeditor5-engine/tests/treeview/manual/mutationobserver.js

@@ -8,9 +8,8 @@
 'use strict';
 
 import TreeView from '/ckeditor5/engine/treeview/treeview.js';
-import Element from '/ckeditor5/engine/treeview/element.js';
-import Text from '/ckeditor5/engine/treeview/text.js';
 import MutationObserver from '/ckeditor5/engine/treeview/observer/mutationobserver.js';
+import { parse } from '/tests/engine/_utils/view.js';
 
 const treeView = new TreeView();
 treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
@@ -19,9 +18,8 @@ treeView.on( 'mutations', ( evt, mutations ) => console.log( mutations ) );
 
 treeView.addObserver( MutationObserver );
 
-treeView.viewRoots.get( 'editor' ).appendChildren( [
-	new Element( 'p', [], [ new Text( 'foo' ) ] ),
-	new Element( 'p', [], [ new Text( 'bom' ) ] )
-] );
+treeView.viewRoots.get( 'editor' ).appendChildren( parse(
+	'<container:p>foo</container:p>' +
+	'<container:p>bar</container:p>' ) );
 
 treeView.render();

+ 8 - 13
packages/ckeditor5-engine/tests/treeview/manual/x-index.js

@@ -6,12 +6,9 @@
 'use strict';
 
 import TreeView from '/ckeditor5/engine/treeview/treeview.js';
-import ContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
-import AttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';
-import Text from '/ckeditor5/engine/treeview/text.js';
-import Range from '/ckeditor5/engine/treeview/range.js';
 import SelectionObserver from '/ckeditor5/engine/treeview/observer/selectionobserver.js';
 import MutationObserver from '/ckeditor5/engine/treeview/observer/mutationobserver.js';
+import { parse } from '/tests/engine/_utils/view.js';
 
 const treeView = new TreeView();
 treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
@@ -19,20 +16,18 @@ treeView.createRoot( document.getElementById( 'editor' ), 'editor' );
 treeView.addObserver( MutationObserver );
 treeView.addObserver( SelectionObserver );
 
-const foo = new Text( 'foo' );
+const { view, selection } = parse(
+	'<container:p>fo{}o</container:p>' +
+	'<container:p></container:p>' +
+	'<container:p><attribute:strong></attribute:strong></container:p>' +
+	'<container:p>bar</container:p>' );
 
-treeView.viewRoots.get( 'editor' ).appendChildren( [
-	new ContainerElement( 'p', null, [ foo ] ),
-	new ContainerElement( 'p' ),
-	new ContainerElement( 'p', null, [ new AttributeElement( 'strong' ) ] ),
-	new ContainerElement( 'p', null, [ new Text( 'bar' ) ] )
-] );
+treeView.viewRoots.get( 'editor' ).appendChildren( view );
 
-treeView.selection.setRanges( [ Range.createFromParentsAndOffsets( foo, 2, foo, 2 ) ] );
+treeView.selection.setTo( selection );
 
 treeView.on( 'selectionchange', ( evt, data ) => {
 	treeView.selection.setTo( data.newSelection );
 } );
 
 treeView.render();
-