From 2014025063e2b1e9b8f0d98936b99fbe6491aa04 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 18 Jul 2016 14:07:16 +0200 Subject: [PATCH] Fix SonarQube version to use in PluginsTest --- it/it-tests/src/test/java/it/plugins/PluginsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 3f6e038b64d..e819b338f38 100644 --- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java +++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java @@ -51,6 +51,7 @@ import org.junit.Test; import org.junit.rules.ErrorCollector; import org.sonar.updatecenter.common.Plugin; import org.sonar.updatecenter.common.Release; +import org.sonar.updatecenter.common.Version; import static org.assertj.core.api.Assertions.fail; @@ -97,10 +98,11 @@ public class PluginsTest { // install latest compatible releases of plugins org.sonar.updatecenter.common.Version sonarVersion = org.sonar.updatecenter.common.Version.create(builder.getSonarVersion()); - builder.getUpdateCenter().setInstalledSonarVersion(sonarVersion); + Version sonarVersionWithoutPatch = Version.create(sonarVersion.getMajor() + "." + sonarVersion.getMinor()); + builder.getUpdateCenter().setInstalledSonarVersion(sonarVersionWithoutPatch); for (Plugin plugin : builder.getUpdateCenter().findAllCompatiblePlugins()) { if (!DISABLED_PLUGINS.contains(plugin.getKey())) { - Release release = plugin.getLastCompatibleRelease(sonarVersion); + Release release = plugin.getLastCompatibleRelease(sonarVersionWithoutPatch); if (release != null) { builder.setOrchestratorProperty(plugin.getKey() + "Version", release.getVersion().toString()); builder.addPlugin(plugin.getKey()); -- 2.39.5