Remove use of some deprecated functions (#311)

Summary: Pull Request resolved: #311 Reviewed By: hick209 Differential Revision: D35794473 Pulled By: strulovich fbshipit-source-id: 954089c3a824a4da7ba5f506d961199be8a75abd
facebook · Apr 25, 2022 · bb66293 · bb66293
1 parent 8f8d12b
commit bb66293
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -151,6 +151,11 @@
             <artifactId>kotlin-stdlib-jdk7</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-compiler-embeddable</artifactId>

diff --git a/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt b/core/src/test/java/com/facebook/ktfmt/cli/ParsedArgsTest.kt
@@ -22,7 +22,8 @@ import com.google.common.truth.Truth.assertThat
 import java.io.ByteArrayOutputStream
 import java.io.FileNotFoundException
 import java.io.PrintStream
-import junit.framework.Assert.fail
+import kotlin.io.path.createTempDirectory
+import kotlin.test.assertFailsWith
 import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -32,7 +33,7 @@ import org.junit.runners.JUnit4
 @RunWith(JUnit4::class)
 class ParsedArgsTest {
 
-  private val root = createTempDir()
+  private val root = createTempDirectory().toFile()
 
   @After
   fun tearDown() {
@@ -132,12 +133,11 @@ class ParsedArgsTest {
   fun `processArgs use the @file option with non existing file`() {
     val out = ByteArrayOutputStream()
 
-    try {
-      ParsedArgs.processArgs(PrintStream(out), arrayOf("@non-existing-file"))
-      fail("expected an exception of type FileNotFoundException but nothing was thrown")
-    } catch (e: FileNotFoundException) {
-      assertThat(e.message).contains("non-existing-file (No such file or directory)")
-    }
+    val e =
+        assertFailsWith<FileNotFoundException> {
+          ParsedArgs.processArgs(PrintStream(out), arrayOf("@non-existing-file"))
+        }
+    assertThat(e.message).contains("non-existing-file (No such file or directory)")
   }
 
   @Test