@@ -182,10 +182,10 @@ protected InputStream getXmlInputStream(final String bomType, final String xmlTy
182182 return new ByteArrayInputStream (baos .toByteArray ());
183183 }
184184
185- private void parseCharset (final String hdr , final String enc , final IOFunction <InputStream , XmlStreamReader > factory ) throws Exception {
186- try (InputStream stream = new ByteArrayInputStream (hdr .getBytes (StandardCharsets .UTF_8 ))) {
185+ private void parseCharset (final String value , final String charsetName , final IOFunction <InputStream , XmlStreamReader > factory ) throws Exception {
186+ try (InputStream stream = new ByteArrayInputStream (value .getBytes (StandardCharsets .UTF_8 ))) {
187187 try (XmlStreamReader xml = factory .apply (stream )) {
188- assertEquals (enc .toUpperCase (Locale .ROOT ), xml .getEncoding (), enc );
188+ assertEquals (charsetName .toUpperCase (Locale .ROOT ), xml .getEncoding (), charsetName );
189189 }
190190 }
191191 }
@@ -461,15 +461,15 @@ public void testHttpValid(final String cT, final String bomEnc, final String str
461461
462462 @ ParameterizedTest (name = "{0}" )
463463 @ MethodSource (CharsetsTest .AVAIL_CHARSETS )
464- public void testIO_815 (final String csName ) throws Exception {
465- final MessageFormat fmt = new MessageFormat ("<?xml version=\" 1.0\" encoding=''{0}''?>\n <root>text</root>" );
464+ public void testIO_815 (final String charsetName ) throws Exception {
465+ final MessageFormat messageFormat = new MessageFormat ("<?xml version=\" 1.0\" encoding=''{0}''?>\n <root>text</root>" );
466466 final IOFunction <InputStream , XmlStreamReader > factoryCtor = XmlStreamReader ::new ;
467467 final IOFunction <InputStream , XmlStreamReader > factoryBuilder = stream -> XmlStreamReader .builder ().setInputStream (stream ).get ();
468- parseCharset (fmt .format (new Object [] { csName }), csName , factoryCtor );
469- parseCharset (fmt .format (new Object [] { csName }), csName , factoryBuilder );
470- for (final String alias : Charset .forName (csName ).aliases ()) {
471- parseCharset (fmt .format (new Object [] { alias }), alias , factoryCtor );
472- parseCharset (fmt .format (new Object [] { alias }), alias , factoryBuilder );
468+ parseCharset (messageFormat .format (new Object [] { charsetName }), charsetName , factoryCtor );
469+ parseCharset (messageFormat .format (new Object [] { charsetName }), charsetName , factoryBuilder );
470+ for (final String alias : Charset .forName (charsetName ).aliases ()) {
471+ parseCharset (messageFormat .format (new Object [] { alias }), alias , factoryCtor );
472+ parseCharset (messageFormat .format (new Object [] { alias }), alias , factoryBuilder );
473473 }
474474 }
475475
0 commit comments