4f10d777d9
As of M80(chrome version >= 80), chrome removed the native htmlImports support, tho we have the polyfill from webcomponents, the loading of html changed from sync to async which cause a lot test to fail in M80. The fix is introducing a util method `readyToTest` which wait until htmlImports finished before running any tests. Updated some tests to have only one top suite per test so we only need one `readyToTest` and also multiple `readyToTest` actually affect tests' stub functionality. Tested locally with `npm run test` on all passed tests and also with manual failure to make sure the updated tests can still catch any errors if have. Bug: Issue 12294 Change-Id: Ib0c464f8ff9f36a401e6c3b249e6bb6d68ee6e2f
212 lines
7.7 KiB
HTML
212 lines
7.7 KiB
HTML
<!DOCTYPE html>
|
|
<!--
|
|
@license
|
|
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-group</title>
|
|
|
|
<script src="/bower_components/webcomponentsjs/custom-elements-es5-adapter.js"></script>
|
|
|
|
<script src="/bower_components/web-component-tester/browser.js"></script>
|
|
<script src="../../../test/test-pre-setup.js"></script>
|
|
<link rel="import" href="../../../test/common-test-setup.html"/>
|
|
<script src="gr-diff-line.js"></script>
|
|
<script src="gr-diff-group.js"></script>
|
|
|
|
<script>
|
|
suite('gr-diff-group tests', async () => {
|
|
await readyToTest();
|
|
test('delta line pairs', () => {
|
|
let group = new GrDiffGroup(GrDiffGroup.Type.DELTA);
|
|
const l1 = new GrDiffLine(GrDiffLine.Type.ADD, 0, 128);
|
|
const l2 = new GrDiffLine(GrDiffLine.Type.ADD, 0, 129);
|
|
const l3 = new GrDiffLine(GrDiffLine.Type.REMOVE, 64, 0);
|
|
group.addLine(l1);
|
|
group.addLine(l2);
|
|
group.addLine(l3);
|
|
assert.deepEqual(group.lines, [l1, l2, l3]);
|
|
assert.deepEqual(group.adds, [l1, l2]);
|
|
assert.deepEqual(group.removes, [l3]);
|
|
assert.deepEqual(group.lineRange, {
|
|
left: {start: 64, end: 64},
|
|
right: {start: 128, end: 129},
|
|
});
|
|
|
|
let pairs = group.getSideBySidePairs();
|
|
assert.deepEqual(pairs, [
|
|
{left: l3, right: l1},
|
|
{left: GrDiffLine.BLANK_LINE, right: l2},
|
|
]);
|
|
|
|
group = new GrDiffGroup(GrDiffGroup.Type.DELTA, [l1, l2, l3]);
|
|
assert.deepEqual(group.lines, [l1, l2, l3]);
|
|
assert.deepEqual(group.adds, [l1, l2]);
|
|
assert.deepEqual(group.removes, [l3]);
|
|
|
|
pairs = group.getSideBySidePairs();
|
|
assert.deepEqual(pairs, [
|
|
{left: l3, right: l1},
|
|
{left: GrDiffLine.BLANK_LINE, right: l2},
|
|
]);
|
|
});
|
|
|
|
test('group/header line pairs', () => {
|
|
const l1 = new GrDiffLine(GrDiffLine.Type.BOTH, 64, 128);
|
|
const l2 = new GrDiffLine(GrDiffLine.Type.BOTH, 65, 129);
|
|
const l3 = new GrDiffLine(GrDiffLine.Type.BOTH, 66, 130);
|
|
|
|
let group = new GrDiffGroup(GrDiffGroup.Type.BOTH, [l1, l2, l3]);
|
|
|
|
assert.deepEqual(group.lines, [l1, l2, l3]);
|
|
assert.deepEqual(group.adds, []);
|
|
assert.deepEqual(group.removes, []);
|
|
|
|
assert.deepEqual(group.lineRange, {
|
|
left: {start: 64, end: 66},
|
|
right: {start: 128, end: 130},
|
|
});
|
|
|
|
let pairs = group.getSideBySidePairs();
|
|
assert.deepEqual(pairs, [
|
|
{left: l1, right: l1},
|
|
{left: l2, right: l2},
|
|
{left: l3, right: l3},
|
|
]);
|
|
|
|
group = new GrDiffGroup(GrDiffGroup.Type.CONTEXT_CONTROL, [l1, l2, l3]);
|
|
assert.deepEqual(group.lines, [l1, l2, l3]);
|
|
assert.deepEqual(group.adds, []);
|
|
assert.deepEqual(group.removes, []);
|
|
|
|
pairs = group.getSideBySidePairs();
|
|
assert.deepEqual(pairs, [
|
|
{left: l1, right: l1},
|
|
{left: l2, right: l2},
|
|
{left: l3, right: l3},
|
|
]);
|
|
});
|
|
|
|
test('adding delta lines to non-delta group', () => {
|
|
const l1 = new GrDiffLine(GrDiffLine.Type.ADD);
|
|
const l2 = new GrDiffLine(GrDiffLine.Type.REMOVE);
|
|
const l3 = new GrDiffLine(GrDiffLine.Type.BOTH);
|
|
|
|
let group = new GrDiffGroup(GrDiffGroup.Type.BOTH);
|
|
assert.throws(group.addLine.bind(group, l1));
|
|
assert.throws(group.addLine.bind(group, l2));
|
|
assert.doesNotThrow(group.addLine.bind(group, l3));
|
|
|
|
group = new GrDiffGroup(GrDiffGroup.Type.CONTEXT_CONTROL);
|
|
assert.throws(group.addLine.bind(group, l1));
|
|
assert.throws(group.addLine.bind(group, l2));
|
|
assert.doesNotThrow(group.addLine.bind(group, l3));
|
|
});
|
|
|
|
suite('hideInContextControl', () => {
|
|
let groups;
|
|
setup(() => {
|
|
groups = [
|
|
new GrDiffGroup(GrDiffGroup.Type.BOTH, [
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 5, 7),
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 6, 8),
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 7, 9),
|
|
]),
|
|
new GrDiffGroup(GrDiffGroup.Type.DELTA, [
|
|
new GrDiffLine(GrDiffLine.Type.REMOVE, 8),
|
|
new GrDiffLine(GrDiffLine.Type.ADD, 0, 10),
|
|
new GrDiffLine(GrDiffLine.Type.REMOVE, 9),
|
|
new GrDiffLine(GrDiffLine.Type.ADD, 0, 11),
|
|
new GrDiffLine(GrDiffLine.Type.REMOVE, 10),
|
|
new GrDiffLine(GrDiffLine.Type.ADD, 0, 12),
|
|
]),
|
|
new GrDiffGroup(GrDiffGroup.Type.BOTH, [
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 11, 13),
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 12, 14),
|
|
new GrDiffLine(GrDiffLine.Type.BOTH, 13, 15),
|
|
]),
|
|
];
|
|
});
|
|
|
|
test('hides hidden groups in context control', () => {
|
|
const collapsedGroups = GrDiffGroup.hideInContextControl(groups, 3, 6);
|
|
assert.equal(collapsedGroups.length, 3);
|
|
|
|
assert.equal(collapsedGroups[0], groups[0]);
|
|
|
|
assert.equal(collapsedGroups[1].type, GrDiffGroup.Type.CONTEXT_CONTROL);
|
|
assert.equal(collapsedGroups[1].lines.length, 1);
|
|
assert.equal(
|
|
collapsedGroups[1].lines[0].type, GrDiffLine.Type.CONTEXT_CONTROL);
|
|
assert.equal(
|
|
collapsedGroups[1].lines[0].contextGroups.length, 1);
|
|
assert.equal(
|
|
collapsedGroups[1].lines[0].contextGroups[0], groups[1]);
|
|
|
|
assert.equal(collapsedGroups[2], groups[2]);
|
|
});
|
|
|
|
test('splits partially hidden groups', () => {
|
|
const collapsedGroups = GrDiffGroup.hideInContextControl(groups, 4, 7);
|
|
assert.equal(collapsedGroups.length, 4);
|
|
assert.equal(collapsedGroups[0], groups[0]);
|
|
|
|
assert.equal(collapsedGroups[1].type, GrDiffGroup.Type.DELTA);
|
|
assert.deepEqual(collapsedGroups[1].adds, [groups[1].adds[0]]);
|
|
assert.deepEqual(collapsedGroups[1].removes, [groups[1].removes[0]]);
|
|
|
|
assert.equal(collapsedGroups[2].type, GrDiffGroup.Type.CONTEXT_CONTROL);
|
|
assert.equal(collapsedGroups[2].lines.length, 1);
|
|
assert.equal(
|
|
collapsedGroups[2].lines[0].type, GrDiffLine.Type.CONTEXT_CONTROL);
|
|
assert.equal(
|
|
collapsedGroups[2].lines[0].contextGroups.length, 2);
|
|
|
|
assert.equal(
|
|
collapsedGroups[2].lines[0].contextGroups[0].type,
|
|
GrDiffGroup.Type.DELTA);
|
|
assert.deepEqual(
|
|
collapsedGroups[2].lines[0].contextGroups[0].adds,
|
|
groups[1].adds.slice(1));
|
|
assert.deepEqual(
|
|
collapsedGroups[2].lines[0].contextGroups[0].removes,
|
|
groups[1].removes.slice(1));
|
|
|
|
assert.equal(
|
|
collapsedGroups[2].lines[0].contextGroups[1].type,
|
|
GrDiffGroup.Type.BOTH);
|
|
assert.deepEqual(
|
|
collapsedGroups[2].lines[0].contextGroups[1].lines,
|
|
[groups[2].lines[0]]);
|
|
|
|
assert.equal(collapsedGroups[3].type, GrDiffGroup.Type.BOTH);
|
|
assert.deepEqual(collapsedGroups[3].lines, groups[2].lines.slice(1));
|
|
});
|
|
|
|
test('groups unchanged if the hidden range is empty', () => {
|
|
assert.deepEqual(
|
|
GrDiffGroup.hideInContextControl(groups, 0, 0), groups);
|
|
});
|
|
|
|
test('groups unchanged if there is only 1 line to hide', () => {
|
|
assert.deepEqual(
|
|
GrDiffGroup.hideInContextControl(groups, 3, 4), groups);
|
|
});
|
|
});
|
|
});
|
|
|
|
</script>
|