Add Tern auto-installation for JavaScript (UnitTestBot#1781)

rudolf101 · web-flow · commit a5c0df487247 · 2023-02-10T16:32:58.000+03:00
diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogProcessor.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/JsDialogProcessor.kt
@@ -29,6 +29,8 @@ import settings.JsDynamicSettings
 import settings.JsExportsSettings.endComment
 import settings.JsExportsSettings.startComment
 import settings.JsPackagesSettings.mochaData
+import settings.JsPackagesSettings.nycData
+import settings.JsPackagesSettings.ternData
 import settings.JsTestGenerationSettings.dummyClassName
 import settings.PackageData
 import utils.JsCmdExec
@@ -56,9 +58,9 @@ object JsDialogProcessor {
         ) {
             override fun run(indicator: ProgressIndicator) {
                 invokeLater {
-                    if (!mochaData.findPackageByNpm(model.project.basePath!!, model.pathToNPM)) {
-                        installMissingRequirement(model.project, model.pathToNPM, mochaData)
-                    }
+                    checkAndInstallRequirement(model.project, model.pathToNPM, mochaData)
+                    checkAndInstallRequirement(model.project, model.pathToNPM, nycData)
+                    checkAndInstallRequirement(model.project, model.pathToNPM, ternData)
                     createDialog(model)?.let { dialogProcessor ->
                         if (!dialogProcessor.showAndGet()) return@invokeLater
                         // Since Tern.js accesses containing file, sync with file system required before test generation.
@@ -263,8 +265,21 @@ object JsDialogProcessor {
     }
 }
 
-// TODO(MINOR): Add indicator.text for each installation
-fun installMissingRequirement(project: Project, pathToNPM: String, requirement: PackageData) {
+fun checkAndInstallRequirement(
+    project: Project,
+    pathToNPM: String,
+    requirement: PackageData,
+) {
+    if (!requirement.findPackageByNpm(project.basePath!!, pathToNPM)) {
+        installMissingRequirement(project, pathToNPM, requirement)
+    }
+}
+
+private fun installMissingRequirement(
+    project: Project,
+    pathToNPM: String,
+    requirement: PackageData,
+) {
     val message = """
             Requirement is not installed:
             ${requirement.packageName}
diff --git a/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/NycSourceFileChooser.kt b/utbot-intellij-js/src/main/kotlin/org/utbot/intellij/plugin/language/js/NycSourceFileChooser.kt
@@ -24,7 +24,6 @@ class NycSourceFileChooser(val model: JsTestsModel) : TextFieldWithBrowseButton(
         addBrowseFolderListener(
             TextBrowseFolderListener(descriptor, model.project)
         )
-        nycData.findPackagePath() ?: installMissingRequirement(model.project, model.pathToNPM, nycData)
         text = (replaceSeparator(nycData.findPackagePath() ?: "Nyc was not found")
                 + OsProvider.getProviderByOs().npmPackagePostfix)
     }
diff --git a/utbot-js/src/main/kotlin/settings/JsPackagesSettings.kt b/utbot-js/src/main/kotlin/settings/JsPackagesSettings.kt
@@ -6,9 +6,7 @@ import utils.OsProvider
 object JsPackagesSettings {
     val mochaData: PackageData = PackageData("mocha", "-l")
     val nycData: PackageData = PackageData("nyc", "-g")
-
-    // TODO(MINOR): Add tern auto installation
-    val ternData: PackageData? = null
+    val ternData: PackageData = PackageData("tern", "-l")
 }
 
 data class PackageData(

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ class NycSourceFileChooser(val model: JsTestsModel) : TextFieldWithBrowseButton(`
`24`	`24`	`addBrowseFolderListener(`
`25`	`25`	`TextBrowseFolderListener(descriptor, model.project)`
`26`	`26`	`)`
`27`		`- nycData.findPackagePath() ?: installMissingRequirement(model.project, model.pathToNPM, nycData)`
`28`	`27`	`text = (replaceSeparator(nycData.findPackagePath() ?: "Nyc was not found")`
`29`	`28`	`+ OsProvider.getProviderByOs().npmPackagePostfix)`
`30`	`29`	`}`