Polish StringHttpMessageConverterTests

Author: sbrannen

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

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
@@ -30,38 +29,33 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
+ * Tests for {@link StringHttpMessageConverter}.
+ *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
-public class StringHttpMessageConverterTests {
-
-	public static final MediaType TEXT_PLAIN_UTF_8 = new MediaType("text", "plain", StandardCharsets.UTF_8);
+class StringHttpMessageConverterTests {
 
-	private StringHttpMessageConverter converter;
+	private static final MediaType TEXT_PLAIN_UTF_8 = new MediaType("text", "plain", StandardCharsets.UTF_8);
 
-	private MockHttpOutputMessage outputMessage;
+	private final StringHttpMessageConverter converter = new StringHttpMessageConverter();
 
-
-	@BeforeEach
-	public void setUp() {
-		this.converter = new StringHttpMessageConverter();
-		this.outputMessage = new MockHttpOutputMessage();
-	}
+	private final MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
 
 
 	@Test
-	public void canRead() {
+	void canRead() {
 		assertThat(this.converter.canRead(String.class, MediaType.TEXT_PLAIN)).isTrue();
 	}
 
 	@Test
-	public void canWrite() {
+	void canWrite() {
 		assertThat(this.converter.canWrite(String.class, MediaType.TEXT_PLAIN)).isTrue();
 		assertThat(this.converter.canWrite(String.class, MediaType.ALL)).isTrue();
 	}
 
 	@Test
-	public void read() throws IOException {
+	void read() throws IOException {
 		String body = "Hello World";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(TEXT_PLAIN_UTF_8);
@@ -71,7 +65,7 @@ public void read() throws IOException {
 	}
 
 	@Test
-	public void readWithContentLengthHeader() throws IOException {
+	void readWithContentLengthHeader() throws IOException {
 		String body = "Hello World";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentLength(body.length());
@@ -82,7 +76,7 @@ public void readWithContentLengthHeader() throws IOException {
 	}
 
 	@Test // gh-24123
-	public void readJson() throws IOException {
+	void readJson() throws IOException {
 		String body = "{\"result\":\"\u0414\u0410\"}";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(MediaType.APPLICATION_JSON);
@@ -92,7 +86,7 @@ public void readJson() throws IOException {
 	}
 
 	@Test // gh-25328
-	public void readJsonApi() throws IOException {
+	void readJsonApi() throws IOException {
 		String body = "{\"result\":\"\u0414\u0410\"}";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes(StandardCharsets.UTF_8));
 		inputMessage.getHeaders().setContentType(new MediaType("application", "vnd.api.v1+json"));
@@ -102,31 +96,31 @@ public void readJsonApi() throws IOException {
 	}
 
 	@Test
-	public void writeDefaultCharset() throws IOException {
+	void writeDefaultCharset() throws IOException {
 		String body = "H\u00e9llo W\u00f6rld";
 		this.converter.write(body, null, this.outputMessage);
 
 		HttpHeaders headers = this.outputMessage.getHeaders();
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.ISO_8859_1)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(new MediaType("text", "plain", StandardCharsets.ISO_8859_1));
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes(StandardCharsets.ISO_8859_1).length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 	@Test  // gh-24123
-	public void writeJson() throws IOException {
+	void writeJson() throws IOException {
 		String body = "{\"føø\":\"bår\"}";
 		this.converter.write(body, MediaType.APPLICATION_JSON, this.outputMessage);
 
 		HttpHeaders headers = this.outputMessage.getHeaders();
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(MediaType.APPLICATION_JSON);
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes(StandardCharsets.UTF_8).length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 	@Test  // gh-25328
-	public void writeJsonApi() throws IOException {
+	void writeJsonApi() throws IOException {
 		String body = "{\"føø\":\"bår\"}";
 		MediaType contentType = new MediaType("application", "vnd.api.v1+json");
 		this.converter.write(body, contentType, this.outputMessage);
@@ -135,23 +129,23 @@ public void writeJsonApi() throws IOException {
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(contentType);
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes(StandardCharsets.UTF_8).length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 	@Test
-	public void writeUTF8() throws IOException {
+	void writeUTF8() throws IOException {
 		String body = "H\u00e9llo W\u00f6rld";
 		this.converter.write(body, TEXT_PLAIN_UTF_8, this.outputMessage);
 
 		HttpHeaders headers = this.outputMessage.getHeaders();
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(TEXT_PLAIN_UTF_8);
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes(StandardCharsets.UTF_8).length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 	@Test  // SPR-8867
-	public void writeOverrideRequestedContentType() throws IOException {
+	void writeOverrideRequestedContentType() throws IOException {
 		String body = "H\u00e9llo W\u00f6rld";
 		MediaType requestedContentType = new MediaType("text", "html");
 
@@ -162,19 +156,19 @@ public void writeOverrideRequestedContentType() throws IOException {
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.UTF_8)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(TEXT_PLAIN_UTF_8);
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes(StandardCharsets.UTF_8).length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 	@Test // gh-24283
-	public void writeWithWildCardMediaType() throws IOException {
+	void writeWithWildCardMediaType() throws IOException {
 		String body = "Hello World";
 		this.converter.write(body, MediaType.ALL, this.outputMessage);
 
 		HttpHeaders headers = this.outputMessage.getHeaders();
 		assertThat(this.outputMessage.getBodyAsString(StandardCharsets.US_ASCII)).isEqualTo(body);
 		assertThat(headers.getContentType()).isEqualTo(new MediaType("text", "plain", StandardCharsets.ISO_8859_1));
 		assertThat(headers.getContentLength()).isEqualTo(body.getBytes().length);
-		assertThat(headers.getAcceptCharset().isEmpty()).isTrue();
+		assertThat(headers.getAcceptCharset()).isEmpty();
 	}
 
 }