test/refactor: use kotlin file api instead of commons.io.FileUtils, more concise

Author: oldratlee

library/pom.xml

@@ -57,11 +57,6 @@
 
 	<dependencies>
 		<!-- Testing libs -->
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>

library/src/test/java/com/alibaba/dcm/agent/DcmAgentTests.kt

@@ -9,11 +9,8 @@ import io.kotest.matchers.nulls.shouldBeNull
 import io.kotest.matchers.nulls.shouldNotBeNull
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldContain
-import org.apache.commons.io.FileUtils
 import java.io.File
-
-
-private const val UTF8 = "UTF-8"
+import java.nio.charset.StandardCharsets.UTF_8
 
 
 /**
@@ -43,7 +40,7 @@ class DcmAgentTests : AnnotationSpec() {
     fun test_agentmain_file() {
         DcmAgent.agentmain("file $outputFilePath")
 
-        val content = FileUtils.readLines(outputFile, UTF8)
+        val content = outputFile.readLines(UTF_8)
         content.first() shouldContain "No action in agent argument, do nothing!"
     }
 
@@ -60,7 +57,7 @@ class DcmAgentTests : AnnotationSpec() {
 
         DnsCacheManipulator.getDnsCache("bing.com")!!.ip shouldBe "1.2.3.4"
 
-        val content = FileUtils.readLines(outputFile, UTF8)
+        val content = outputFile.readLines(UTF_8)
         content.last() shouldBe DcmAgent.DCM_AGENT_SUCCESS_MARK_LINE
     }
 
@@ -157,7 +154,7 @@ class DcmAgentTests : AnnotationSpec() {
 
         DnsCacheManipulator.getDnsNegativeCachePolicy() shouldBe 1110
 
-        val content = FileUtils.readLines(outputFile, UTF8)
+        val content = outputFile.readLines(UTF_8)
         content.first() shouldContain "Error to do action setNegativePolicy"
         content.first() shouldContain "Action setNegativePolicy need more argument!"
     }
@@ -170,7 +167,7 @@ class DcmAgentTests : AnnotationSpec() {
 
         DnsCacheManipulator.getDnsNegativeCachePolicy() shouldBe 1111
 
-        val content = FileUtils.readLines(outputFile, UTF8)
+        val content = outputFile.readLines(UTF_8)
         content.first() shouldContain "Error to do action setNegativePolicy 737 HaHa"
         content.first() shouldContain "Too many arguments for action setNegativePolicy! arguments: [737, HaHa]"
     }
@@ -179,7 +176,7 @@ class DcmAgentTests : AnnotationSpec() {
     fun test_agentmain_unknownAction() {
         DcmAgent.agentmain("  unknownAction  arg1  arg2   file $outputFilePath")
 
-        val content = FileUtils.readLines(outputFile, UTF8)
+        val content = outputFile.readLines(UTF_8)
         content.first() shouldContain "No action in agent argument, do nothing!"
     }
 }

tool/src/test/java/com/alibaba/dcm/tool/DcmToolTests.kt

@@ -5,12 +5,10 @@ import io.kotest.core.spec.style.AnnotationSpec
 import io.kotest.core.test.config.TestCaseConfig
 import io.kotest.engine.spec.tempfile
 import io.kotest.matchers.shouldBe
-import org.apache.commons.io.FileUtils
 import org.apache.commons.lang3.SystemUtils
 import org.apache.maven.artifact.versioning.ComparableVersion
 import java.io.File
 import java.net.InetAddress
-import kotlin.streams.toList
 
 /**
  * https://kotest.io/docs/framework/testing-styles.html#annotation-spec
@@ -73,21 +71,19 @@ class DcmToolTests : AnnotationSpec() {
         if (!targetDir.exists()) return null
         println("Found target dir: ${targetDir.canonicalPath}")
 
-        return FileUtils.streamFiles(targetDir, false, "jar")
-                .filter { isAgentJar(it) }
-                .findFirst()
+        return targetDir.walk()
+                .filter { it.extension == "jar" && isAgentJar(it) }
                 .map { it.canonicalPath }
-                .orElse(null)
+                .firstOrNull()
     }
 
     private fun findAgentFileFromMavenLocal(): String? {
         val home: String = System.getProperty("user.home")
         val m2DcmLibDependencyDir = File("$home/.m2/repository/com/alibaba/dns-cache-manipulator")
 
-        return FileUtils.streamFiles(m2DcmLibDependencyDir, true, "jar")
-                .filter { isAgentJar(it) }
+        return m2DcmLibDependencyDir.walk()
+                .filter { it.extension == "jar" && isAgentJar(it) }
                 .map { it.canonicalPath }
-                .toList()
                 .maxWithOrNull(Comparator.comparing { ComparableVersion(it) })
     }