create tmp directory with utbot FileUtil

tochilinak · tochilinak · commit 97d3767e4098 · 2022-09-16T16:36:39.000+03:00
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt b/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationProcessor.kt
@@ -2,6 +2,7 @@ package org.utbot.python
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import org.utbot.common.FileUtil
 import org.utbot.framework.codegen.*
 import org.utbot.framework.codegen.model.CodeGenerator
 import org.utbot.framework.codegen.model.constructor.CgMethodTestSet
@@ -18,6 +19,7 @@ import org.utbot.python.utils.getLineOfFunction
 import java.io.File
 import java.nio.file.Path
 import kotlin.io.path.Path
+import kotlin.io.path.deleteExisting
 import kotlin.io.path.name
 import kotlin.io.path.pathString
 
@@ -57,7 +59,7 @@ object PythonTestGenerationProcessor {
         Cleaner.restart()
 
         try {
-            FileManager.assignTestSourceRoot(testSourceRoot)
+            FileManager.setup(testSourceRoot)
 
             if (!doNotCheckRequirements) {
                 checkingRequirementsAction()
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/utils/Cleaner.kt b/utbot-python/src/main/kotlin/org/utbot/python/utils/Cleaner.kt
@@ -6,8 +6,8 @@ object Cleaner {
     fun addFunction(f: () -> Unit) {
         val oldClean = clean
         val newClean = {
-            oldClean()
             f()
+            oldClean()
         }
         clean = newClean
     }
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/utils/FileManager.kt b/utbot-python/src/main/kotlin/org/utbot/python/utils/FileManager.kt
@@ -1,26 +1,30 @@
 package org.utbot.python.utils
 
+import org.utbot.common.FileUtil
 import java.io.File
+import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.io.path.deleteExisting
+import kotlin.io.path.exists
 
 object FileManager {
     private var testSourceRoot: String = ""
-    private const val tmpFolderName = ".tmp"
+    private lateinit var tmpDirectory: Path
     private var nextId = 0
 
-    fun assignTestSourceRoot(testSourceRoot: String) {
+    fun setup(testSourceRoot: String) {
+        tmpDirectory = FileUtil.createTempDirectory("python-test-generation")
+        Cleaner.addFunction { tmpDirectory.deleteExisting() }
+
         this.testSourceRoot = testSourceRoot
         val testsFolder = File(testSourceRoot)
         if (!testsFolder.exists())
             testsFolder.mkdirs()
-        val tmpFolder = Paths.get(testSourceRoot, tmpFolderName).toFile()
-        if (!tmpFolder.exists())
-            tmpFolder.mkdir()
     }
 
     fun assignTemporaryFile(fileName_: String? = null, tag: String? = null, addToCleaner: Boolean = true): File {
         val fileName = fileName_ ?: ("${nextId++}_" + (tag ?: ""))
-        val fullpath = Paths.get(testSourceRoot, tmpFolderName, fileName)
+        val fullpath = Paths.get(tmpDirectory.toString(), fileName)
         val result = fullpath.toFile()
         if (addToCleaner)
             Cleaner.addFunction { result.delete() }
diff --git a/utbot-python/todo.md b/utbot-python/todo.md
@@ -9,7 +9,7 @@
 
 ### Относительно мелкие задачи
 - [ ] переписать создание файлов на Psi Documents
-- [ ] создавать временную директорию в правильном месте
+- [x] создавать временную директорию в правильном месте
 - [ ] обрабатывать аргументы по имени (kwargs), *args, **kwargs
 - [ ] заменить klaxon на moshi
 - [ ] Более полный сбор конструкторов (учет наследования)

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ object Cleaner {`
`6`	`6`	`fun addFunction(f: () -> Unit) {`
`7`	`7`	`val oldClean = clean`
`8`	`8`	`val newClean = {`
`9`		`- oldClean()`
`10`	`9`	`f()`
	`10`	`+ oldClean()`
`11`	`11`	`}`
`12`	`12`	`clean = newClean`
`13`	`13`	`}`