Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  SideBySide2: Fix failure to load from "ISE EditIterator out of bounds"
  Remove "Click to" from topic edit button's tooltip
  Fix: wrongly throw 'commit already exists' exception
  Update sshd to 0.11.0
  Bump SSHD version to 0.10.1 and enable nio2 backend

Conflicts:
	gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Topic.ui.xml

Change-Id: I63c1e12bbd413a8e212de5b2a8cf71fa2a2ce52d
This commit is contained in:
Shawn Pearce
2014-04-23 21:23:51 -07:00
7 changed files with 78 additions and 34 deletions

View File

@@ -44,6 +44,13 @@ public class EditIteratorTest extends GwtTest {
lines.push("3rd");
}
@Test
public void testNegativeAdvance() {
EditIterator i = new EditIterator(lines, 0);
assertLineChsEqual(LineCharacter.create(1, 1), i.advance(5));
assertLineChsEqual(LineCharacter.create(0, 3), i.advance(-2));
}
@Test
public void testNoAdvance() {
EditIterator iter = new EditIterator(lines, 0);