(commons-io) branch master updated: Better local variable names

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f0d8ed8f Better local variable names
6f0d8ed8f is described below

commit 6f0d8ed8f188fdeaa01c52027731f2146a0ee2f6
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 14 14:34:36 2025 -0400

    Better local variable names
---
 .../apache/commons/io/input/XmlStreamReaderTest.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java 
b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
index 2f2ba2413..49f8bbfa0 100644
--- a/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+++ b/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
@@ -182,10 +182,10 @@ protected InputStream getXmlInputStream(final String 
bomType, final String xmlTy
         return new ByteArrayInputStream(baos.toByteArray());
     }
 
-    private void parseCharset(final String hdr, final String enc, final 
IOFunction<InputStream, XmlStreamReader> factory) throws Exception {
-        try (InputStream stream = new 
ByteArrayInputStream(hdr.getBytes(StandardCharsets.UTF_8))) {
+    private void parseCharset(final String value, final String charsetName, 
final IOFunction<InputStream, XmlStreamReader> factory) throws Exception {
+        try (InputStream stream = new 
ByteArrayInputStream(value.getBytes(StandardCharsets.UTF_8))) {
             try (XmlStreamReader xml = factory.apply(stream)) {
-                assertEquals(enc.toUpperCase(Locale.ROOT), xml.getEncoding(), 
enc);
+                assertEquals(charsetName.toUpperCase(Locale.ROOT), 
xml.getEncoding(), charsetName);
             }
         }
     }
@@ -461,15 +461,15 @@ public void testHttpValid(final String cT, final String 
bomEnc, final String str
 
     @ParameterizedTest(name = "{0}")
     @MethodSource(CharsetsTest.AVAIL_CHARSETS)
-    public void testIO_815(final String csName) throws Exception {
-        final MessageFormat fmt = new MessageFormat("<?xml version=\"1.0\" 
encoding=''{0}''?>\n<root>text</root>");
+    public void testIO_815(final String charsetName) throws Exception {
+        final MessageFormat messageFormat = new MessageFormat("<?xml 
version=\"1.0\" encoding=''{0}''?>\n<root>text</root>");
         final IOFunction<InputStream, XmlStreamReader> factoryCtor = 
XmlStreamReader::new;
         final IOFunction<InputStream, XmlStreamReader> factoryBuilder = stream 
-> XmlStreamReader.builder().setInputStream(stream).get();
-        parseCharset(fmt.format(new Object[] { csName }), csName, factoryCtor);
-        parseCharset(fmt.format(new Object[] { csName }), csName, 
factoryBuilder);
-        for (final String alias : Charset.forName(csName).aliases()) {
-            parseCharset(fmt.format(new Object[] { alias }), alias, 
factoryCtor);
-            parseCharset(fmt.format(new Object[] { alias }), alias, 
factoryBuilder);
+        parseCharset(messageFormat.format(new Object[] { charsetName }), 
charsetName, factoryCtor);
+        parseCharset(messageFormat.format(new Object[] { charsetName }), 
charsetName, factoryBuilder);
+        for (final String alias : Charset.forName(charsetName).aliases()) {
+            parseCharset(messageFormat.format(new Object[] { alias }), alias, 
factoryCtor);
+            parseCharset(messageFormat.format(new Object[] { alias }), alias, 
factoryBuilder);
         }
     }