Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-34681] Allow custom plugin managers when using war (#2323)
* [JENKINS-34681] Allow custom default plugin managers * [JENKINS-34681] Convert remaining properties to SystemProperties.
- Loading branch information
1 parent
dbe04b3
commit 454642d
Showing
4 changed files
with
259 additions
and
12 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2016 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package hudson; | ||
|
|
||
| import jenkins.model.Jenkins; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.jvnet.hudson.test.Issue; | ||
| import org.jvnet.hudson.test.JenkinsRecipe; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
| import org.jvnet.hudson.test.recipes.WithPlugin; | ||
|
|
||
| import javax.servlet.ServletContext; | ||
| import java.io.File; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| import static java.lang.annotation.ElementType.METHOD; | ||
| import static java.lang.annotation.RetentionPolicy.RUNTIME; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| /** | ||
| * Tests for the use of a custom plugin manager in custom wars. | ||
| */ | ||
| public class CustomPluginManagerTest { | ||
| @Rule public final JenkinsRule r = new JenkinsRule(); | ||
|
|
||
| // TODO: Move to jenkins-test-harness | ||
| @JenkinsRecipe(WithCustomLocalPluginManager.RuleRunnerImpl.class) | ||
| @Target(METHOD) | ||
| @Retention(RUNTIME) | ||
| public @interface WithCustomLocalPluginManager { | ||
| Class<? extends LocalPluginManager> value(); | ||
|
|
||
| class RuleRunnerImpl extends JenkinsRecipe.Runner<WithCustomLocalPluginManager> { | ||
| private String oldValue; | ||
|
|
||
| @Override | ||
| public void setup(JenkinsRule jenkinsRule, WithCustomLocalPluginManager recipe) throws Exception { | ||
| jenkinsRule.useLocalPluginManager = true; | ||
| oldValue = System.getProperty(LocalPluginManager.CUSTOM_PLUGIN_MANAGER); | ||
| System.setProperty(LocalPluginManager.CUSTOM_PLUGIN_MANAGER, recipe.value().getName()); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void tearDown(JenkinsRule jenkinsRule, WithCustomLocalPluginManager recipe) throws Exception { | ||
| System.setProperty(LocalPluginManager.CUSTOM_PLUGIN_MANAGER, oldValue); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void check(Class<? extends CustomPluginManager> klass) { | ||
| assertTrue("Correct plugin manager installed", klass.isAssignableFrom(r.getPluginManager().getClass())); | ||
| assertNotNull("Plugin 'tasks' installed", r.jenkins.getPlugin("tasks")); | ||
| } | ||
|
|
||
| // An interface not to override every constructor. | ||
| interface CustomPluginManager { | ||
| } | ||
|
|
||
| @Issue("JENKINS-34681") | ||
| @WithPlugin("tasks.jpi") | ||
| @WithCustomLocalPluginManager(CustomPluginManager1.class) | ||
| @Test public void customPluginManager1() { | ||
| check(CustomPluginManager1.class); | ||
| } | ||
|
|
||
| public static class CustomPluginManager1 extends LocalPluginManager implements CustomPluginManager { | ||
| public CustomPluginManager1(Jenkins jenkins) { | ||
| super(jenkins); | ||
| } | ||
| } | ||
|
|
||
| @Issue("JENKINS-34681") | ||
| @WithPlugin("tasks.jpi") | ||
| @WithCustomLocalPluginManager(CustomPluginManager2.class) | ||
| @Test public void customPluginManager2() { | ||
| check(CustomPluginManager2.class); | ||
| } | ||
|
|
||
| public static class CustomPluginManager2 extends LocalPluginManager implements CustomPluginManager { | ||
| public CustomPluginManager2(ServletContext ctx, File root) { | ||
| super(ctx, root); | ||
| } | ||
| } | ||
|
|
||
| @Issue("JENKINS-34681") | ||
| @WithPlugin("tasks.jpi") | ||
| @WithCustomLocalPluginManager(CustomPluginManager3.class) | ||
| @Test public void customPluginManager3() { | ||
| check(CustomPluginManager3.class); | ||
| } | ||
|
|
||
| public static class CustomPluginManager3 extends LocalPluginManager implements CustomPluginManager { | ||
| public CustomPluginManager3(File root) { | ||
| super(root); | ||
| } | ||
| } | ||
|
|
||
| @Issue("JENKINS-34681") | ||
| @WithPlugin("tasks.jpi") | ||
| @WithCustomLocalPluginManager(BadCustomPluginManager.class) | ||
| @Test public void badCustomPluginManager() { | ||
| assertFalse("Custom plugin manager not installed", r.getPluginManager() instanceof CustomPluginManager); | ||
| } | ||
|
|
||
| public static class BadCustomPluginManager extends LocalPluginManager implements CustomPluginManager { | ||
| public BadCustomPluginManager(File root, ServletContext ctx) { | ||
| super(ctx, root); | ||
| } | ||
| } | ||
|
|
||
| } |