opendev/gerrit
Code Issues Proposed changes

Upgrade to google-java-format 1.5

Browse Source 
Change-Id: I8e0270efad021e69b1a127cf3175626d26381bdb
This commit is contained in:
David Pursehouse
2018-04-17 15:18:17 +02:00
parent 33ce3bf5be
commit 4ec5ef6bd2
30 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/test/java/com/google/gerrit/server/patch/IntraLineLoaderTest.java
View File

@@ -75,14 +75,14 @@ public class IntraLineLoaderTest {
String b = "multi\nlinemulti\nline\n";
assertThat(intraline(a, b)).isEqualTo(wordEdit(10, 10, 6, 16));
// better would be:
//assertThat(intraline(a, b)).isEqualTo(wordEdit(6, 6, 6, 16));
// assertThat(intraline(a, b)).isEqualTo(wordEdit(6, 6, 6, 16));
// or the equivalent:
//assertThat(intraline(a, b)).isEqualTo(ref()
// assertThat(intraline(a, b)).isEqualTo(ref()
// .common("multi\n").insert("linemulti\n").common("line\n").edits
//);
// );
}
//TODO: expected failure
// TODO: expected failure
// the current code does not work on the first line
// and the insert marker is in the wrong location
@Test(expected = AssertionError.class)
@@ -93,7 +93,7 @@ public class IntraLineLoaderTest {
.isEqualTo(ref().insert(" ").common(" abc\n").insert(" ").common(" def\n").edits);
}
//TODO: expected failure
// TODO: expected failure
// the current code does not work on the first line
@Test(expected = AssertionError.class)
public void preferDeleteAtLineBreak() throws Exception {

2
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryModule.java
View File

@@ -186,7 +186,7 @@ public class InMemoryModule extends FactoryModule {
return CanonicalWebUrlProvider.class;
}
});
//Replacement of DiffExecutorModule to not use thread pool in the tests
// Replacement of DiffExecutorModule to not use thread pool in the tests
install(
new AbstractModule() {
@Override