Format all Java files with google-java-format
Having a standard tool for formatting saves reviewers' valuable time. google-java-format is Google's standard formatter and is somewhat inspired by gofmt[1]. This commit formats everything using google-java-format version 1.2. The downside of this one-off formatting is breaking blame. This can be somewhat hacked around with a tool like git-hyper-blame[2], but it's definitely not optimal until/unless this kind of feature makes its way to git core. Not in this change: * Tool support, e.g. Eclipse. The command must be run manually [3]. * Documentation of best practice, e.g. new 100-column default. [1] https://talks.golang.org/2015/gofmt-en.slide#3 [2] https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-hyper-blame.html [3] git ls-files | grep java$ | xargs google-java-format -i Change-Id: Id5f3c6de95ce0b68b41f0a478b5c99a93675aaa3 Signed-off-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
committed by
David Pursehouse
parent
6723b6d0fa
commit
292fa154c1
@@ -17,7 +17,6 @@ package com.google.gerrit.client.diff;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import com.google.gerrit.client.diff.LineMapper.LineOnOtherInfo;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
/** Unit tests for LineMapper */
|
||||
@@ -51,56 +50,46 @@ public class LineMapperTest {
|
||||
public void findInCommon() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendCommon(10);
|
||||
assertEquals(new LineOnOtherInfo(9, true),
|
||||
mapper.lineOnOther(DisplaySide.A, 9));
|
||||
assertEquals(new LineOnOtherInfo(9, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 9));
|
||||
assertEquals(new LineOnOtherInfo(9, true), mapper.lineOnOther(DisplaySide.A, 9));
|
||||
assertEquals(new LineOnOtherInfo(9, true), mapper.lineOnOther(DisplaySide.B, 9));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findAfterCommon() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendCommon(10);
|
||||
assertEquals(new LineOnOtherInfo(10, true),
|
||||
mapper.lineOnOther(DisplaySide.A, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true), mapper.lineOnOther(DisplaySide.A, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true), mapper.lineOnOther(DisplaySide.B, 10));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findInInsertGap() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendInsert(10);
|
||||
assertEquals(new LineOnOtherInfo(-1, false),
|
||||
mapper.lineOnOther(DisplaySide.B, 9));
|
||||
assertEquals(new LineOnOtherInfo(-1, false), mapper.lineOnOther(DisplaySide.B, 9));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findAfterInsertGap() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendInsert(10);
|
||||
assertEquals(new LineOnOtherInfo(0, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true),
|
||||
mapper.lineOnOther(DisplaySide.A, 0));
|
||||
assertEquals(new LineOnOtherInfo(0, true), mapper.lineOnOther(DisplaySide.B, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true), mapper.lineOnOther(DisplaySide.A, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findInDeleteGap() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendDelete(10);
|
||||
assertEquals(new LineOnOtherInfo(-1, false),
|
||||
mapper.lineOnOther(DisplaySide.A, 9));
|
||||
assertEquals(new LineOnOtherInfo(-1, false), mapper.lineOnOther(DisplaySide.A, 9));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void findAfterDeleteGap() {
|
||||
LineMapper mapper = new LineMapper();
|
||||
mapper.appendDelete(10);
|
||||
assertEquals(new LineOnOtherInfo(0, true),
|
||||
mapper.lineOnOther(DisplaySide.A, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 0));
|
||||
assertEquals(new LineOnOtherInfo(0, true), mapper.lineOnOther(DisplaySide.A, 10));
|
||||
assertEquals(new LineOnOtherInfo(10, true), mapper.lineOnOther(DisplaySide.B, 0));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -119,14 +108,10 @@ public class LineMapperTest {
|
||||
assertEquals(4, mapper.getLineA());
|
||||
assertEquals(6, mapper.getLineB());
|
||||
|
||||
assertEquals(new LineOnOtherInfo(1, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 1));
|
||||
assertEquals(new LineOnOtherInfo(3, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 5));
|
||||
assertEquals(new LineOnOtherInfo(1, true), mapper.lineOnOther(DisplaySide.B, 1));
|
||||
assertEquals(new LineOnOtherInfo(3, true), mapper.lineOnOther(DisplaySide.B, 5));
|
||||
|
||||
assertEquals(new LineOnOtherInfo(2, true),
|
||||
mapper.lineOnOther(DisplaySide.B, 2));
|
||||
assertEquals(new LineOnOtherInfo(2, false),
|
||||
mapper.lineOnOther(DisplaySide.B, 3));
|
||||
assertEquals(new LineOnOtherInfo(2, true), mapper.lineOnOther(DisplaySide.B, 2));
|
||||
assertEquals(new LineOnOtherInfo(2, false), mapper.lineOnOther(DisplaySide.B, 3));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user