Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/320086
Change subject: Don't bother testing data on direction key tests
......................................................................
Don't bother testing data on direction key tests
Also remove QUnit.expect counts as they are no longer required.
Change-Id: Ieb3eaf215a0512ba541fdea18e572a2ce34ddf73
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 4 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/86/320086/1
diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index f6cb2b7..0743891 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -51,14 +51,16 @@
);
}
}
- expectedData( data );
+ if ( expectedData ) {
+ expectedData( data );
+ assert.equalLinearData( model.getDocument().getFullData(),
data, msg + ': data' );
+ }
expectedSelection = ve.dm.Selection.static.newFromJSON(
model.getDocument(), expectedRangeOrSelection instanceof ve.Range ?
{ type: 'linear', range: expectedRangeOrSelection } :
expectedRangeOrSelection
);
- assert.equalLinearData( model.getDocument().getFullData(), data, msg +
': data' );
assert.equalHash( model.getSelection(), expectedSelection, msg + ':
selection' );
view.destroy();
};
@@ -520,8 +522,6 @@
}
];
- QUnit.expect( cases.length * 2 );
-
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
assert, cases[ i ].htmlOrDoc, cases[ i
].rangeOrSelection, cases[ i ].keys,
@@ -543,7 +543,6 @@
fromRow: 0
},
keys: [ 'ENTER' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 11 ),
msg: 'Enter to edit a table cell'
},
@@ -556,7 +555,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'ESCAPE' ],
- expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -574,7 +572,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'TAB' ],
- expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -592,7 +589,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'SHIFT+TAB' ],
- expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -638,7 +634,6 @@
fromRow: 0
},
keys: [ 'UP' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 0 ),
msg: 'Up in first row of table moves out of
table'
},
@@ -652,13 +647,10 @@
fromRow: 6
},
keys: [ 'DOWN' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 171 ),
msg: 'Down in last row of table moves out of
table'
}
];
-
- QUnit.expect( cases.length * 2 );
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
@@ -687,7 +679,6 @@
rangeOrSelection: new ve.Range( 2 ),
keys: [ 'LEFT' ],
forceSelection: new ve.Range( 1 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 1 ),
msg: 'Cursor left in text'
},
@@ -696,7 +687,6 @@
rangeOrSelection: new ve.Range( 2 ),
keys: [ 'RIGHT' ],
forceSelection: new ve.Range( 3 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 3 ),
msg: 'Cursor right in text'
},
@@ -705,7 +695,6 @@
rangeOrSelection: new ve.Range( 4 ),
keys: [ 'UP' ],
forceSelection: new ve.Range( 1 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 1 ),
msg: 'Cursor up in text'
},
@@ -714,7 +703,6 @@
rangeOrSelection: new ve.Range( 20 ),
keys: [ 'DOWN' ],
forceSelection: new ve.Range( 22 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 22 ),
msg: 'Cursor down in text'
},
@@ -724,7 +712,6 @@
rangeOrSelection: new ve.Range( 2 ),
keys: [ 'SHIFT+LEFT' ],
forceSelection: new ve.Range( 1 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 2, 1 ),
msg: 'Cursor left in text with shift'
},
@@ -733,7 +720,6 @@
rangeOrSelection: new ve.Range( 2 ),
keys: [ 'SHIFT+RIGHT' ],
forceSelection: new ve.Range( 3 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 2, 3 ),
msg: 'Cursor right in text with shift'
},
@@ -742,7 +728,6 @@
rangeOrSelection: new ve.Range( 4 ),
keys: [ 'SHIFT+UP' ],
forceSelection: new ve.Range( 1 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 4, 1 ),
msg: 'Cursor up in text with shift'
},
@@ -751,7 +736,6 @@
rangeOrSelection: new ve.Range( 20 ),
keys: [ 'SHIFT+DOWN' ],
forceSelection: new ve.Range( 22 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 20, 22
),
msg: 'Cursor down in text with shift'
},
@@ -760,7 +744,6 @@
htmlOrDoc: blockImageDoc,
rangeOrSelection: new ve.Range( 5, 18 ),
keys: [ 'LEFT' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 4 ),
msg: 'Cursor left off a block node'
},
@@ -768,7 +751,6 @@
htmlOrDoc: blockImageDoc,
rangeOrSelection: new ve.Range( 5, 18 ),
keys: [ 'UP' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 4 ),
msg: 'Cursor up off a block node'
},
@@ -776,7 +758,6 @@
htmlOrDoc: blockImageDoc,
rangeOrSelection: new ve.Range( 5, 18 ),
keys: [ 'RIGHT' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 19 ),
msg: 'Cursor right off a block node'
},
@@ -784,7 +765,6 @@
htmlOrDoc: blockImageDoc,
rangeOrSelection: new ve.Range( 5, 18 ),
keys: [ 'DOWN' ],
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 19 ),
msg: 'Cursor down off a block node'
},
@@ -796,7 +776,6 @@
rangeOrSelection: new ve.Range( 4 ),
keys: [ 'RIGHT' ],
forceSelection: new ve.Range( 8 ), // cursor
moves into the caption
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 5, 18 ),
msg: 'Cursor right onto a block node'
},
@@ -805,7 +784,6 @@
rangeOrSelection: new ve.Range( 19 ),
keys: [ 'LEFT' ],
forceSelection: new ve.Range( 17 ),
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 18, 5 ),
msg: 'Cursor left onto a block node'
},
@@ -814,7 +792,6 @@
rangeOrSelection: new ve.Range( 4 ),
keys: [ 'DOWN' ],
forceSelection: new ve.Range( 14 ), // cursor
moves into the caption
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 5, 18 ),
msg: 'Cursor down onto a block node'
},
@@ -823,13 +800,10 @@
rangeOrSelection: new ve.Range( 20 ),
keys: [ 'UP' ],
forceSelection: new ve.Range( 14 ), // cursor
moves into the caption
- expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 18, 5 ),
msg: 'Cursor up onto a block node'
}
];
-
- QUnit.expect( cases.length * 2 );
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
@@ -1022,8 +996,6 @@
}
];
- QUnit.expect( cases.length * 2 );
-
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
assert, cases[ i ].htmlOrDoc, cases[ i
].rangeOrSelection, cases[ i ].keys,
@@ -1188,8 +1160,6 @@
}
];
- QUnit.expect( cases.length * 3 );
-
function testRunner( prevHtml, prevRange,
prevFocusIsAfterAnnotationBoundary, nextHtml, nextRange, expectedOps,
expectedRangeOrSelection, expectsBreakpoint, msg ) {
var txs, i, ops,
delayed = [],
@@ -1291,8 +1261,6 @@
}
];
- QUnit.expect( cases.length );
-
for ( i = 0; i < cases.length; i++ ) {
fragment.select();
view.handleDataTransfer( cases[ i ].dataTransfer, cases[ i
].isPaste );
@@ -1313,7 +1281,6 @@
QUnit.test( 'onCopy', function ( assert ) {
var i,
- count = 0,
cases = [
{
rangeOrSelection: new ve.Range( 27, 32 ),
@@ -1356,21 +1323,6 @@
msg: 'Plain text of entire document'
}
];
-
- for ( i = 0; i < cases.length; i++ ) {
- count += 3;
- if ( cases[ i ].expectedData ) {
- count++;
- }
- if ( cases[ i ].expectedHtml ) {
- count++;
- }
- if ( cases[ i ].expectedText ) {
- count++;
- }
- }
-
- QUnit.expect( count );
function testRunner( doc, rangeOrSelection, expectedData,
expectedOriginalRange, expectedBalancedRange, expectedHtml, expectedText, msg )
{
var slice,
@@ -1417,7 +1369,6 @@
QUnit.test( 'beforePaste/afterPaste', function ( assert ) {
var i,
- expected = 0,
exampleDoc = '<p id="foo"></p><p>Foo</p><h2> Baz
</h2><table><tbody><tr><td></td></tbody></table><p><b>Quux</b></p>',
exampleSurface = ve.test.utils.createSurfaceViewFromHtml(
exampleDoc ),
docLen = 30,
@@ -2739,19 +2690,6 @@
];
for ( i = 0; i < cases.length; i++ ) {
- if ( cases[ i ].expectedOps ) {
- expected++;
- }
- if ( cases[ i ].expectedRangeOrSelection ) {
- expected++;
- }
- if ( cases[ i ].expectedHtml ) {
- expected++;
- }
- }
- QUnit.expect( expected );
-
- for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfacePasteTest(
assert, cases[ i ].documentHtml || exampleSurface,
cases[ i ].pasteHtml, cases[ i
].internalSourceRangeOrSelection, cases[ i ].fromVe, cases[ i
].useClipboardData,
@@ -2894,8 +2832,6 @@
}
];
- QUnit.expect( cases.length );
-
for ( i = 0; i < cases.length; i++ ) {
offsets = cases[ i ].selectionOffsets;
table = tables[ cases[ i ].table || 'mergedCells' ];
@@ -2964,8 +2900,6 @@
}
];
- QUnit.expect( cases.length * 3 );
-
function testRunner( rangeOrSelection, targetOffset, expectedTransfer,
expectedData, expectedSelection, isIE, msg ) {
var view = ve.test.utils.createSurfaceViewFromDocument(
ve.dm.example.createExampleDocument() ),
model = view.getModel(),
@@ -3026,7 +2960,6 @@
QUnit.test( 'getSelectionState', function ( assert ) {
var i, j, l, view, selection, internalListNode, node, rootElement,
- expect = 0,
cases = [
{
msg: 'Grouped aliens',
@@ -3067,12 +3000,6 @@
expected: ve.dm.example.offsetPaths
}
];
-
- for ( i = 0; i < cases.length; i++ ) {
- expect += cases[ i ].expected.length;
- }
-
- QUnit.expect( expect );
for ( i = 0; i < cases.length; i++ ) {
view = ve.test.utils.createSurfaceViewFromHtml( cases[ i ].html
);
--
To view, visit https://gerrit.wikimedia.org/r/320086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb3eaf215a0512ba541fdea18e572a2ce34ddf73
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
