SPR-6686 - @ResponseBody throws HttpMediaTypeNotAcceptableException if client accepts "*/*"

org.springframework.web/src/test/java/org/springframework/http/converter/ByteArrayHttpMessageConverterTests.java

@@ -36,6 +36,17 @@ public class ByteArrayHttpMessageConverterTests {
 		converter = new ByteArrayHttpMessageConverter();
 	}
 
+	@Test
+	public void canRead() {
+		assertTrue(converter.canRead(byte[].class, new MediaType("application", "octet-stream")));
+	}
+
+	@Test
+	public void canWrite() {
+		assertTrue(converter.canWrite(byte[].class, new MediaType("application", "octet-stream")));
+		assertTrue(converter.canWrite(byte[].class, MediaType.ALL));
+	}
+
 	@Test
 	public void read() throws IOException {
 		byte[] body = new byte[]{0x1, 0x2};

org.springframework.web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java

@@ -40,6 +40,19 @@ public class FormHttpMessageConverterTests {
 		converter = new FormHttpMessageConverter();
 	}
 
+	@Test
+	@SuppressWarnings("unchecked")
+	public void canRead() {
+		assertTrue(converter.canRead((Class<? extends MultiValueMap<String, String>>) MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded")));
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	public void canWrite() {
+		assertTrue(converter.canWrite((Class<? extends MultiValueMap<String, String>>) MultiValueMap.class, new MediaType("application", "x-www-form-urlencoded")));
+		assertTrue(converter.canWrite((Class<? extends MultiValueMap<String, String>>) MultiValueMap.class, MediaType.ALL));
+	}
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void read() throws Exception {

org.springframework.web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java

@@ -0,0 +1,98 @@
+/*
+ * 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.
+ * 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.http.converter;
+
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.MediaType;
+
+/**
+ * Test-case for AbstractHttpMessageConverter.
+ *
+ * @author Arjen Poutsma
+ */
+public class HttpMessageConverterTests {
+
+	private static final MediaType MEDIA_TYPE = new MediaType("foo", "bar");
+
+	@Test
+	public void canRead() {
+		AbstractHttpMessageConverter<MyType> converter = new MyHttpMessageConverter<MyType>(MEDIA_TYPE) {
+			@Override
+			protected boolean supports(Class<? extends MyType> clazz) {
+				return MyType.class.equals(clazz);
+			}
+
+		};
+
+		assertTrue(converter.canRead(MyType.class, MEDIA_TYPE));
+		assertFalse(converter.canRead(MyType.class, new MediaType("foo", "*")));
+		assertFalse(converter.canRead(MyType.class, MediaType.ALL));
+	}
+	
+	@Test
+	public void canWrite() {
+		AbstractHttpMessageConverter<MyType> converter = new MyHttpMessageConverter<MyType>(MEDIA_TYPE) {
+			@Override
+			protected boolean supports(Class<? extends MyType> clazz) {
+				return MyType.class.equals(clazz);
+			}
+
+		};
+
+		assertTrue(converter.canWrite(MyType.class, MEDIA_TYPE));
+		assertTrue(converter.canWrite(MyType.class, new MediaType("foo", "*")));
+		assertTrue(converter.canWrite(MyType.class, MediaType.ALL));
+	}
+
+
+	private static class MyHttpMessageConverter<T> extends AbstractHttpMessageConverter<T> {
+
+		private MyHttpMessageConverter(MediaType supportedMediaType) {
+			super(supportedMediaType);
+		}
+
+		@Override
+		protected boolean supports(Class<? extends T> clazz) {
+			fail("Not expected");
+			return false;
+		}
+
+		@Override
+		protected T readInternal(Class<T> clazz, HttpInputMessage inputMessage)
+				throws IOException, HttpMessageNotReadableException {
+			fail("Not expected");
+			return null;
+		}
+
+		@Override
+		protected void writeInternal(T t, HttpOutputMessage outputMessage)
+				throws IOException, HttpMessageNotWritableException {
+			fail("Not expected");
+		}
+	}
+
+	private static class MyType {
+
+	}
+}

org.springframework.web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java

@@ -37,6 +37,17 @@ public class StringHttpMessageConverterTests {
 		converter = new StringHttpMessageConverter();
 	}
 
+	@Test
+	public void canRead() {
+		assertTrue(converter.canRead(String.class, new MediaType("text", "plain")));
+	}
+
+	@Test
+	public void canWrite() {
+		assertTrue(converter.canWrite(String.class, new MediaType("text", "plain")));
+		assertTrue(converter.canWrite(String.class, MediaType.ALL));
+	}
+
 	@Test
 	public void read() throws IOException {
 		String body = "Hello World";