diff options
Diffstat (limited to 'fop-core/src/test/java')
9 files changed, 26 insertions, 18 deletions
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java index 57443e15d..e604e5619 100644 --- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.StringWriter; +import java.nio.charset.StandardCharsets; import javax.xml.transform.Result; import javax.xml.transform.Source; @@ -183,7 +184,8 @@ public class FO2StructureTreeConverterTestCase { @Test public void testRemoveTableHeader() throws Exception { keepEmptyTags = false; - String fo = IOUtils.toString(getResource("table-artifact.fo"), "utf8").replace("role=\"artifact\"", ""); + String fo = IOUtils.toString(getResource("table-artifact.fo"), StandardCharsets.UTF_8) + .replace("role=\"artifact\"", ""); compare(fo, "<structure-tree-sequence>\n" + "<structure-tree xmlns=\"http://xmlgraphics.apache.org/fop/intermediate\" " + "xmlns:foi=\"http://xmlgraphics.apache.org/fop/internal\" " diff --git a/fop-core/src/test/java/org/apache/fop/afp/fonts/OutlineFontTestCase.java b/fop-core/src/test/java/org/apache/fop/afp/fonts/OutlineFontTestCase.java index f4c64d9f0..3c696164f 100644 --- a/fop-core/src/test/java/org/apache/fop/afp/fonts/OutlineFontTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/afp/fonts/OutlineFontTestCase.java @@ -18,6 +18,8 @@ /* $Id$ */ package org.apache.fop.afp.fonts; +import java.nio.charset.StandardCharsets; + import org.junit.Assert; import org.junit.Test; @@ -33,7 +35,8 @@ public class OutlineFontTestCase { } public static CharacterSet getCharacterSet() { - CharacterSet characterSet = new CharacterSet("00000000", "utf-8", CharacterSetType.SINGLE_BYTE, "", null, null); + CharacterSet characterSet = new CharacterSet("00000000", StandardCharsets.UTF_8.name(), + CharacterSetType.SINGLE_BYTE, "", null, null); characterSet.addCharacterSetOrientation(new CharacterSetOrientation(0, 0, 0, 0)); return characterSet; } diff --git a/fop-core/src/test/java/org/apache/fop/apps/FopConfBuilder.java b/fop-core/src/test/java/org/apache/fop/apps/FopConfBuilder.java index e99a83260..c337aa715 100644 --- a/fop-core/src/test/java/org/apache/fop/apps/FopConfBuilder.java +++ b/fop-core/src/test/java/org/apache/fop/apps/FopConfBuilder.java @@ -24,8 +24,8 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; +import java.nio.charset.StandardCharsets; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -309,13 +309,11 @@ public class FopConfBuilder implements FontConfigurator<FopConfBuilder> { transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); transformer.setOutputProperty(OutputKeys.METHOD, "xml"); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); - transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); + transformer.setOutputProperty(OutputKeys.ENCODING, StandardCharsets.UTF_8.name()); transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4"); try { transformer.transform(new DOMSource(fopConfDOM), - new StreamResult(new OutputStreamWriter(out, "UTF-8"))); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); + new StreamResult(new OutputStreamWriter(out, StandardCharsets.UTF_8))); } catch (TransformerException e) { throw new RuntimeException(e); } diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java index 9c2cd78e0..837ad8025 100644 --- a/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java +++ b/fop-core/src/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java @@ -28,7 +28,7 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.io.ObjectOutputStream; import java.nio.IntBuffer; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -104,7 +104,7 @@ public final class GenerateArabicTestData implements ArabicWordFormsConstants { FileInputStream fis = null; try { fis = new FileInputStream(spn); - LineNumberReader lr = new LineNumberReader(new InputStreamReader(fis, Charset.forName("UTF-8"))); + LineNumberReader lr = new LineNumberReader(new InputStreamReader(fis, StandardCharsets.UTF_8)); String wf; while ((wf = lr.readLine()) != null) { GlyphSequence igs = tf.mapCharsToGlyphs(wf); diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java index 18d15c384..d3345a893 100644 --- a/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java @@ -22,6 +22,7 @@ package org.apache.fop.pdf; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.MessageDigest; @@ -460,7 +461,7 @@ public class PDFEncryptionJCETestCase { IllegalBlockSizeException, BadPaddingException { MessageDigest sha256 = MessageDigest.getInstance("SHA-256"); String dataText = "Test data to encrypt."; - byte[] data = dataText.getBytes("UTF-8"); + byte[] data = dataText.getBytes(StandardCharsets.UTF_8); PDFEncryptionParams params = new PDFEncryptionParams(); params.setEncryptionLengthInBits(256); params.setUserPassword("userpassword"); @@ -486,7 +487,7 @@ public class PDFEncryptionJCETestCase { byte[] userKeySalt = new byte[8]; System.arraycopy(u, 32, userValSalt, 0, 8); System.arraycopy(u, 40, userKeySalt, 0, 8); - byte[] uPassBytes = params.getUserPassword().getBytes("UTF-8"); + byte[] uPassBytes = params.getUserPassword().getBytes(StandardCharsets.UTF_8); byte[] testUPass = new byte[uPassBytes.length + 8]; System.arraycopy(uPassBytes, 0, testUPass, 0, uPassBytes.length); System.arraycopy(userValSalt, 0, testUPass, uPassBytes.length, 8); @@ -501,7 +502,7 @@ public class PDFEncryptionJCETestCase { byte[] ownerKeySalt = new byte[8]; System.arraycopy(o, 32, ownerValSalt, 0, 8); System.arraycopy(o, 40, ownerKeySalt, 0, 8); - byte[] oPassBytes = params.getOwnerPassword().getBytes("UTF-8"); + byte[] oPassBytes = params.getOwnerPassword().getBytes(StandardCharsets.UTF_8); byte[] testOPass = new byte[oPassBytes.length + 8 + 48]; System.arraycopy(oPassBytes, 0, testOPass, 0, oPassBytes.length); System.arraycopy(ownerValSalt, 0, testOPass, oPassBytes.length, 8); diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFStructureTreeTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFStructureTreeTestCase.java index d66159fd2..27b0bea12 100644 --- a/fop-core/src/test/java/org/apache/fop/pdf/PDFStructureTreeTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFStructureTreeTestCase.java @@ -21,7 +21,7 @@ package org.apache.fop.pdf; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.IOException; +import java.nio.charset.StandardCharsets; import javax.xml.transform.Result; import javax.xml.transform.Source; @@ -79,14 +79,14 @@ public class PDFStructureTreeTestCase { } private ByteArrayOutputStream foToOutput(String fo) - throws IOException, SAXException, TransformerException { + throws SAXException, TransformerException { FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI()); FOUserAgent userAgent = fopFactory.newFOUserAgent(); userAgent.setAccessibility(true); ByteArrayOutputStream bos = new ByteArrayOutputStream(); Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, bos); Transformer transformer = TransformerFactory.newInstance().newTransformer(); - Source src = new StreamSource(new ByteArrayInputStream(fo.getBytes("UTF-8"))); + Source src = new StreamSource(new ByteArrayInputStream(fo.getBytes(StandardCharsets.UTF_8))); Result res = new SAXResult(fop.getDefaultHandler()); transformer.transform(src, res); return bos; diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java index e3705271a..747a88ea5 100644 --- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java +++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java @@ -21,6 +21,7 @@ package org.apache.fop.render.afp; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -90,7 +91,7 @@ public class AFPParser { } else if ("TRN".equals(PTOCA_MAP.get(functionType))) { byte[] data = new byte[len - 2]; bis.read(data); - sb.append(" " + new String(data, "UTF-16BE")); + sb.append(" " + new String(data, StandardCharsets.UTF_16BE)); } else { bis.skip(len - 2); } diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java index c8baf8ad7..b702e1264 100644 --- a/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java @@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import org.junit.Test; @@ -184,7 +185,7 @@ public class ImageHandlingTestCase extends AbstractPostScriptTest { + "rotate=\"30 30 0 15\">Hello SVG with FOP</text>\n" + "</svg>"; SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(null); - Document doc = factory.createDocument(null, IOUtils.toInputStream(svg, "utf-8")); + Document doc = factory.createDocument(null, IOUtils.toInputStream(svg, StandardCharsets.UTF_8)); ByteArrayOutputStream bos = new ByteArrayOutputStream(); new PSImageHandlerSVG().handleImage( new PSRenderingContext(ua, new PSGenerator(bos), new FontInfo()), diff --git a/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java b/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java index 80e40dbfd..1b7ad1962 100644 --- a/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java @@ -22,6 +22,7 @@ package org.apache.fop.render.ps.svg; import java.awt.Color; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.junit.Test; @@ -68,7 +69,8 @@ public class GradientTestCase { svgGraphics2D.setGraphicContext(new GraphicContext()); svgGraphics2D.translate(100, 100); svgGraphics2D.applyPaint(gradient, true); - String expected = IOUtils.toString(getClass().getResourceAsStream(expectedResourceName), "utf-8"); + String expected = IOUtils.toString( + getClass().getResourceAsStream(expectedResourceName), StandardCharsets.UTF_8); assertEquals(expected.replace("\r", ""), out.toString()); } |