Removed use of expected in conjunction with ve.dm.example.*Equal methods

Change-Id: I48108f3fac7dda32344e105b7c52483cd2a84ef9
This commit is contained in:
Trevor Parscal 2012-05-09 15:28:06 -07:00
parent a0178fd3bb
commit c017d7421c

View file

@ -14,13 +14,11 @@ test( 'getOuterLength', 1, function() {
test( 'rebuildNodes', function() {
var doc = new ve.dm.Document( ve.dm.example.data.slice( 0 ) ),
documentNode = doc.getDocumentNode();
// Rebuild without changes
doc.rebuildNodes( documentNode, 1, 1, 5, 30 );
// Test count: ( ( 4 tests x 21 branch nodes ) + ( 3 tests x 10 leaf nodes ) ) = 114
ve.dm.example.nodeTreeEqual( documentNode, ve.dm.example.tree );
// Create a copy of the example tree
// XXX: Create a new document node tree from the old one
var tree = new ve.dm.DocumentNode( ve.dm.example.tree.getChildren() );
// Remove table from linear model
doc.data.splice( 5, 30, { 'type': 'paragraph' }, 'a', 'b', 'c', { 'type': '/paragraph' } );
@ -28,71 +26,68 @@ test( 'rebuildNodes', function() {
tree.splice( 1, 1, new ve.dm.ParagraphNode( [new ve.dm.TextNode( 3 )] ) );
// Rebuild with changes
doc.rebuildNodes( documentNode, 1, 1, 5, 5 );
// Test count:
ve.dm.example.nodeTreeEqual( documentNode, tree );
} );
test( 'selectNodes', 31, function() {
test( 'selectNodes', function() {
var doc = new ve.dm.Document( ve.dm.example.data ),
documentNode = doc.getDocumentNode(),
lookup = ve.dm.example.lookupNode;
// Test count: ( 1 test + ( 2 tests x 1 results ) ) = 3
ve.dm.example.nodeSelectionEqual(
doc.selectNodes( new ve.Range( 0, 3 ), 'leaves' ),
[
// heading/text - tests partial leaf results have ranges with global offsets
{ 'node': lookup( documentNode, 0, 0 ), 'range': new ve.Range( 1, 3 ) }
]
);
// Test count: ( 1 test + ( 2 tests x 2 results ) ) = 5
ve.dm.example.nodeSelectionEqual(
doc.selectNodes( new ve.Range( 0, 10 ), 'leaves' ),
[
// heading/text - tests full coverage leaf nodes do not have ranges
{ 'node': lookup( documentNode, 0, 0 ) },
// table/tableRow/tableCell/paragraph/text - tests leaf nodes from different levels
{ 'node': lookup( documentNode, 1, 0, 0, 0, 0 ) }
]
);
// Test count: ( 1 test + ( 2 tests x 4 results ) ) = 9
ve.dm.example.nodeSelectionEqual(
doc.selectNodes( new ve.Range( 28, 41 ), 'leaves' ),
[
// table/tableRow/tableCell/list/listItem/paragraph/text
{ 'node': lookup( documentNode, 1, 0, 0, 2, 0, 0, 0 ) },
// preformatted/text
{ 'node': lookup( documentNode, 2, 0 ) },
// preformatted/image - tests leaf nodes that are not text nodes
{ 'node': lookup( documentNode, 2, 1 ) },
// preformatted/text
{ 'node': lookup( documentNode, 2, 2 ) }
]
);
// Test count: ( 1 test + ( 2 tests x 2 results ) ) = 5
ve.dm.example.nodeSelectionEqual(
doc.selectNodes( new ve.Range( 2, 15 ), 'siblings' ),
[
// heading
{ 'node': lookup( documentNode, 0 ), 'range': new ve.Range( 2, 4 ) },
// table
{ 'node': lookup( documentNode, 1 ), 'range': new ve.Range( 6, 15 ) }
]
);
// Test count: ( 1 test + ( 2 tests x 4 results ) ) = 9
ve.dm.example.nodeSelectionEqual(
doc.selectNodes( new ve.Range( 2, 49 ), 'siblings' ),
[
// heading
{ 'node': lookup( documentNode, 0 ), 'range': new ve.Range( 2, 4 ) },
// table
{ 'node': lookup( documentNode, 1 ) },
// preformatted
{ 'node': lookup( documentNode, 2 ) },
// definitionList
{ 'node': lookup( documentNode, 3 ), 'range': new ve.Range( 42, 49 ) }
]
);
var cases = [
{
'actual': doc.selectNodes( new ve.Range( 0, 3 ), 'leaves' ),
'expected': [
// heading/text - partial leaf results have ranges with global offsets
{ 'node': lookup( documentNode, 0, 0 ), 'range': new ve.Range( 1, 3 ) }
]
},
{
'actual': doc.selectNodes( new ve.Range( 0, 10 ), 'leaves' ),
'expected': [
// heading/text - full coverage leaf nodes do not have ranges
{ 'node': lookup( documentNode, 0, 0 ) },
// table/tableRow/tableCell/paragraph/text - leaf nodes from different levels
{ 'node': lookup( documentNode, 1, 0, 0, 0, 0 ) }
]
},
{
'actual': doc.selectNodes( new ve.Range( 28, 41 ), 'leaves' ),
'expected': [
// table/tableRow/tableCell/list/listItem/paragraph/text
{ 'node': lookup( documentNode, 1, 0, 0, 2, 0, 0, 0 ) },
// preformatted/text
{ 'node': lookup( documentNode, 2, 0 ) },
// preformatted/image - leaf nodes that are not text nodes
{ 'node': lookup( documentNode, 2, 1 ) },
// preformatted/text
{ 'node': lookup( documentNode, 2, 2 ) }
]
},
{
'actual': doc.selectNodes( new ve.Range( 2, 15 ), 'siblings' ),
'expected': [
// heading
{ 'node': lookup( documentNode, 0 ), 'range': new ve.Range( 2, 4 ) },
// table
{ 'node': lookup( documentNode, 1 ), 'range': new ve.Range( 6, 15 ) }
]
},
{
'actual': doc.selectNodes( new ve.Range( 2, 49 ), 'siblings' ),
'expected': [
// heading
{ 'node': lookup( documentNode, 0 ), 'range': new ve.Range( 2, 4 ) },
// table
{ 'node': lookup( documentNode, 1 ) },
// preformatted
{ 'node': lookup( documentNode, 2 ) },
// definitionList
{ 'node': lookup( documentNode, 3 ), 'range': new ve.Range( 42, 49 ) }
]
}
];
for ( var i = 0; i < cases.length; i++ ) {
ve.dm.example.nodeSelectionEqual( cases[i].actual, cases[i].expected );
}
} );