From 7dcf8ae570f88e201944b2ad436dcd4d8cb8b874 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 29 Mar 2016 13:22:35 +0300 Subject: [PATCH] Refactoring: replace custom function to FileUtil.delete --- .../android/AbstractAndroidJpsTestCase.kt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt index 5c9a67e59dc..2ffe2e99b2b 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.build.android +import com.intellij.openapi.util.io.FileUtil import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.android.model.JpsAndroidSdkProperties import org.jetbrains.jps.model.JpsSimpleElement @@ -39,22 +40,7 @@ abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() { loadProject(path + getTestName(true) + ".ipr") rebuildAll() makeAll().assertSuccessful() - deleteDirectory(File(path + "/out")) - } - - fun deleteDirectory(path: File): Boolean { - if (path.exists() && path.isDirectory) { - val files = path.listFiles() - for (i in files.indices) { - if (files[i].isDirectory) { - deleteDirectory(files[i]) - } - else { - files[i].delete() - } - } - } - return (path.delete()) + FileUtil.delete(File(path + "/out")) } private fun addJdkAndAndroidSdk(): JpsSdk> {