Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgraded to Commons FileUpload 1.3 and JSF 2.1, removing deprecated JSF 1.1 VariableResolvers

Browse Source
This commit is contained in:
Juergen Hoeller
2013-03-29 22:51:42 +01:00
parent 15441da969
commit 6d710563cc
10 changed files with 29 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
View File

@@ -1,87 +0,0 @@
/*
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.jsf;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.VariableResolver;
import junit.framework.TestCase;
import org.springframework.tests.sample.beans.TestBean;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.StaticWebApplicationContext;
/**
* @author Juergen Hoeller
* @since 02.08.2004
*/
@Deprecated
public class DelegatingVariableResolverTests extends TestCase {
public void testDelegatingVariableResolver() {
final StaticWebApplicationContext wac = new StaticWebApplicationContext();
wac.registerSingleton("bean1", TestBean.class, null);
wac.registerSingleton("var1", TestBean.class, null);
wac.refresh();
TestBean bean1 = (TestBean) wac.getBean("bean1");
// We need to override the getWebApplicationContext method here:
// FacesContext and ExternalContext are hard to mock.
DelegatingVariableResolver resolver = new DelegatingVariableResolver(new OriginalVariableResolver()) {
@Override
protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
return wac;
}
};
assertEquals(bean1, resolver.resolveVariable(null, "bean1"));
assertEquals("val1", resolver.resolveVariable(null, "var1"));
}
public void testSpringBeanVariableResolver() {
final StaticWebApplicationContext wac = new StaticWebApplicationContext();
wac.registerSingleton("bean1", TestBean.class, null);
wac.registerSingleton("var1", TestBean.class, null);
wac.refresh();
TestBean bean1 = (TestBean) wac.getBean("bean1");
TestBean var1 = (TestBean) wac.getBean("var1");
// We need to override the getWebApplicationContext method here:
// FacesContext and ExternalContext are hard to mock.
SpringBeanVariableResolver resolver = new SpringBeanVariableResolver(new OriginalVariableResolver()) {
@Override
protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) {
return wac;
}
};
assertEquals(bean1, resolver.resolveVariable(null, "bean1"));
assertEquals(var1, resolver.resolveVariable(null, "var1"));
}
private static class OriginalVariableResolver extends VariableResolver {
@Override
public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException {
if ("var1".equals(name)) {
return "val1";
}
return null;
}
}
}

11
spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
View File

@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.FileItemHeaders;
import org.apache.commons.fileupload.FileUpload;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.junit.Test;
@@ -494,6 +495,16 @@ public class CommonsMultipartResolverTests {
public OutputStream getOutputStream() throws IOException {
throw new UnsupportedOperationException();
}
@Override
public FileItemHeaders getHeaders() {
throw new UnsupportedOperationException();
}
@Override
public void setHeaders(FileItemHeaders headers) {
throw new UnsupportedOperationException();
}
}