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

SPR-8350 ContentNegotiatingViewResolver initialization for nested ViewResolvers

Browse Source
This commit is contained in:
Rossen Stoyanchev
2011-05-19 13:07:15 +00:00
parent 100fed47f3
commit 5ac2e4418f
3 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
View File

@@ -16,6 +16,15 @@
package org.springframework.web.servlet.view;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -24,17 +33,16 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import static org.easymock.EasyMock.*;
import org.junit.After;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.ViewResolver;
@@ -429,4 +437,24 @@ public class ContentNegotiatingViewResolverTests {
verify(viewResolverMock, viewMock);
}
@Test
public void nestedViewResolverIsNotSpringBean() throws Exception {
InternalResourceViewResolver nestedResolver = new InternalResourceViewResolver();
nestedResolver.setViewClass(InternalResourceView.class);
viewResolver.setViewResolvers(new ArrayList<ViewResolver>(Arrays.asList(nestedResolver)));
StaticWebApplicationContext appContext = new StaticWebApplicationContext();
appContext.setServletContext(new MockServletContext());
appContext.refresh();
viewResolver.setApplicationContext(appContext);
viewResolver.setDefaultContentType(MediaType.TEXT_HTML);
String viewName = "view";
Locale locale = Locale.ENGLISH;
View result = viewResolver.resolveViewName(viewName, locale);
assertNotNull("Invalid view", result);
}
}