opendev/gerrit
Code Issues Proposed changes

Merge "Organizes gr-annotation tests and fixes splitTextNode bug"

Browse Source
This commit is contained in:
Andrew Bonventre
2016-07-13 23:09:30 +00:00
committed by Gerrit Code Review
parent 4ec63575c7 3d2e13c21b
commit 41d6894fee
4 changed files with 199 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation.js
View File

@@ -164,11 +164,15 @@
// TODO (viktard): Polyfill Array.from for IE10.
var head = Array.from(node.textContent);
var tail = head.splice(offset);
var parent = node.parentElement;
var headNode = document.createTextNode(head.join(''));
parent.replaceChild(headNode, node);
var parent = node.parentNode;
// Split the content of the original node.
node.textContent = head.join('');
var tailNode = document.createTextNode(tail.join(''));
parent.insertBefore(tailNode, headNode.nextSibling);
if (parent) {
parent.insertBefore(tailNode, node.nextSibling);
}
return tailNode;
} else {
return node.splitText(offset);

190
polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-annotation_test.html Normal file
View File

@@ -0,0 +1,190 @@
<!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-annotation</title>
<script src="../../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
<script src="gr-annotation.js"></script>
<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
<test-fixture id="basic">
<template>
<div>Lorem ipsum dolor sit amet, suspendisse inceptos vehicula</div>
</template>
</test-fixture>
<script>
suite('annotation', function() {
var str;
var parent;
var textNode;
setup(function() {
parent = fixture('basic');
textNode = parent.childNodes[0];
str = textNode.textContent;
});
test('_annotateText Case 1', function() {
GrAnnotation._annotateText(textNode, 0, str.length, 'foobar');
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], HTMLElement);
assert.equal(parent.childNodes[0].className, 'foobar');
assert.instanceOf(parent.childNodes[0].childNodes[0], Text);
assert.equal(parent.childNodes[0].childNodes[0].textContent, str);
});
test('_annotateText Case 2', function() {
var length = 12;
var substr = str.substr(0, length);
var remainder = str.substr(length);
GrAnnotation._annotateText(textNode, 0, length, 'foobar');
assert.equal(parent.childNodes.length, 2);
assert.instanceOf(parent.childNodes[0], HTMLElement);
assert.equal(parent.childNodes[0].className, 'foobar');
assert.instanceOf(parent.childNodes[0].childNodes[0], Text);
assert.equal(parent.childNodes[0].childNodes[0].textContent, substr);
assert.instanceOf(parent.childNodes[1], Text);
assert.equal(parent.childNodes[1].textContent, remainder);
});
test('_annotateText Case 3', function() {
var index = 12;
var length = str.length - index;
var remainder = str.substr(0, index);
var substr = str.substr(index);
GrAnnotation._annotateText(textNode, index, length, 'foobar');
assert.equal(parent.childNodes.length, 2);
assert.instanceOf(parent.childNodes[0], Text);
assert.equal(parent.childNodes[0].textContent, remainder);
assert.instanceOf(parent.childNodes[1], HTMLElement);
assert.equal(parent.childNodes[1].className, 'foobar');
assert.instanceOf(parent.childNodes[1].childNodes[0], Text);
assert.equal(parent.childNodes[1].childNodes[0].textContent, substr);
});
test('_annotateText Case 4', function() {
var index = str.indexOf('dolor');
var length = 'dolor '.length;
var remainderPre = str.substr(0, index);
var substr = str.substr(index, length);
var remainderPost = str.substr(index + length);
GrAnnotation._annotateText(textNode, index, length, 'foobar');
assert.equal(parent.childNodes.length, 3);
assert.instanceOf(parent.childNodes[0], Text);
assert.equal(parent.childNodes[0].textContent, remainderPre);
assert.instanceOf(parent.childNodes[1], HTMLElement);
assert.equal(parent.childNodes[1].className, 'foobar');
assert.instanceOf(parent.childNodes[1].childNodes[0], Text);
assert.equal(parent.childNodes[1].childNodes[0].textContent, substr);
assert.instanceOf(parent.childNodes[2], Text);
assert.equal(parent.childNodes[2].textContent, remainderPost);
});
test('_annotateElement design doc example', function() {
var layers = [
'amet, ',
'inceptos ',
'amet, ',
'et, suspendisse ince'
];
// Apply the layers successively.
layers.forEach(function(layer, i) {
GrAnnotation.annotateElement(
parent, str.indexOf(layer), layer.length, 'layer-' + (i + 1));
});
assert.equal(parent.textContent, str);
// Layer 1:
var layer1 = parent.querySelectorAll('.layer-1');
assert.equal(layer1.length, 1);
assert.equal(layer1[0].textContent, layers[0]);
assert.equal(layer1[0].parentElement, parent);
// Layer 2:
var layer2 = parent.querySelectorAll('.layer-2');
assert.equal(layer2.length, 1);
assert.equal(layer2[0].textContent, layers[1]);
assert.equal(layer2[0].parentElement, parent);
// Layer 3:
var layer3 = parent.querySelectorAll('.layer-3');
assert.equal(layer3.length, 1);
assert.equal(layer3[0].textContent, layers[2]);
assert.equal(layer3[0].parentElement, layer1[0]);
// Layer 4:
var layer4 = parent.querySelectorAll('.layer-4');
assert.equal(layer4.length, 3);
assert.equal(layer4[0].textContent, 'et, ');
assert.equal(layer4[0].parentElement, layer3[0]);
assert.equal(layer4[1].textContent, 'suspendisse ');
assert.equal(layer4[1].parentElement, parent);
assert.equal(layer4[2].textContent, 'ince');
assert.equal(layer4[2].parentElement, layer2[0]);
assert.equal(layer4[0].textContent +
layer4[1].textContent +
layer4[2].textContent,
layers[3]);
});
test('splitTextNode', function() {
var helloString = 'hello';
var asciiString = 'ASCII';
var unicodeString = 'Unic💢de';
var node;
var tail;
// Non-unicode path:
node = document.createTextNode(helloString + asciiString);
tail = GrAnnotation.splitTextNode(node, helloString.length);
assert(node.textContent, helloString);
assert(tail.textContent, asciiString);
// Unicdoe path:
node = document.createTextNode(helloString + unicodeString);
tail = GrAnnotation.splitTextNode(node, helloString.length);
assert(node.textContent, helloString);
assert(tail.textContent, unicodeString);
});
});
</script>

