diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-26 15:32:55 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-05-26 15:52:00 +0200 |
| commit | 45248a93901bbdac018a172a9f1db956cba876bf (patch) | |
| tree | 0d54ab5496685d503f7348bb25f052b63fc79d0c /server/sonar-server | |
| parent | 8d0ec033969eaf7fb0e9672816ce6a85a9a301f0 (diff) | |
| download | sonarqube-45248a93901bbdac018a172a9f1db956cba876bf.tar.gz sonarqube-45248a93901bbdac018a172a9f1db956cba876bf.zip | |
SONAR-7587 end of support of Java 7
- Upgrade to parent 34, which compiles
with java 8 and disable javadoc lints
- Compilation with java 8 on Travis
- Fix ambiguities in assertJ
Diffstat (limited to 'server/sonar-server')
| -rw-r--r-- | server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java | 6 | ||||
| -rw-r--r-- | server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java index 2c35227264d..a7c94979f0a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java @@ -250,7 +250,7 @@ public class IssueUpdaterTest { issue.setLocations("[1-3]"); boolean updated = updater.setLocations(issue, "[1-4]"); assertThat(updated).isTrue(); - assertThat(issue.getLocations()).isEqualTo("[1-4]"); + assertThat(issue.getLocations().toString()).isEqualTo("[1-4]"); assertThat(issue.currentChange()).isNull(); assertThat(issue.mustSendNotifications()).isFalse(); } @@ -260,7 +260,7 @@ public class IssueUpdaterTest { issue.setLocations("[1-3]"); boolean updated = updater.setLocations(issue, "[1-3]"); assertThat(updated).isFalse(); - assertThat(issue.getLocations()).isEqualTo("[1-3]"); + assertThat(issue.getLocations().toString()).isEqualTo("[1-3]"); assertThat(issue.currentChange()).isNull(); assertThat(issue.mustSendNotifications()).isFalse(); } @@ -270,7 +270,7 @@ public class IssueUpdaterTest { issue.setLocations(null); boolean updated = updater.setLocations(issue, "[1-4]"); assertThat(updated).isTrue(); - assertThat(issue.getLocations()).isEqualTo("[1-4]"); + assertThat(issue.getLocations().toString()).isEqualTo("[1-4]"); assertThat(issue.currentChange()).isNull(); assertThat(issue.mustSendNotifications()).isFalse(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java index 53bea5371f3..d694b16ff18 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/search/BaseDocTest.java @@ -40,9 +40,9 @@ public class BaseDocTest { BaseDoc doc = new BaseDoc(fields) { }; - assertThat(doc.getNullableField("a_string")).isEqualTo("foo"); - assertThat(doc.getNullableField("a_int")).isEqualTo(42); - assertThat(doc.getNullableField("a_null")).isNull(); + assertThat((String) doc.getNullableField("a_string")).isEqualTo("foo"); + assertThat((int) doc.getNullableField("a_int")).isEqualTo(42); + assertThat((String) doc.getNullableField("a_null")).isNull(); } @Test @@ -61,7 +61,7 @@ public class BaseDocTest { @Test public void getFieldAsDate() { - BaseDoc doc = new BaseDoc(Maps.<String,Object>newHashMap()) { + BaseDoc doc = new BaseDoc(Maps.newHashMap()) { }; long now = System.currentTimeMillis(); doc.setField("javaDate", new Date(now)); @@ -73,7 +73,7 @@ public class BaseDocTest { @Test public void getNullableFieldAsDate() { - BaseDoc doc = new BaseDoc(Maps.<String,Object>newHashMap()) { + BaseDoc doc = new BaseDoc(Maps.newHashMap()) { }; long now = System.currentTimeMillis(); doc.setField("javaDate", new Date(now)); |