diff options
author | Jenkins CI <ci@sonarsource.com> | 2015-12-11 08:01:20 +0100 |
---|---|---|
committer | Jenkins CI <ci@sonarsource.com> | 2015-12-11 08:01:20 +0100 |
commit | d547fdddf958c20cddd00cdbf7a280182400f595 (patch) | |
tree | 2ffb39ec347ad77c4a772c7fe0f7dfc49120c96d /it | |
parent | 39f16286bfcd6dc247352e34f0fb93cc202104c4 (diff) | |
parent | 56a4685a6061731fe701ea3ec8afbf9a8a1015f0 (diff) | |
download | sonarqube-d547fdddf958c20cddd00cdbf7a280182400f595.tar.gz sonarqube-d547fdddf958c20cddd00cdbf7a280182400f595.zip |
Automatic merge from branch-5.3
* origin/branch-5.3:
SONAR-6968 Bad error message when analyzer detects that no language plugins are installed
SONAR-6905 Batch should dump analysis-related URL into a properties file
fix displaying of the workspace on the overview pages
SONAR-7030 Remove dashboards bundles
Reactivate devcockpit in PluginsTest
fix link to added issues from the debt overview
respect precision of float metrics during web formatting
Diffstat (limited to 'it')
-rw-r--r-- | it/it-tests/src/test/java/it/analysis/ReportDumpTest.java | 3 | ||||
-rw-r--r-- | it/it-tests/src/test/java/it/plugins/PluginsTest.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java b/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java index 91129f299a7..74d58aebaa4 100644 --- a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java +++ b/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java @@ -44,9 +44,10 @@ public class ReportDumpTest { // verify properties Properties props = new Properties(); props.load(new StringReader(FileUtils.readFileToString(metadata, StandardCharsets.UTF_8))); - assertThat(props).hasSize(4); + assertThat(props).hasSize(5); assertThat(props.getProperty("projectKey")).isEqualTo("dump_metadata_of_uploaded_report"); assertThat(props.getProperty("ceTaskId")).isNotEmpty(); + verifyUrl(props.getProperty("serverUrl")); verifyUrl(props.getProperty("dashboardUrl")); verifyUrl(props.getProperty("ceTaskUrl")); } diff --git a/it/it-tests/src/test/java/it/plugins/PluginsTest.java b/it/it-tests/src/test/java/it/plugins/PluginsTest.java index a65564a1cad..9c4e824ab36 100644 --- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java +++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java @@ -49,7 +49,7 @@ public class PluginsTest { /** * Temporarily disabled plugins. To be re-enabled. */ - static final Set<String> DISABLED_PLUGINS = Sets.newHashSet("devcockpit", + static final Set<String> DISABLED_PLUGINS = Sets.newHashSet( // internal plugin used for integration tests of language plugins "lits"); |