From de22194f026e0a81f95f09c490974b288e1f5cb3 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 14 Jul 2015 16:55:35 +0200 Subject: [PATCH] SONAR-6377 ws plugins/available add homepage and issue tracking URLs --- .../org/sonar/server/plugins/ws/PluginWSCommons.java | 2 ++ .../sonar/server/plugins/ws/AvailableActionTest.java | 10 ++++++---- .../ws/AvailableActionTest/properties_per_plugin.json | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java index 82b70cdf8df..6c764861e38 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java @@ -117,6 +117,8 @@ public class PluginWSCommons { jsonWriter.prop(PROPERTY_TERMS_AND_CONDITIONS_URL, plugin.getTermsConditionsUrl()); jsonWriter.prop(PROPERTY_ORGANIZATION_NAME, plugin.getOrganization()); jsonWriter.prop(PROPERTY_ORGANIZATION_URL, plugin.getOrganizationUrl()); + jsonWriter.prop(PROPERTY_HOMEPAGE_URL, plugin.getHomepageUrl()); + jsonWriter.prop(PROPERTY_ISSUE_TRACKER_URL, plugin.getIssueTrackerUrl()); } public void writeRelease(JsonWriter jsonWriter, Release release) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java index b6c59f1ab61..205c657fa45 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java @@ -45,6 +45,8 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio .setLicense("p_license") .setOrganization("p_orga_name") .setOrganizationUrl("p_orga_url") + .setHomepageUrl("p_homepage_url") + .setIssueTrackerUrl("p_issue_url") .setTermsConditionsUrl("p_t_and_c_url"); private static final Release FULL_PROPERTIES_PLUGIN_RELEASE = release(FULL_PROPERTIES_PLUGIN, "1.12.1") .setDate(DateUtils.parseDate("2015-04-16")) @@ -82,7 +84,7 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio public void verify_properties_displayed_in_json_per_plugin() throws Exception { when(updateCenter.findAvailablePlugins()).thenReturn(of( pluginUpdate(FULL_PROPERTIES_PLUGIN_RELEASE, COMPATIBLE) - )); + )); underTest.handle(request, response); @@ -112,7 +114,7 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio private void checkStatusDisplayedInJson(PluginUpdate.Status status, String expectedValue) throws Exception { when(updateCenter.findAvailablePlugins()).thenReturn(of( pluginUpdate(release(PLUGIN_1, "1.0.0"), status) - )); + )); underTest.handle(request, response); @@ -126,7 +128,7 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio " }" + " ]" + "}" - ); + ); } @Test @@ -137,6 +139,6 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio pluginUpdate("key2", "name2"), pluginUpdate("key0", "name0"), pluginUpdate("key1", "name1") - )); + )); } } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json index 8c5ed3bf5aa..44e8587022a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json @@ -8,6 +8,8 @@ "license": "p_license", "organizationName": "p_orga_name", "organizationUrl": "p_orga_url", + "homepageUrl": "p_homepage_url", + "issueTrackerUrl": "p_issue_url", "termsAndConditionsUrl": "p_t_and_c_url", "release": { "version": "1.12.1", -- 2.39.5