Merge branch 'main' into Vassiliy-Kudryashov/157-first-time-use-we-may-help-user-with-got-it-tooltip

Author: Vassiliy-Kudryashov

.github/ISSUE_TEMPLATE/test_request.md

@@ -1,5 +1,5 @@
 ---
-name: Manual testing plan
+name: Manual testing checklist
 about: Checklist of testing process
 title: ''
 labels: ''
@@ -9,47 +9,48 @@ assignees: ''
 
 **Initial set-up**
 
-- [ ] Check that the IntelliJ Idea UTBot plugin can be successfully installed
+*Check that the IntelliJ Idea UTBot plugin can be successfully installed*
+
 - [ ] Choose appropriate workflow from the next list (by default, use the latest one) https://github.com/UnitTestBot/UTBotJava/actions/workflows/publish-plugin-and-cli.yml
 - [ ] Open IntelliJ IDE
-- [ ] Remove the latest version of the UTBot plugin
-- [ ] Clone or reuse UTBot workspace (https://github.com/UnitTestBot/UTBotJava.git)
-- [ ] Open the workspace in the IDE with the installed plugin
-- [ ] Build workspace (Instruction is needed)
-- [ ] Go through manual scenarios
+- [ ] Remove previously installed UTBot plugin
+- [ ] Clone or reuse UTBot project (https://github.com/UnitTestBot/UTBotJava.git)
+- [ ] Open the project in the IDE
+- [ ] Install the downloaded plugin
 
+*Go through manual scenarios*
 
 **Manual scenario #1**
 
 - [ ] Use default plugin settings
 - [ ] Open the utbot-sample/src/main/java/org/utbot/examples/algorithms/ArraysQuickSort.java file
-- [ ] Try to generate tests for the class
+- [ ] Generate tests for the class
 - [ ] Remove results
-- [ ] Try to generate tests for the methods
+- [ ] Generate tests for the methods
 
 
 **Manual scenario #2**
 
 - [ ] Use default plugin settings
 - [ ] Open the utbot-sample/src/main/java/org/utbot/examples/mock/CommonMocksExample.java file
-- [ ] Try to generate tests with all available (mocking) options
+- [ ] Generate tests with all available (mocking) options
 
 
 **Manual scenario #3**
 
 - [ ] Create a new Gradle project
 - [ ] Add a simple java file to test
-- [ ] Try to generate a test with a new test root
+- [ ] Generate a test with a new test root
 
 
 **Manual scenario #4**
 
-- [ ] Create a new Idea project
+- [ ] Create a new Maven project
 - [ ] Add a simple java file to test
-- [ ] Try to generate a test with a new test root
+- [ ] Generate a test with a new test root
 
-**Manual scenario #4**
+**Manual scenario #5**
 
 - [ ] Create a new Idea project
 - [ ] Add a simple java file to test
-- [ ] Try to generate tests for several classes
+- [ ] Generate tests for several classes

DEVNOTE.md

@@ -8,11 +8,18 @@
 
 ![image](https://user-images.githubusercontent.com/106974353/174806216-9d4969b4-51fb-4531-a6d0-94e3734a437a.png)
 
-*don\`t forget to check your Project SDK and Gradle SDK are of 1.8 Java version.
+⚠️ Important don\`t forgets at this step:
+
+✔️ check your Project SDK and Gradle SDK are of 1.8 Java version.
 
 ![image](https://user-images.githubusercontent.com/106974353/174812758-fcbabb5b-0411-48d7-aefe-6d69873185e3.png)
 ![image](https://user-images.githubusercontent.com/106974353/174806632-ed796fb7-57dd-44b5-b499-e9eeb0436f15.png)
 
+✔️ check your System environment variables: the KOTLIN_HOME variable path should be set up
+
+![image](https://user-images.githubusercontent.com/106974353/175059333-4f3b0083-7964-4886-8fcd-48c475fc1fb3.png)
+
+
 3. Open Gradle tool window
 4. Launch Task utbot > Tasks > build > assemble
 

utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt

@@ -105,20 +105,19 @@ internal class CgJavaRenderer(context: CgContext, printer: CgPrinter = CgPrinter
     }
 
     override fun visit(element: CgTypeCast) {
-        // TODO: check cases when element.expression is CgLiteral of primitive wrapper type and element.targetType is primitive
-        // TODO: example: (double) 1.0, (float) 1.0f, etc.
+        val expr = element.expression
+        val wrappedTargetType = wrapperByPrimitive.getOrDefault(element.targetType, element.targetType)
+        val exprTypeIsSimilar = expr.type == element.targetType || expr.type == wrappedTargetType
+
         // cast for null is mandatory in case of ambiguity - for example, readObject(Object) and readObject(Map)
-        if (element.expression.type == element.targetType && element.expression != nullLiteral()) {
+        if (exprTypeIsSimilar && expr != nullLiteral()) {
             element.expression.accept(this)
             return
         }
 
-        val elementTargetType = element.targetType
-        val targetType = wrapperByPrimitive.getOrDefault(elementTargetType, elementTargetType)
-
         print("(")
         print("(")
-        print(targetType.asString())
+        print(wrappedTargetType.asString())
         print(") ")
         element.expression.accept(this)
         print(")")

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt

@@ -36,6 +36,8 @@ import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.components.service
 import com.intellij.openapi.options.ShowSettingsUtil
+import com.intellij.openapi.projectRoots.JavaSdkVersion
+import com.intellij.openapi.roots.ContentEntry
 import com.intellij.openapi.roots.DependencyScope
 import com.intellij.openapi.roots.ExternalLibraryDescriptor
 import com.intellij.openapi.roots.JavaProjectModelModificationService
@@ -45,6 +47,8 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.ui.popup.IconButton
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VfsUtilCore.urlToPath
 import com.intellij.openapi.vfs.VirtualFile
@@ -70,16 +74,27 @@ import com.intellij.ui.layout.Row
 import com.intellij.ui.layout.panel
 import com.intellij.util.IncorrectOperationException
 import com.intellij.util.io.exists
+import com.intellij.util.lang.JavaVersion
+import com.intellij.util.ui.JBUI
+import com.intellij.util.ui.JBUI.Borders.empty
+import com.intellij.util.ui.JBUI.Borders.merge
+import com.intellij.util.ui.JBUI.scale
 import com.intellij.util.ui.JBUI.size
+import com.intellij.util.ui.UIUtil
+import com.intellij.util.ui.components.BorderLayoutPanel
 import java.awt.BorderLayout
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.Objects
 import java.util.concurrent.TimeUnit
+import javax.swing.DefaultComboBoxModel
+import javax.swing.JComboBox
+import javax.swing.JComponent
+import javax.swing.JList
+import javax.swing.JPanel
 import kotlin.streams.toList
 import org.jetbrains.concurrency.Promise
-import javax.swing.*
 
 private const val RECENTS_KEY = "org.utbot.recents"
 
@@ -257,6 +272,34 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
 
     private fun checkMembers(members: List<MemberInfo>) = members.forEach { it.isChecked = true }
 
+    private fun getTestRoot() : VirtualFile? {
+        model.testSourceRoot?.let {
+            if (it.isDirectory) return it
+        }
+        return null
+    }
+
+    override fun doValidate(): ValidationInfo? {
+        if (getTestRoot() == null) {
+            return ValidationInfo("Test source root is not configured", testSourceFolderField.childComponent)
+        }
+        if (getRootDirectoryAndContentEntry() == null) {
+            return ValidationInfo("Test source root is located out of content entry", testSourceFolderField.childComponent)
+        }
+
+        membersTable.tableHeader?.background = UIUtil.getTableBackground()
+        membersTable.background = UIUtil.getTableBackground()
+        if (membersTable.selectedMemberInfos.isEmpty()) {
+            membersTable.tableHeader?.background = JBUI.CurrentTheme.Validator.errorBackgroundColor()
+            membersTable.background = JBUI.CurrentTheme.Validator.errorBackgroundColor()
+            return ValidationInfo(
+                "Tick any methods to generate tests for", membersTable
+            )
+        }
+        return null
+    }
+
+
     override fun doOKAction() {
         model.testPackageName =
             if (testPackageField.text != SAME_PACKAGE_LABEL) testPackageField.text else ""
@@ -330,20 +373,18 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
      * Creates test source root if absent and target packages for tests.
      */
     private fun createTestRootAndPackages(): Boolean {
-        val testSourceRoot = model.testSourceRoot ?: return false
-        if (model.testSourceRoot?.isDirectory != true) return false
+        val (sourceRoot, contentEntry) = getRootDirectoryAndContentEntry() ?: return false
+        val modifiableModel = ModuleRootManager.getInstance(model.testModule).modifiableModel
+        VfsUtil.createDirectoryIfMissing(urlToPath(sourceRoot.url))
+        contentEntry.addSourceFolder(sourceRoot.url, codegenLanguages.item.testRootType())
+        WriteCommandAction.runWriteCommandAction(model.project) { modifiableModel.commit() }
 
-        val rootExists = getOrCreateTestRoot(testSourceRoot)
-        if (rootExists) {
-            if (cbSpecifyTestPackage.isSelected) {
-                createSelectedPackage(testSourceRoot)
-            } else {
-                createPackagesByClasses(testSourceRoot)
-            }
-            return true
+        if (cbSpecifyTestPackage.isSelected) {
+            createSelectedPackage(sourceRoot)
+        } else {
+            createPackagesByClasses(sourceRoot)
         }
-
-        return false
+        return true
     }
 
     private fun createPackagesByClasses(testSourceRoot: VirtualFile) {
@@ -372,19 +413,12 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             "Generation error"
         )
 
-    private fun getOrCreateTestRoot(testSourceRoot: VirtualFile): Boolean {
-        val modifiableModel = ModuleRootManager.getInstance(model.testModule).modifiableModel
-        val contentEntry = modifiableModel.contentEntries
+    private fun getRootDirectoryAndContentEntry() : Pair<VirtualFile, ContentEntry>? {
+        val testSourceRoot = getTestRoot()?: return null
+        val contentEntry = ModuleRootManager.getInstance(model.testModule).contentEntries
             .filterNot { it.file == null }
-            .firstOrNull { VfsUtil.isAncestor(it.file!!, testSourceRoot, true) }
-            ?: return false
-
-        VfsUtil.createDirectoryIfMissing(urlToPath(testSourceRoot.url))
-
-        contentEntry.addSourceFolder(testSourceRoot.url, codegenLanguages.item.testRootType())
-        WriteCommandAction.runWriteCommandAction(model.project) { modifiableModel.commit() }
-
-        return true
+            .firstOrNull { VfsUtil.isAncestor(it.file!!, testSourceRoot, true) } ?: return null
+        return Pair(testSourceRoot, contentEntry)
     }
 
     private fun createPackageWrapper(packageName: String?): PackageWrapper =
@@ -614,9 +648,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         itemsToHelpTooltip.forEach { (box, tooltip) -> box.setHelpTooltipTextChanger(tooltip) }
 
         testSourceFolderField.childComponent.addActionListener { event ->
-            val item = (event.source as JComboBox<*>).selectedItem as String
-
-            pathToFile(item)?.let { model.testSourceRoot = it }
+            model.testSourceRoot = pathToFile((event.source as JComboBox<*>).selectedItem as String)
         }
 
         mockStrategies.addActionListener { event ->
@@ -754,7 +786,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
     }
 
     private fun staticsMockingConfigured(): Boolean {
-        val entries = ModuleRootManager.getInstance(model.testModule).modifiableModel.contentEntries
+        val entries = ModuleRootManager.getInstance(model.testModule).contentEntries
         val hasEntriesWithoutResources = entries
             .filterNot { it.sourceFolders.any { f -> f.rootType in testResourceRootTypes } }
             .isNotEmpty()