Tests: use StandardCharsets.UTF_8 instead of "UTF-8" in a few strea…

…m constructors
css4j · Jul 10, 2024 · 83ff03e · 83ff03e
1 parent 66b678d
commit 83ff03e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/JPainterCompare.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/test/JPainterCompare.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -140,15 +141,16 @@ public JPainterCompare(Painter painter) {
 		try {
 			tmpFile = File.createTempFile(CONFIG_TMP_FILE_PREFIX, ".svg");
 
-			OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(tmpFile), "UTF-8");
+			OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(tmpFile),
+					StandardCharsets.UTF_8);
 
 			painter.paint(g2d);
 			g2d.stream(osw);
 			osw.flush();
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new IllegalArgumentException(
-					Messages.formatMessage(ERROR_COULD_NOT_TRANSCODE_TO_SVG, new Object[] { e.getClass().getName() }));
+			throw new IllegalArgumentException(Messages.formatMessage(
+					ERROR_COULD_NOT_TRANSCODE_TO_SVG, new Object[] { e.getClass().getName() }));
 		}
 
 		//
@@ -165,8 +167,8 @@ public JPainterCompare(Painter painter) {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-			throw new Error(
-					Messages.formatMessage(ERROR_COULD_NOT_CONVERT_FILE_PATH_TO_URL, new Object[] { e.getMessage() }));
+			throw new Error(Messages.formatMessage(
+					ERROR_COULD_NOT_CONVERT_FILE_PATH_TO_URL, new Object[] { e.getMessage() }));
 		}
 
 		if (l.success) {

diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/test/TranscoderInputTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/test/TranscoderInputTest.java
@@ -26,6 +26,7 @@
 import java.io.Reader;
 import java.io.StringWriter;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -92,7 +93,7 @@ public void test() throws Exception {
 		{
 			URL uri = new URL(TEST_URI);
 			InputStream is = uri.openStream();
-			Reader r = new InputStreamReader(is, "utf-8");
+			Reader r = new InputStreamReader(is, StandardCharsets.UTF_8);
 			TranscoderInput ti = new TranscoderInput(r);
 			ti.setURI(TEST_URI);
 			t = new TestTranscoder();

diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/wmf/test/WMFAccuracyTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/transcoder/wmf/test/WMFAccuracyTest.java
@@ -28,6 +28,7 @@
 import java.io.OutputStreamWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
 
@@ -129,7 +130,7 @@ private void runTest(String filename) throws IOException, TranscoderException {
 		input = new TranscoderInput(wmfURL.toString());
 
 		OutputStreamWriter outW;
-		outW = new OutputStreamWriter(out, "UTF-8");
+		outW = new OutputStreamWriter(out, StandardCharsets.UTF_8);
 		TranscoderOutput output = new TranscoderOutput(outW);
 
 		wmft.transcode(input, output);