[commons-configuration] 01/04: Reuse Commons IO in unit tests.

[gg...@apache.org]

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-configuration.git

commit 5d1197ce7dbeceb0e574ba412b46b2c935e2e91c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 15 13:11:19 2022 -0400

    Reuse Commons IO in unit tests.
---
 pom.xml                                               |  7 +++++++
 .../TestDynamicCombinedConfiguration.java             | 19 +++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 746ae827..168b15f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,6 +425,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.11.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
diff --git a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
index 2bd3f237..8f0515c7 100644
--- a/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
+++ b/src/test/java/org/apache/commons/configuration2/TestDynamicCombinedConfiguration.java
@@ -25,11 +25,8 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
+import java.nio.file.StandardCopyOption;
 import java.util.Random;
 
 import org.apache.commons.configuration2.SynchronizerTestImpl.Methods;
@@ -50,9 +47,10 @@ import org.apache.commons.configuration2.io.FileHandler;
 import org.apache.commons.configuration2.sync.LockMode;
 import org.apache.commons.configuration2.sync.ReadWriteSynchronizer;
 import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
+import org.apache.commons.io.FileUtils;
 import org.junit.BeforeClass;
-import org.junit.Test;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 public class TestDynamicCombinedConfiguration {
@@ -170,6 +168,7 @@ public class TestDynamicCombinedConfiguration {
 
         }
     }
+
     private static final String PATTERN = "${sys:Id}";
     private static final String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml";
 
@@ -198,15 +197,7 @@ public class TestDynamicCombinedConfiguration {
     public TemporaryFolder folder = new TemporaryFolder();
 
     private void copyFile(final File input, final File output) throws IOException {
-        final Reader reader = new FileReader(input);
-        final Writer writer = new FileWriter(output);
-        final char[] buffer = new char[4096];
-        int n = 0;
-        while (-1 != (n = reader.read(buffer))) {
-            writer.write(buffer, 0, n);
-        }
-        reader.close();
-        writer.close();
+        FileUtils.copyFile(input, output, StandardCopyOption.REPLACE_EXISTING);
     }
 
     /**