[FIXED JENKINS-15976]

"it" refers to the object that owns the page, such as FreeStyleProject. So a small object like SettingsProvider that contributes to those big guys should refer to itself as 'instance', not via 'it'. Also added a regression test case.
jenkinsci · Dec 11, 2012 · 40c66e9 · 40c66e9
1 parent ec92802
commit 40c66e9
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 3 deletions.
diff --git a/...ources/org/jenkinsci/plugins/configfiles/maven/job/MvnGlobalSettingsProvider/config.jelly b/...ources/org/jenkinsci/plugins/configfiles/maven/job/MvnGlobalSettingsProvider/config.jelly
@@ -29,7 +29,7 @@ THE SOFTWARE.
         <select class="setting-input" name="settingsConfigId">
           <f:option value="">- select -</f:option>
           <j:forEach var="config" items="${mavenGlobalSettingsConfigs}">
-            <f:option selected="${it.globalSettings.settingsConfigId == config.id}" value="${config.id}">${config.name}</f:option>
+            <f:option selected="${instance.settingsConfigId == config.id}" value="${config.id}">${config.name}</f:option>
           </j:forEach>
         </select>
       </f:entry>    

diff --git a/...in/resources/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProvider/config.jelly b/...in/resources/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProvider/config.jelly
@@ -27,9 +27,9 @@ THE SOFTWARE.
       <j:set var="mavenSettingsConfigs" value="${descriptor.allMavenSettingsConfigs}" />
       <f:entry title="${%Provided Settings}">
         <select class="setting-input" name="settingsConfigId">
-          <f:option value="">- select -</f:option>
+          <f:option value="">- select ${it}:${it.class}:${it.settings}:${it.settings.class}:${instance} -</f:option>
           <j:forEach var="config" items="${mavenSettingsConfigs}">
-            <f:option selected="${it.settings.settingsConfigId == config.id}" value="${config.id}">${config.name}</f:option>
+            <f:option selected="${instance.settingsConfigId == config.id}" value="${config.id}">${config.name}</f:option>
           </j:forEach>
         </select>
       </f:entry>          

diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java
@@ -0,0 +1,82 @@
+package org.jenkinsci.plugins.configfiles.maven.job;
+
+import hudson.maven.MavenModuleSet;
+import hudson.model.FreeStyleProject;
+import hudson.tasks.Maven;
+import org.jenkinsci.lib.configprovider.ConfigProvider;
+import org.jenkinsci.lib.configprovider.model.Config;
+import org.jenkinsci.plugins.configfiles.ConfigFilesManagement;
+import org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig.GlobalMavenSettingsConfigProvider;
+import org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig.MavenSettingsConfigProvider;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.JenkinsRule;
+
+import javax.inject.Inject;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class MvnSettingsProviderTest {
+    @Rule
+    public JenkinsRule jenkins = new JenkinsRule();
+
+    @Inject
+    ConfigFilesManagement config;
+
+    @Inject
+    MavenSettingsConfigProvider mavenSettingProvider;
+
+    @Inject
+    GlobalMavenSettingsConfigProvider globalMavenSettingsConfigProvider;
+
+    @Test @Bug(15976)
+    public void testConfigRoundtrip() throws Exception {
+        jenkins.jenkins.getInjector().injectMembers(this);
+
+        Config c1 = createSetting(mavenSettingProvider);
+        Config c2 = createSetting(globalMavenSettingsConfigProvider);
+
+        FreeStyleProject p = jenkins.createFreeStyleProject();
+        MvnSettingsProvider s1 = new MvnSettingsProvider(c1.id);
+        MvnGlobalSettingsProvider s2 = new MvnGlobalSettingsProvider(c2.id);
+        Maven m = new Maven("install", null,null,null,null,false, s1, s2);
+        p.getBuildersList().add(m);
+        jenkins.configRoundtrip(p);
+        m = p.getBuildersList().get(Maven.class);
+
+        jenkins.assertEqualDataBoundBeans(m.getSettings(),s1);
+        jenkins.assertEqualDataBoundBeans(m.getGlobalSettings(),s2);
+        assertNotSame(m.getSettings(), s1);
+        assertNotSame(m.getGlobalSettings(),s2);
+    }
+
+    private Config createSetting(ConfigProvider provider) {
+        Config c1 = provider.newConfig();
+        provider.save(c1);
+        return c1;
+    }
+
+    @Test @Bug(15976)
+    public void testConfigRoundtripMavenJob() throws Exception {
+        jenkins.jenkins.getInjector().injectMembers(this);
+
+        Config c1 = createSetting(mavenSettingProvider);
+        Config c2 = createSetting(globalMavenSettingsConfigProvider);
+
+        MavenModuleSet p = jenkins.createMavenProject();
+        MvnSettingsProvider s1 = new MvnSettingsProvider(c1.id);
+        MvnGlobalSettingsProvider s2 = new MvnGlobalSettingsProvider(c2.id);
+        p.setSettings(s1);
+        p.setGlobalSettings(s2);
+        jenkins.configRoundtrip(p);
+
+        jenkins.assertEqualDataBoundBeans(p.getSettings(),s1);
+        jenkins.assertEqualDataBoundBeans(p.getGlobalSettings(),s2);
+        assertNotSame(p.getSettings(), s1);
+        assertNotSame(p.getGlobalSettings(),s2);
+    }
+}