Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-42717] - Prevent NPE when a non-existent Default View is spe…
…cified in the global config (#2815) * [JENKINS-42717] - Document view management methods in Jenkins and ViewGroupMixIn * [KENKINS-42717] - GlobalDefauldViewConfiguration should not fail with NPE when the view is missing * [JENKINS-42717] - Draft the direct unit test * [JENKINS-42717] - Fix the tes implementation * [JENKINS-42717] - Make FormException localizable * [JENKINS-42717] - Fix te build glitch
- Loading branch information
1 parent
d1d72ca
commit 4074818
Showing
6 changed files
with
180 additions
and
4 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
66 changes: 66 additions & 0 deletions
66
test/src/test/java/hudson/views/GlobalDefaultViewConfigurationTest.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 | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2017 Oleg Nenashev. | ||
* | ||
* 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.views; | ||
|
||
import hudson.model.Descriptor; | ||
import net.sf.json.JSONObject; | ||
import static org.hamcrest.Matchers.*; | ||
import org.junit.Assert; | ||
import static org.junit.Assert.assertThat; | ||
import org.junit.Rule; | ||
import org.junit.Test; | ||
import org.jvnet.hudson.test.Issue; | ||
import org.jvnet.hudson.test.JenkinsRule; | ||
import org.kohsuke.stapler.MockStaplerRequestBuilder; | ||
import org.kohsuke.stapler.StaplerRequest; | ||
|
||
/** | ||
* Tests of {@link GlobalDefaultViewConfiguration}. | ||
* @author Oleg Nenashev | ||
*/ | ||
public class GlobalDefaultViewConfigurationTest { | ||
|
||
@Rule | ||
public JenkinsRule j = new JenkinsRule(); | ||
|
||
@Test | ||
@Issue("JENKINS-42717") | ||
public void shouldNotFailIfTheDefaultViewIsMissing() { | ||
String viewName = "NonExistentView"; | ||
GlobalDefaultViewConfiguration c = new GlobalDefaultViewConfiguration(); | ||
|
||
StaplerRequest create = new MockStaplerRequestBuilder(j, "/configure").build(); | ||
JSONObject params = new JSONObject(); | ||
params.accumulate("primaryView", viewName); | ||
try { | ||
c.configure(create, params); | ||
} catch(Descriptor.FormException ex) { | ||
assertThat("Wrong exception message for the form failure", | ||
ex.getMessage(), containsString(Messages.GlobalDefaultViewConfiguration_ViewDoesNotExist(viewName))); | ||
return; | ||
} | ||
Assert.fail("Expected FormException"); | ||
} | ||
|
||
} |
81 changes: 81 additions & 0 deletions
81
test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.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 | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
* The MIT License | ||
* | ||
* Copyright (c) 2017 Oleg Nenashev. | ||
* | ||
* 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 org.kohsuke.stapler; | ||
|
||
import java.lang.reflect.InvocationHandler; | ||
import java.lang.reflect.Method; | ||
import java.lang.reflect.Proxy; | ||
import java.util.ArrayList; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Locale; | ||
import java.util.Map; | ||
import javax.annotation.Nonnull; | ||
import javax.servlet.http.HttpServletRequest; | ||
import javax.servlet.http.HttpServletRequestWrapper; | ||
import jenkins.model.Jenkins; | ||
import org.eclipse.jetty.server.Request; | ||
import org.jvnet.hudson.test.JenkinsRule; | ||
import org.mockito.Mockito; | ||
import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest; | ||
|
||
/** | ||
* Mocked version of {@link StaplerRequest}. | ||
* @author Oleg Nenashev | ||
*/ | ||
public class MockStaplerRequestBuilder{ | ||
|
||
private final JenkinsRule r; | ||
|
||
private final List<AncestorImpl> ancestors = new ArrayList<>(); | ||
private final TokenList tokens; | ||
final Map<String,Object> getters = new HashMap<>(); | ||
private Stapler stapler; | ||
|
||
public MockStaplerRequestBuilder(@Nonnull JenkinsRule r, String url) { | ||
this.r = r; | ||
this.tokens = new TokenList(url); | ||
} | ||
|
||
public MockStaplerRequestBuilder withStapler(Stapler stapler) { | ||
this.stapler = stapler; | ||
return this; | ||
} | ||
|
||
public MockStaplerRequestBuilder withGetter(String objectName, Object object) { | ||
this.getters.put(objectName, object); | ||
return this; | ||
} | ||
|
||
public MockStaplerRequestBuilder withAncestor(AncestorImpl ancestor) { | ||
this.ancestors.add(ancestor); | ||
return this; | ||
} | ||
|
||
public StaplerRequest build() throws AssertionError { | ||
HttpServletRequest rawRequest = Mockito.mock(HttpServletRequest.class); | ||
return new RequestImpl(stapler != null ? stapler : new Stapler(), rawRequest, ancestors, tokens); | ||
} | ||
|
||
} |