Sort dependencies in user build file (#868)

* Sort dependencies and update descriptors

* Revert unnecessary min version for JUnit4

* Convert mavenCoordinates into property

Author: EgorkaKulikov

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/ExternalLibraryDescriptors.kt

@@ -1,6 +1,13 @@
 package org.utbot.intellij.plugin.models
 
 import com.intellij.openapi.roots.ExternalLibraryDescriptor
+import org.jetbrains.idea.maven.utils.library.RepositoryLibraryDescription
+
+val ExternalLibraryDescriptor.mavenCoordinates: String
+    get() = "$libraryGroupId:$libraryArtifactId:${preferredVersion ?: RepositoryLibraryDescription.ReleaseVersionId}"
+
+val ExternalLibraryDescriptor.id: String
+        get() = "$libraryGroupId:$libraryArtifactId"
 
 //TODO: think about using JUnitExternalLibraryDescriptor from intellij-community sources (difficult to install)
 fun jUnit4LibraryDescriptor(versionInProject: String?) =
@@ -10,7 +17,7 @@ fun jUnit5LibraryDescriptor(versionInProject: String?) =
     ExternalLibraryDescriptor("org.junit.jupiter", "junit-jupiter", "5.8.1", null, versionInProject ?: "5.8.1")
 
 fun testNgLibraryDescriptor(versionInProject: String?) =
-    ExternalLibraryDescriptor("org.testng", "testng", "6.8.8", null, versionInProject ?: "6.9.6")
+    ExternalLibraryDescriptor("org.testng", "testng", "7.6.0", null, versionInProject ?: "7.6.0")
 
 fun jUnit5ParametrizedTestsLibraryDescriptor(versionInProject: String?) =
     ExternalLibraryDescriptor("org.junit.jupiter", "junit-jupiter-params", "5.8.1", null, versionInProject ?: "5.8.1")

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

@@ -114,6 +114,7 @@ import org.utbot.framework.plugin.api.MockStrategyApi
 import org.utbot.framework.plugin.api.TreatOverflowAsError
 import org.utbot.framework.util.Conflict
 import org.utbot.intellij.plugin.models.GenerateTestsModel
+import org.utbot.intellij.plugin.models.id
 import org.utbot.intellij.plugin.models.jUnit4LibraryDescriptor
 import org.utbot.intellij.plugin.models.jUnit5LibraryDescriptor
 import org.utbot.intellij.plugin.models.jUnit5ParametrizedTestsLibraryDescriptor
@@ -792,7 +793,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
             .addDependency(model.testModule, libraryDescriptor, DependencyScope.TEST)
         promise.thenRun {
             module.allLibraries()
-                .lastOrNull { library -> library.libraryName == libraryDescriptor.presentableName }?.let {
+                .lastOrNull { library -> library.presentableName.contains(libraryDescriptor.id) }?.let {
                     ModuleRootModificationUtil.updateModel(module) { model -> placeEntryToCorrectPlace(model, it) }
                 }
         }

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/UtProjectModelModifier.kt

@@ -17,9 +17,9 @@ import com.intellij.util.PathUtil
 import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.resolvedPromise
-import org.jetbrains.idea.maven.utils.library.RepositoryLibraryDescription
 import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties
 import org.jetbrains.jps.model.library.JpsMavenRepositoryLibraryDescriptor
+import org.utbot.intellij.plugin.models.mavenCoordinates
 
 class UtProjectModelModifier(val project: Project) : IdeaProjectModelModifier(project) {
     override fun addExternalLibraryDependency(
@@ -38,7 +38,7 @@ class UtProjectModelModifier(val project: Project) : IdeaProjectModelModifier(pr
         } else {
             val roots = JarRepositoryManager.loadDependenciesModal(
                 project,
-                RepositoryLibraryProperties(JpsMavenRepositoryLibraryDescriptor(descriptor.mavenCoordinates())),
+                RepositoryLibraryProperties(JpsMavenRepositoryLibraryDescriptor(descriptor.mavenCoordinates)),
                 /* loadSources = */ false,
                 /* loadJavadoc = */ false,
                 /* copyTo = */ null,
@@ -78,8 +78,4 @@ class UtProjectModelModifier(val project: Project) : IdeaProjectModelModifier(pr
         }
         return resolvedPromise()
     }
-
-    private fun ExternalLibraryDescriptor.mavenCoordinates(): String {
-        return "$libraryGroupId:$libraryArtifactId:${preferredVersion ?: RepositoryLibraryDescription.ReleaseVersionId}"
-    }
 }