-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
"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.
- Loading branch information
Showing
3 changed files
with
85 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -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); | |||
} | |||
} |