Implement testing framework with basic tests

build.gradle.kts

@@ -29,10 +29,6 @@ apply {
     plugin("com.jetbrains.rdgen")
 }
 
-dependencies {
-    testImplementation("org.testng:testng:7.7.0")
-}
-
 val riderPluginId: String by project
 val dotnetPluginId: String by project
 val productVersion: String by project
@@ -142,7 +138,7 @@ intellij {
 
 tasks {
     wrapper {
-        gradleVersion = "8.2.1"
+        gradleVersion = "8.3"
         distributionType = Wrapper.DistributionType.ALL
         distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
     }
@@ -228,8 +224,6 @@ tasks {
     }
 
     patchPluginXml {
-        sinceBuild.set("233.0")
-        untilBuild.set("233.*")
         val latestChangelog = try {
             changelog.getUnreleased()
         } catch (_: MissingVersionException) {
@@ -256,8 +250,8 @@ tasks {
 
     runIde {
         // For statistics:
-         jvmArgs("-Xmx1500m", "-Didea.is.internal=true", "-Dfus.internal.test.mode=true")
-//        jvmArgs("-Xmx1500m")
+        // jvmArgs("-Xmx1500m", "-Didea.is.internal=true", "-Dfus.internal.test.mode=true")
+        jvmArgs("-Xmx1500m")
     }
 
     test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.3-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -221,10 +221,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/cli/api/ManagementCommandFactory.kt

@@ -4,6 +4,7 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.jetbrains.rider.plugins.efcore.EfCoreUiBundle
+import com.jetbrains.rider.plugins.efcore.cli.api.models.DotnetEfVersion
 import com.jetbrains.rider.plugins.efcore.cli.execution.CliCommand
 import com.jetbrains.rider.plugins.efcore.cli.execution.CliCommandPresentationInfo
 
@@ -13,16 +14,32 @@ class ManagementCommandFactory(private val intellijProject: Project) {
         fun getInstance(project: Project) = project.service<ManagementCommandFactory>()
     }
 
-    fun installEfCoreTools(): CliCommand {
+    fun installGlobalTools(version: DotnetEfVersion? = null): CliCommand {
         val presentation = CliCommandPresentationInfo(
-            EfCoreUiBundle.message("install.dotnet.tool.presentable.name"),
+            EfCoreUiBundle.message("install.global.dotnet.tool.presentable.name"),
             EfCoreUiBundle.message("ef.core.global.tools.have.been.successfully.installed"))
 
-        return DotnetCliCommandBuilder(presentation, intellijProject, "tool", "install").apply {
-            add("--ignore-failed-sources")
-            addNamed("--add-source", "https://api.nuget.org/v3/index.json")
+        return prepareToolInstallCommand(presentation).apply {
             add("--global")
             add("dotnet-ef")
         }.build()
     }
+
+    fun installLocalTools(version: DotnetEfVersion? = null): CliCommand {
+        val presentation = CliCommandPresentationInfo(
+            EfCoreUiBundle.message("install.local.dotnet.tool.presentable.name"),
+            EfCoreUiBundle.message("ef.core.local.tools.have.been.successfully.installed"))
+
+        return prepareToolInstallCommand(presentation).apply {
+            add("dotnet-ef")
+            addNamedNullable("--version", version.toString())
+        }.build()
+    }
+
+    private fun prepareToolInstallCommand(presentation: CliCommandPresentationInfo) =
+        DotnetCliCommandBuilder(presentation, intellijProject, "tool", "install").apply {
+            add("--ignore-failed-sources")
+            add("--create-manifest-if-needed")
+            addNamed("--add-source", "https://api.nuget.org/v3/index.json")
+        }
 }

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/cli/execution/CliCommand.kt

@@ -2,7 +2,7 @@ package com.jetbrains.rider.plugins.efcore.cli.execution
 
 import com.intellij.execution.configurations.GeneralCommandLine
 
-open class CliCommand(
+data class CliCommand(
     val dotnetPath: String,
     val commandLine: GeneralCommandLine,
     val presentationInfo: CliCommandPresentationInfo

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/features/eftools/InstallDotnetEfAction.kt

@@ -12,7 +12,7 @@ class InstallDotnetEfAction : AnAction(EfCoreUiBundle.message("action.install.te
     override fun actionPerformed(actionEvent: AnActionEvent) {
         val project = actionEvent.project ?: return
         val executor = PreferredCommandExecutorProvider.getInstance(project).getExecutor()
-        val command = ManagementCommandFactory.getInstance(project).installEfCoreTools()
+        val command = ManagementCommandFactory.getInstance(project).installGlobalTools()
         project.lifetime.launchBackground {
             executor.execute(command)
         }

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/features/migrations/add/AddMigrationDialogWrapper.kt

@@ -1,6 +1,7 @@
 package com.jetbrains.rider.plugins.efcore.features.migrations.add
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.Panel
@@ -17,6 +18,7 @@ import com.jetbrains.rider.plugins.efcore.features.shared.dialog.DialogCommand
 import com.jetbrains.rider.plugins.efcore.ui.AnyInputDocumentListener
 import com.jetbrains.rider.plugins.efcore.ui.textFieldForRelativeFolder
 import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.TestOnly
 import java.io.File
 import java.util.*
 
@@ -31,8 +33,6 @@ class AddMigrationDialogWrapper(
     intellijProject,
     selectedProjectId
 ) {
-    private val migrationsCommandFactory by lazy { MigrationsCommandFactory.getInstance(intellijProject) }
-
     //
     // Internal data
     private val migrationProjectFolder = observable("").withLogger("migrationProjectFolder")
@@ -43,6 +43,12 @@ class AddMigrationDialogWrapper(
     // Validation
     private val validator = AddMigrationValidator(dataCtx)
 
+    @TestOnly
+    internal var migrationNameComponent: JBTextField? = null
+
+    @TestOnly
+    internal var migrationsFolderComponent: TextFieldWithBrowseButton? = null
+
     //
     // Constructor
     init {
@@ -80,6 +86,7 @@ class AddMigrationDialogWrapper(
                 .focused()
                 .applyToComponent {
                     setupInitialMigrationNameListener(this)
+                    migrationNameComponent = this
                 }
         }
     }
@@ -93,6 +100,7 @@ class AddMigrationDialogWrapper(
                     .validationOnInput(validator.migrationsOutputFolderValidation())
                     .validationOnApply(validator.migrationsOutputFolderValidation())
                     .applyToComponent {
+                        migrationsFolderComponent = this
                         dataCtx.migrationsProject.afterChange { isEnabled = it != null }
                     }
             }

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/features/shared/dialog/CommonDialogWrapper.kt

@@ -2,6 +2,7 @@ package com.jetbrains.rider.plugins.efcore.features.shared.dialog
 
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.dsl.builder.AlignX
@@ -29,6 +30,7 @@ import com.jetbrains.rider.plugins.efcore.ui.items.*
 import com.jetbrains.rider.plugins.efcore.ui.localize
 import com.jetbrains.rider.plugins.efcore.ui.simpleExpandableTextField
 import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.TestOnly
 import java.awt.event.ActionEvent
 import java.util.*
 import javax.swing.AbstractAction
@@ -37,8 +39,8 @@ import javax.swing.JComponent
 
 @Suppress("MemberVisibilityCanBePrivate")
 abstract class CommonDialogWrapper<TContext : CommonDataContext>(
-    protected val dataCtx: TContext,
-    protected val efCoreVersion: DotnetEfVersion,
+    val dataCtx: TContext,
+    val efCoreVersion: DotnetEfVersion,
     dialogTitle: String,
     protected val intellijProject: Project,
     private val selectedProjectId: UUID?,
@@ -79,6 +81,22 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
     // UI
     protected lateinit var panel: DialogPanel
 
+    @TestOnly
+    internal var migrationsProjectComponent: ComboBox<MigrationsProjectItem>? = null
+
+    @TestOnly
+    internal var startupProjectComponent: ComboBox<StartupProjectItem>? = null
+
+    @TestOnly
+    internal var dbContextComponent: ComboBox<DbContextItem>? = null
+
+    @TestOnly
+    internal var targetFrameworkComponent: ComboBox<BaseTargetFrameworkItem>? = null
+
+    @TestOnly
+    internal var buildConfigurationComponent: ComboBox<BuildConfigurationItem>? = null
+
+
     //
     // Constructor
     init {
@@ -231,6 +249,11 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
         }
     }
 
+    @TestOnly
+    internal fun requestPanel(): DialogPanel {
+        return panel
+    }
+
     //
     // UI
     override fun createCenterPanel(): JComponent =
@@ -283,6 +306,7 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
             iconComboBox(migrationsProjectView, availableMigrationsProjectsView)
                 .validationOnInput(validator.migrationsProjectValidation())
                 .validationOnApply(validator.migrationsProjectValidation())
+                .applyToComponent { migrationsProjectComponent = this }
         }
     }
 
@@ -292,6 +316,7 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
                 .validationOnInput(validator.startupProjectValidation())
                 .validationOnApply(validator.startupProjectValidation())
                 .comment(EfCoreUiBundle.message("startup.project.missing.comment"))
+                .applyToComponent { startupProjectComponent = this }
         }
     }
 
@@ -300,6 +325,7 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
             iconComboBox(dbContextView, availableDbContextsView)
                 .validationOnInput(validator.dbContextValidation())
                 .validationOnApply(validator.dbContextValidation())
+                .applyToComponent { dbContextComponent = this }
         }
     }
 
@@ -320,12 +346,14 @@ abstract class CommonDialogWrapper<TContext : CommonDataContext>(
                 iconComboBox(buildConfigurationView, availableBuildConfigurationView)
                     .validationOnInput(validator.buildConfigurationValidation())
                     .validationOnApply(validator.buildConfigurationValidation())
+                    .applyToComponent { buildConfigurationComponent = this }
             }.enabledIf(noBuildCheck!!.selected.not())
 
             row(EfCoreUiBundle.message("target.framework")) {
                 iconComboBox(targetFrameworksView, availableTargetFrameworksView)
                     .validationOnInput(validator.targetFrameworkValidation())
                     .validationOnInput(validator.targetFrameworkValidation())
+                    .applyToComponent { targetFrameworkComponent = this }
             }.enabledIf(noBuildCheck!!.selected.not())
         }
     }

src/rider/main/kotlin/com/jetbrains/rider/plugins/efcore/ui/ComboBoxModelExtensions.kt

@@ -0,0 +1,11 @@
+package com.jetbrains.rider.plugins.efcore.ui
+
+import javax.swing.ComboBoxModel
+
+val <T> ComboBoxModel<T>.elements: List<T> get() {
+    return buildList {
+        for (i in 0 until getSize()) {
+            add(getElementAt(i))
+        }
+    }
+}

src/rider/main/resources/messages/EfCoreUiBundle.properties

@@ -152,7 +152,10 @@ tab.ef.core.command=EF Core Command
 #
 # Install EF Core tools
 action.install.text=Install
+install.global.dotnet.tool.presentable.name=Install .NET Tool
+install.local.dotnet.tool.presentable.name=Install .NET Tool (Local)
 ef.core.global.tools.have.been.successfully.installed=EF Core global tools have been successfully installed
+ef.core.local.tools.have.been.successfully.installed=EF Core local tools have been successfully installed
 progress.title.getting.dotnet.ef.version=Getting dotnet-ef version\u2026
 notification.content.ef.core.tools.are.required.to.execute.this.action=To use EF Core in the IDE, install dotnet-ef as a global tool
 notification.content.invalid.ef.core.tools.version=Unable to find available EF Core tools
@@ -188,4 +191,3 @@ default.target.framework=<Default>
 tool.kind.none=None
 tool.kind.local=Local
 tool.kind.global=Global
-install.dotnet.tool.presentable.name=Install .NET Tool