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

SPR-6788 - The class MediaType has a natural ordering that is inconsistent with equals, which is generally recommended or should otherwise at least be indicated in the javadoc

Browse Source
This commit is contained in:
Arjen Poutsma
2010-02-02 13:14:19 +00:00
parent 644f3065b6
commit 4343714c6d
6 changed files with 269 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 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.
@@ -128,8 +128,8 @@ public class ContentNegotiatingViewResolverTests {
expect(viewResolverMock1.resolveViewName(viewName, locale)).andReturn(viewMock1);
expect(viewResolverMock2.resolveViewName(viewName, locale)).andReturn(viewMock2);
expect(viewMock1.getContentType()).andReturn("application/xml");
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1");
expect(viewMock1.getContentType()).andReturn("application/xml").anyTimes();
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1").anyTimes();
replay(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2);
@@ -160,8 +160,8 @@ public class ContentNegotiatingViewResolverTests {
expect(viewResolverMock1.resolveViewName(viewName, locale)).andReturn(viewMock1);
expect(viewResolverMock2.resolveViewName(viewName, locale)).andReturn(viewMock2);
expect(viewMock1.getContentType()).andReturn("application/xml");
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1");
expect(viewMock1.getContentType()).andReturn("application/xml").anyTimes();
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1").anyTimes();
replay(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2);
@@ -197,9 +197,9 @@ public class ContentNegotiatingViewResolverTests {
expect(viewResolverMock1.resolveViewName(viewName, locale)).andReturn(viewMock1);
expect(viewResolverMock2.resolveViewName(viewName, locale)).andReturn(viewMock2);
expect(viewMock1.getContentType()).andReturn("application/xml");
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1");
expect(viewMock3.getContentType()).andReturn("application/json");
expect(viewMock1.getContentType()).andReturn("application/xml").anyTimes();
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1").anyTimes();
expect(viewMock3.getContentType()).andReturn("application/json").anyTimes();
replay(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2, viewMock3);
@@ -229,8 +229,8 @@ public class ContentNegotiatingViewResolverTests {
expect(viewResolverMock1.resolveViewName(viewName, locale)).andReturn(viewMock1);
expect(viewResolverMock2.resolveViewName(viewName, locale)).andReturn(viewMock2);
expect(viewMock1.getContentType()).andReturn("application/xml");
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1");
expect(viewMock1.getContentType()).andReturn("application/xml").anyTimes();
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1").anyTimes();
replay(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2);
@@ -269,9 +269,9 @@ public class ContentNegotiatingViewResolverTests {
expect(viewResolverMock1.resolveViewName(viewName, locale)).andReturn(viewMock1);
expect(viewResolverMock2.resolveViewName(viewName, locale)).andReturn(viewMock2);
expect(viewMock1.getContentType()).andReturn("application/xml");
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1");
expect(viewMock3.getContentType()).andReturn("application/json");
expect(viewMock1.getContentType()).andReturn("application/xml").anyTimes();
expect(viewMock2.getContentType()).andReturn("text/html;charset=ISO-8859-1").anyTimes();
expect(viewMock3.getContentType()).andReturn("application/json").anyTimes();
replay(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2, viewMock3);
@@ -296,7 +296,7 @@ public class ContentNegotiatingViewResolverTests {
Locale locale = Locale.ENGLISH;
expect(viewResolverMock.resolveViewName(viewName, locale)).andReturn(viewMock);
expect(viewMock.getContentType()).andReturn(null);
expect(viewMock.getContentType()).andReturn(null).anyTimes();
replay(viewResolverMock, viewMock);
@@ -321,7 +321,7 @@ public class ContentNegotiatingViewResolverTests {
Locale locale = Locale.ENGLISH;
expect(viewResolverMock.resolveViewName(viewName, locale)).andReturn(viewMock);
expect(viewMock.getContentType()).andReturn("application/pdf");
expect(viewMock.getContentType()).andReturn("application/pdf").anyTimes();
replay(viewResolverMock, viewMock);
@@ -347,7 +347,7 @@ public class ContentNegotiatingViewResolverTests {
Locale locale = Locale.ENGLISH;
expect(viewResolverMock.resolveViewName(viewName, locale)).andReturn(viewMock);
expect(viewMock.getContentType()).andReturn("application/pdf");
expect(viewMock.getContentType()).andReturn("application/pdf").anyTimes();
replay(viewResolverMock, viewMock);