154
polygerrit-ui/app/elements/diff/gr-diff-highlight/gr-diff-highlight_test.html
View File

@@ -20,7 +20,6 @@ limitations under the License.
<script src="../../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
<script src="gr-annotation.js"></script>
<link rel="import" href="../../../bower_components/iron-test-helpers/iron-test-helpers.html">
<link rel="import" href="gr-diff-highlight.html">
@@ -892,159 +891,6 @@ limitations under the License.
assert.equal(getActionSide(), 'left');
});
suite('annotation', function() {
var str;
var parent;
var textNode;
setup(function() {
str = 'Lorem ipsum dolor sit amet, suspendisse inceptos vehicula';
parent = document.createElement('div');
parent.appendChild(document.createTextNode(str));
textNode = parent.childNodes[0];
});
test('library is loaded', function() {
assert.isOk(GrAnnotation);
});
test('_annotateText Case 1', function() {
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], Text);
GrAnnotation._annotateText(textNode, 0, str.length, 'foobar');
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], HTMLElement);
assert.equal(parent.childNodes[0].className, 'foobar');
assert.instanceOf(parent.childNodes[0].childNodes[0], Text);
assert.equal(parent.childNodes[0].childNodes[0].textContent, str);
});
test('_annotateText Case 2', function() {
var length = 12;
var substr = str.substr(0, length);
var remainder = str.substr(length);
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], Text);
GrAnnotation._annotateText(textNode, 0, length, 'foobar');
assert.equal(parent.childNodes.length, 2);
assert.instanceOf(parent.childNodes[0], HTMLElement);
assert.equal(parent.childNodes[0].className, 'foobar');
assert.instanceOf(parent.childNodes[0].childNodes[0], Text);
assert.equal(parent.childNodes[0].childNodes[0].textContent, substr);
assert.instanceOf(parent.childNodes[1], Text);
assert.equal(parent.childNodes[1].textContent, remainder);
});
test('_annotateText Case 3', function() {
var index = 12;
var length = str.length - index;
var remainder = str.substr(0, index);
var substr = str.substr(index);
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], Text);
GrAnnotation._annotateText(textNode, index, length, 'foobar');
assert.equal(parent.childNodes.length, 2);
assert.instanceOf(parent.childNodes[0], Text);
assert.equal(parent.childNodes[0].textContent, remainder);
assert.instanceOf(parent.childNodes[1], HTMLElement);
assert.equal(parent.childNodes[1].className, 'foobar');
assert.instanceOf(parent.childNodes[1].childNodes[0], Text);
assert.equal(parent.childNodes[1].childNodes[0].textContent, substr);
});
test('_annotateText Case 4', function() {
var index = str.indexOf('dolor');
var length = 'dolor '.length;
var remainderPre = str.substr(0, index);
var substr = str.substr(index, length);
var remainderPost = str.substr(index + length);
assert.equal(parent.childNodes.length, 1);
assert.instanceOf(parent.childNodes[0], Text);
GrAnnotation._annotateText(textNode, index, length, 'foobar');
assert.equal(parent.childNodes.length, 3);
assert.instanceOf(parent.childNodes[0], Text);
assert.equal(parent.childNodes[0].textContent, remainderPre);
assert.instanceOf(parent.childNodes[1], HTMLElement);
assert.equal(parent.childNodes[1].className, 'foobar');
assert.instanceOf(parent.childNodes[1].childNodes[0], Text);
assert.equal(parent.childNodes[1].childNodes[0].textContent, substr);
assert.instanceOf(parent.childNodes[2], Text);
assert.equal(parent.childNodes[2].textContent, remainderPost);
});
test('_annotateElement design doc example', function() {
var layers = [
'amet, ',
'inceptos ',
'amet, ',
'et, suspendisse ince'
];
// Apply the layers successively.
layers.forEach(function(layer, i) {
GrAnnotation.annotateElement(
parent, str.indexOf(layer), layer.length, 'layer-' + (i + 1));
});
assert.equal(parent.textContent, str);
// Layer 1:
var layer1 = parent.querySelectorAll('.layer-1');
assert.equal(layer1.length, 1);
assert.equal(layer1[0].textContent, layers[0]);
assert.equal(layer1[0].parentElement, parent);
// Layer 2:
var layer2 = parent.querySelectorAll('.layer-2');
assert.equal(layer2.length, 1);
assert.equal(layer2[0].textContent, layers[1]);
assert.equal(layer2[0].parentElement, parent);
// Layer 3:
var layer3 = parent.querySelectorAll('.layer-3');
assert.equal(layer3.length, 1);
assert.equal(layer3[0].textContent, layers[2]);
assert.equal(layer3[0].parentElement, layer1[0]);
// Layer 4:
var layer4 = parent.querySelectorAll('.layer-4');
assert.equal(layer4.length, 3);
assert.equal(layer4[0].textContent, 'et, ');
assert.equal(layer4[0].parentElement, layer3[0]);
assert.equal(layer4[1].textContent, 'suspendisse ');
assert.equal(layer4[1].parentElement, parent);
assert.equal(layer4[2].textContent, 'ince');
assert.equal(layer4[2].parentElement, layer2[0]);
assert.equal(layer4[0].textContent +
layer4[1].textContent +
layer4[2].textContent,
layers[3]);
});
});
// TODO (viktard): Selection starts in line number.
// TODO (viktard): Empty lines in selection start.
// TODO (viktard): Empty lines in selection end.

1
polygerrit-ui/app/test/index.html
View File

@@ -48,6 +48,7 @@ limitations under the License.
'diff/gr-diff-comment/gr-diff-comment_test.html',
'diff/gr-diff-cursor/gr-diff-cursor_test.html',
'diff/gr-diff-highlight/gr-diff-highlight_test.html',
'diff/gr-diff-highlight/gr-annotation_test.html',
'diff/gr-diff-preferences/gr-diff-preferences_test.html',
'diff/gr-diff-processor/gr-diff-processor_test.html',
'diff/gr-diff-selection/gr-diff-selection_test.html',