opendev/gerrit
Code Issues Proposed changes
b40933b368
gerrit/polygerrit-ui/app/elements/diff/gr-new-diff/gr-diff-builder_test.html

346 lines
12 KiB
HTML
Raw Normal View History

Scaffolding for refactored diff view + This will eventually supplant gr-diff and gr-diff-side with a simpler implementation once it reaches feature parity. Change-Id: Ib0e5279daa8e61d79f8c2099613b80ef26d639f4
2016-03-13 21:23:11 -04:00
<!DOCTYPE html>
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>gr-diff-builder</title>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
<script src="gr-diff-line.js"></script>
<script src="gr-diff-group.js"></script>
<script src="gr-diff-builder.js"></script>
<script>
suite('gr-diff-builder tests', function() {
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
var builder;
setup(function() {
var prefs = {
line_length: 10,
show_tabs: true,
tab_size: 4,
};
builder = new GrDiffBuilder({content: []}, {left: [], right: []}, prefs);
});
Scaffolding for refactored diff view + This will eventually supplant gr-diff and gr-diff-side with a simpler implementation once it reaches feature parity. Change-Id: Ib0e5279daa8e61d79f8c2099613b80ef26d639f4
2016-03-13 21:23:11 -04:00
test('process loaded content', function() {
var content = [
{
ab: [
'<!DOCTYPE html>',
'<meta charset="utf-8">',
]
},
{
a: [
' Welcome ',
' to the wooorld of tomorrow!',
],
b: [
' Hello, world!',
],
},
{
ab: [
'Leela: This is the only place the ship can’t hear us, so ',
'everyone pretend to shower.',
'Fry: Same as every day. Got it.',
]
},
];
var groups = [];
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
builder._processContent(content, groups, -1);
Scaffolding for refactored diff view + This will eventually supplant gr-diff and gr-diff-side with a simpler implementation once it reaches feature parity. Change-Id: Ib0e5279daa8e61d79f8c2099613b80ef26d639f4
2016-03-13 21:23:11 -04:00
assert.equal(groups.length, 3);
var group = groups[0];
assert.equal(group.type, GrDiffGroup.Type.BOTH);
assert.equal(group.lines.length, 2);
assert.equal(group.lines.length, 2);
function beforeNumberFn(l) { return l.beforeNumber; }
function afterNumberFn(l) { return l.afterNumber; }
function textFn(l) { return l.text; }
assert.deepEqual(group.lines.map(beforeNumberFn), [1, 2]);
assert.deepEqual(group.lines.map(afterNumberFn), [1, 2]);
assert.deepEqual(group.lines.map(textFn), [
'<!DOCTYPE html>',
'<meta charset="utf-8">',
]);
group = groups[1];
assert.equal(group.type, GrDiffGroup.Type.DELTA);
assert.equal(group.lines.length, 3);
assert.equal(group.adds.length, 1);
assert.equal(group.removes.length, 2);
assert.deepEqual(group.removes.map(beforeNumberFn), [3, 4]);
assert.deepEqual(group.adds.map(afterNumberFn), [3]);
assert.deepEqual(group.removes.map(textFn), [
' Welcome ',
' to the wooorld of tomorrow!',
]);
assert.deepEqual(group.adds.map(textFn), [
' Hello, world!',
]);
group = groups[2];
assert.equal(group.type, GrDiffGroup.Type.BOTH);
assert.equal(group.lines.length, 3);
assert.deepEqual(group.lines.map(beforeNumberFn), [5, 6, 7]);
assert.deepEqual(group.lines.map(afterNumberFn), [4, 5, 6]);
assert.deepEqual(group.lines.map(textFn), [
'Leela: This is the only place the ship can’t hear us, so ',
'everyone pretend to shower.',
'Fry: Same as every day. Got it.',
]);
});
Add context controls to gr-new-diff + This only covers collapsing context according to the diff preferences. Clicking on the control does nothing in this change. Change-Id: I82e07d1ba55630351b1f79db5f44ff81e2fafecd
2016-03-15 18:58:46 -04:00
test('insert context groups', function() {
var content = [
{ab: []},
{a: ['all work and no play make andybons a dull boy']},
{ab: []},
{b: ['elgoog elgoog elgoog']},
{ab: []},
];
for (var i = 0; i < 100; i++) {
content[0].ab.push('all work and no play make jack a dull boy');
content[4].ab.push('all work and no play make jill a dull girl');
}
for (var i = 0; i < 5; i++) {
content[2].ab.push('no tv and no beer make homer go crazy');
}
var groups = [];
var context = 10;
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
builder._processContent(content, groups, context);
Add context controls to gr-new-diff + This only covers collapsing context according to the diff preferences. Clicking on the control does nothing in this change. Change-Id: I82e07d1ba55630351b1f79db5f44ff81e2fafecd
2016-03-15 18:58:46 -04:00
assert.equal(groups[0].type, GrDiffGroup.Type.CONTEXT_CONTROL);
assert.equal(groups[0].lines[0].contextLines.length, 90);
groups[0].lines[0].contextLines.forEach(function(l) {
assert.equal(l.text, content[0].ab[0]);
});
assert.equal(groups[1].type, GrDiffGroup.Type.BOTH);
assert.equal(groups[1].lines.length, context);
groups[1].lines.forEach(function(l) {
assert.equal(l.text, content[0].ab[0]);
});
assert.equal(groups[2].type, GrDiffGroup.Type.DELTA);
assert.equal(groups[2].lines.length, 1);
assert.equal(groups[2].removes.length, 1);
assert.equal(groups[2].removes[0].text,
'all work and no play make andybons a dull boy');
assert.equal(groups[3].type, GrDiffGroup.Type.BOTH);
assert.equal(groups[3].lines.length, 5);
groups[3].lines.forEach(function(l) {
assert.equal(l.text, content[2].ab[0]);
});
assert.equal(groups[4].type, GrDiffGroup.Type.DELTA);
assert.equal(groups[4].lines.length, 1);
assert.equal(groups[4].adds.length, 1);
assert.equal(groups[4].adds[0].text, 'elgoog elgoog elgoog');
assert.equal(groups[5].type, GrDiffGroup.Type.BOTH);
assert.equal(groups[5].lines.length, context);
groups[5].lines.forEach(function(l) {
assert.equal(l.text, content[4].ab[0]);
});
assert.equal(groups[6].type, GrDiffGroup.Type.CONTEXT_CONTROL);
assert.equal(groups[6].lines[0].contextLines.length, 90);
groups[6].lines[0].contextLines.forEach(function(l) {
assert.equal(l.text, content[4].ab[0]);
});
content = [
{a: ['all work and no play make andybons a dull boy']},
{ab: []},
{b: ['elgoog elgoog elgoog']},
];
for (var i = 0; i < 50; i++) {
content[1].ab.push('no tv and no beer make homer go crazy');
}
groups = [];
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
builder._processContent(content, groups, 10);
Add context controls to gr-new-diff + This only covers collapsing context according to the diff preferences. Clicking on the control does nothing in this change. Change-Id: I82e07d1ba55630351b1f79db5f44ff81e2fafecd
2016-03-15 18:58:46 -04:00
assert.equal(groups[0].type, GrDiffGroup.Type.DELTA);
assert.equal(groups[0].lines.length, 1);
assert.equal(groups[0].removes.length, 1);
assert.equal(groups[0].removes[0].text,
'all work and no play make andybons a dull boy');
assert.equal(groups[1].type, GrDiffGroup.Type.BOTH);
assert.equal(groups[1].lines.length, context);
groups[1].lines.forEach(function(l) {
assert.equal(l.text, content[1].ab[0]);
});
assert.equal(groups[2].type, GrDiffGroup.Type.CONTEXT_CONTROL);
assert.equal(groups[2].lines[0].contextLines.length, 30);
groups[2].lines[0].contextLines.forEach(function(l) {
assert.equal(l.text, content[1].ab[0]);
});
assert.equal(groups[3].type, GrDiffGroup.Type.BOTH);
assert.equal(groups[3].lines.length, context);
groups[3].lines.forEach(function(l) {
assert.equal(l.text, content[1].ab[0]);
});
assert.equal(groups[4].type, GrDiffGroup.Type.DELTA);
assert.equal(groups[4].lines.length, 1);
assert.equal(groups[4].adds.length, 1);
assert.equal(groups[4].adds[0].text, 'elgoog elgoog elgoog');
});
Add newline and tab wrappers to gr-new-diff Change-Id: I9286f9cf276f111b314b95631e0f57081f5b3ac9
2016-03-17 14:39:42 -04:00
test('newlines', function() {
var text = 'abcdef';
assert.equal(builder._addNewlines(text, text), text);
text = 'a'.repeat(20);
assert.equal(builder._addNewlines(text, text),
'a'.repeat(10) +
GrDiffBuilder.LINE_FEED_HTML +
'a'.repeat(10));
text = '<span class="thumbsup">👍</span>';
var html = '&lt;span class=&quot;thumbsup&quot;&gt;👍&lt;&#x2F;span&gt;';
assert.equal(builder._addNewlines(text, html),
'&lt;span clas' +
GrDiffBuilder.LINE_FEED_HTML +
's=&quot;thumbsu' +
GrDiffBuilder.LINE_FEED_HTML +
'p&quot;&gt;👍&lt;&#x2F;spa' +
GrDiffBuilder.LINE_FEED_HTML +
'n&gt;');
text = '01234\t56789';
assert.equal(builder._addNewlines(text, text),
'01234\t5' +
GrDiffBuilder.LINE_FEED_HTML +
'6789');
});
test('tab wrapper insertion', function() {
var html = 'abc\tdef';
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
var wrapper = builder._getTabWrapper(
builder._prefs.tab_size,
builder._prefs.show_tabs);
Fix tab indicators within gr-new-diff The tab wrapper function was not returning the string it was creating.... -_______- Change-Id: I11de6ebb95ab888ce844efc47591f7f53c92e384
2016-03-18 16:06:37 -04:00
assert.ok(wrapper);
assert.isAbove(wrapper.length, 0);
Add newline and tab wrappers to gr-new-diff Change-Id: I9286f9cf276f111b314b95631e0f57081f5b3ac9
2016-03-17 14:39:42 -04:00
assert.equal(builder._addTabWrappers(html), 'abc' + wrapper + 'def');
assert.throws(builder._getTabWrapper.bind(
builder,
'"><img src="/" onerror="alert(1);"><span class="',
true));
});
Add comments/drafts to gr-new-diff Change-Id: I8110b521ab83a31be5db7e3d65268186485db04d
2016-03-20 14:14:20 -04:00
test('comments', function() {
var line = new GrDiffLine(GrDiffLine.Type.BOTH);
line.beforeNumber = 3;
line.afterNumber = 5;
var comments = {left: [], right:[]};
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
assert.deepEqual(builder._getCommentsForLine(comments, line), []);
assert.deepEqual(builder._getCommentsForLine(comments, line,
GrDiffBuilder.Side.LEFT), []);
assert.deepEqual(builder._getCommentsForLine(comments, line,
GrDiffBuilder.Side.RIGHT), []);
Add comments/drafts to gr-new-diff Change-Id: I8110b521ab83a31be5db7e3d65268186485db04d
2016-03-20 14:14:20 -04:00
comments = {
left: [
{id: 'l3', line: 3},
{id: 'l5', line: 5},
],
right: [
{id: 'r3', line: 3},
{id: 'r5', line: 5},
],
};
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
assert.deepEqual(builder._getCommentsForLine(comments, line),
Add comments/drafts to gr-new-diff Change-Id: I8110b521ab83a31be5db7e3d65268186485db04d
2016-03-20 14:14:20 -04:00
[{id: 'l3', line: 3}, {id: 'r5', line: 5}]);
Show comments outside of current context in gr-new-diff Change-Id: Icfc4f282624c88acb71157cf3f849e0a7f8e9e48
2016-03-22 16:34:03 -04:00
assert.deepEqual(builder._getCommentsForLine(comments, line,
GrDiffBuilder.Side.LEFT), [{id: 'l3', line: 3}]);
assert.deepEqual(builder._getCommentsForLine(comments, line,
GrDiffBuilder.Side.RIGHT), [{id: 'r5', line: 5}]);
});
test('break up common diff chunks', function() {
builder._commentLocations = {
left: {1: true},
right: {10: true},
};
var lineNums = {
left: 0,
right: 0,
};
var content = [
{
ab: [
'Copyright (C) 2015 The Android Open Source Project',
'',
'Licensed under the Apache License, Version 2.0 (the "License");',
'you may not use this file except in compliance with the License.',
'You may obtain a copy of the License at',
'',
'http://www.apache.org/licenses/LICENSE-2.0',
'',
'Unless required by applicable law or agreed to in writing, ',
'software distributed under the License is distributed on an ',
'"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, ',
'either express or implied. See the License for the specific ',
'language governing permissions and limitations under the License.',
]
}
];
var result = builder._splitCommonGroupsWithComments(content, lineNums);
assert.deepEqual(result, [
{
ab: ['Copyright (C) 2015 The Android Open Source Project'],
},
{
ab: [
'',
'Licensed under the Apache License, Version 2.0 (the "License");',
'you may not use this file except in compliance with the License.',
'You may obtain a copy of the License at',
'',
'http://www.apache.org/licenses/LICENSE-2.0',
'',
'Unless required by applicable law or agreed to in writing, ',
]
},
{
ab: ['software distributed under the License is distributed on an '],
},
{
ab: [
'"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, ',
'either express or implied. See the License for the specific ',
'language governing permissions and limitations under the License.',
]
}
]);
Add comments/drafts to gr-new-diff Change-Id: I8110b521ab83a31be5db7e3d65268186485db04d
2016-03-20 14:14:20 -04:00
});
Scaffolding for refactored diff view + This will eventually supplant gr-diff and gr-diff-side with a simpler implementation once it reaches feature parity. Change-Id: Ib0e5279daa8e61d79f8c2099613b80ef26d639f4
2016-03-13 21:23:11 -04:00
});
</script>
Copy Permalink