Skip to content

Commit

Permalink
Polishing contribution
Browse files Browse the repository at this point in the history 
See spring-projectsgh-1885
  • Loading branch information
@rstoyanchev @stsypanov
rstoyanchev authored and stsypanov committed Nov 17, 2019
1 parent 83ade3b commit 69663da
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 43 deletions.
2 changes: 1 addition & 1 deletion ...in/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 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.
Expand Down
39 changes: 19 additions & 20 deletions .../test/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverterTests.java
View file
Expand Up @@ -21,15 +21,12 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.rometools.rome.feed.atom.Entry;
import com.rometools.rome.feed.atom.Feed;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import org.xmlunit.diff.DefaultNodeMatcher;
import org.xmlunit.diff.ElementSelectors;
import org.xmlunit.diff.NodeMatcher;
Expand All @@ -47,6 +44,10 @@
*/
public class AtomFeedHttpMessageConverterTests {

private static final MediaType ATOM_XML_UTF8 =
new MediaType(MediaType.APPLICATION_ATOM_XML, StandardCharsets.UTF_8);


private AtomFeedHttpMessageConverter converter;


Expand All @@ -58,21 +59,21 @@ public void setUp() {

@Test
public void canRead() {
assertThat(converter.canRead(Feed.class, new MediaType("application", "atom+xml"))).isTrue();
assertThat(converter.canRead(Feed.class, new MediaType("application", "atom+xml", StandardCharsets.UTF_8))).isTrue();
assertThat(converter.canRead(Feed.class, MediaType.APPLICATION_ATOM_XML)).isTrue();
assertThat(converter.canRead(Feed.class, ATOM_XML_UTF8)).isTrue();
}

@Test
public void canWrite() {
assertThat(converter.canWrite(Feed.class, new MediaType("application", "atom+xml"))).isTrue();
assertThat(converter.canWrite(Feed.class, new MediaType("application", "atom+xml", StandardCharsets.UTF_8))).isTrue();
assertThat(converter.canWrite(Feed.class, MediaType.APPLICATION_ATOM_XML)).isTrue();
assertThat(converter.canWrite(Feed.class, ATOM_XML_UTF8)).isTrue();
}

@Test
public void read() throws IOException {
InputStream is = getClass().getResourceAsStream("atom.xml");
MockHttpInputMessage inputMessage = new MockHttpInputMessage(is);
inputMessage.getHeaders().setContentType(new MediaType("application", "atom+xml", StandardCharsets.UTF_8));
inputMessage.getHeaders().setContentType(ATOM_XML_UTF8);
Feed result = converter.read(Feed.class, inputMessage);
assertThat(result.getTitle()).isEqualTo("title");
assertThat(result.getSubtitle().getValue()).isEqualTo("subtitle");
Expand All @@ -89,7 +90,7 @@ public void read() throws IOException {
}

@Test
public void write() throws IOException, SAXException {
public void write() throws IOException {
Feed feed = new Feed("atom_1.0");
feed.setTitle("title");

Expand All @@ -111,7 +112,7 @@ public void write() throws IOException, SAXException {

assertThat(outputMessage.getHeaders().getContentType())
.as("Invalid content-type")
.isEqualTo(new MediaType("application", "atom+xml", StandardCharsets.UTF_8));
.isEqualTo(ATOM_XML_UTF8);
String expected = "<feed xmlns=\"http://www.w3.org/2005/Atom\">" + "<title>title</title>" +
"<entry><id>id1</id><title>title1</title></entry>" +
"<entry><id>id2</id><title>title2</title></entry></feed>";
Expand All @@ -121,7 +122,7 @@ public void write() throws IOException, SAXException {
}

@Test
public void writeOtherCharset() throws IOException, SAXException {
public void writeOtherCharset() throws IOException {
Feed feed = new Feed("atom_1.0");
feed.setTitle("title");
String encoding = "ISO-8859-1";
Expand All @@ -137,17 +138,15 @@ public void writeOtherCharset() throws IOException, SAXException {

@Test
public void writeOtherContentTypeParameters() throws IOException {
Feed feed = new Feed("atom_1.0");
MockHttpOutputMessage message = new MockHttpOutputMessage();
MediaType contentType = new MediaType("application", "atom+xml", singletonMap("type", "feed"));
converter.write(new Feed("atom_1.0"), contentType, message);

MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
converter.write(feed, new MediaType("application", "atom+xml", singletonMap("type", "feed")), outputMessage);

Map<String, String> expectedParameters = new HashMap<>();
expectedParameters.put("charset", "UTF-8");
expectedParameters.put("type", "feed");
assertThat(outputMessage.getHeaders().getContentType())
assertThat(message.getHeaders().getContentType().getParameters())
.as("Invalid content-type")
.isEqualTo(new MediaType("application", "atom+xml", expectedParameters));
.hasSize(2)
.containsEntry("type", "feed")
.containsEntry("charset", "UTF-8");
}

}
41 changes: 19 additions & 22 deletions ...est/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java
View file
Expand Up @@ -21,15 +21,12 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.rometools.rome.feed.rss.Channel;
import com.rometools.rome.feed.rss.Item;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;

import org.springframework.http.MediaType;
import org.springframework.http.MockHttpInputMessage;
Expand All @@ -44,6 +41,10 @@
*/
public class RssChannelHttpMessageConverterTests {

private static final MediaType RSS_XML_UTF8 =
new MediaType(MediaType.APPLICATION_RSS_XML, StandardCharsets.UTF_8);


private RssChannelHttpMessageConverter converter;


Expand All @@ -54,22 +55,19 @@ public void setUp() {


@Test
public void canRead() {
assertThat(converter.canRead(Channel.class, new MediaType("application", "rss+xml"))).isTrue();
assertThat(converter.canRead(Channel.class, new MediaType("application", "rss+xml", StandardCharsets.UTF_8))).isTrue();
}
public void canReadAndWrite() {
assertThat(converter.canRead(Channel.class, MediaType.APPLICATION_RSS_XML)).isTrue();
assertThat(converter.canRead(Channel.class, RSS_XML_UTF8)).isTrue();

@Test
public void canWrite() {
assertThat(converter.canWrite(Channel.class, new MediaType("application", "rss+xml"))).isTrue();
assertThat(converter.canWrite(Channel.class, new MediaType("application", "rss+xml", StandardCharsets.UTF_8))).isTrue();
assertThat(converter.canWrite(Channel.class, MediaType.APPLICATION_RSS_XML)).isTrue();
assertThat(converter.canWrite(Channel.class, RSS_XML_UTF8)).isTrue();
}

@Test
public void read() throws IOException {
InputStream is = getClass().getResourceAsStream("rss.xml");
MockHttpInputMessage inputMessage = new MockHttpInputMessage(is);
inputMessage.getHeaders().setContentType(new MediaType("application", "rss+xml", StandardCharsets.UTF_8));
inputMessage.getHeaders().setContentType(RSS_XML_UTF8);
Channel result = converter.read(Channel.class, inputMessage);
assertThat(result.getTitle()).isEqualTo("title");
assertThat(result.getLink()).isEqualTo("https://example.com");
Expand All @@ -86,7 +84,7 @@ public void read() throws IOException {
}

@Test
public void write() throws IOException, SAXException {
public void write() throws IOException {
Channel channel = new Channel("rss_2.0");
channel.setTitle("title");
channel.setLink("https://example.com");
Expand All @@ -108,7 +106,7 @@ public void write() throws IOException, SAXException {

assertThat(outputMessage.getHeaders().getContentType())
.as("Invalid content-type")
.isEqualTo(new MediaType("application", "rss+xml", StandardCharsets.UTF_8));
.isEqualTo(RSS_XML_UTF8);
String expected = "<rss version=\"2.0\">" +
"<channel><title>title</title><link>https://example.com</link><description>description</description>" +
"<item><title>title1</title></item>" +
Expand All @@ -119,7 +117,7 @@ public void write() throws IOException, SAXException {
}

@Test
public void writeOtherCharset() throws IOException, SAXException {
public void writeOtherCharset() throws IOException {
Channel channel = new Channel("rss_2.0");
channel.setTitle("title");
channel.setLink("https://example.com");
Expand All @@ -146,15 +144,14 @@ public void writeOtherContentTypeParameters() throws IOException {
channel.setLink("http://example.com");
channel.setDescription("description");

MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
converter.write(channel, new MediaType("application", "rss+xml", singletonMap("x", "y")), outputMessage);
MockHttpOutputMessage message = new MockHttpOutputMessage();
converter.write(channel, new MediaType("application", "rss+xml", singletonMap("x", "y")), message);

Map<String, String> expectedParameters = new HashMap<>();
expectedParameters.put("charset", "UTF-8");
expectedParameters.put("x", "y");
assertThat(outputMessage.getHeaders().getContentType())
assertThat(message.getHeaders().getContentType().getParameters())
.as("Invalid content-type")
.isEqualTo(new MediaType("application", "rss+xml", expectedParameters));
.hasSize(2)
.containsEntry("x", "y")
.containsEntry("charset", "UTF-8");
}

}

0 comments on commit 69663da

Please sign in to comment.