Resolve comments in #8487

Author: jwren

build.gradle.kts

@@ -314,7 +314,6 @@ tasks {
     systemProperty(
       "allure.results.directory", project.layout.buildDirectory.get().asFile.absolutePath + "/allure-results"
     )
-//    systemProperty("uiPlatformBuildVersion", providers.gradleProperty("uiPlatformBuildVersion").get())
 
     // Disable IntelliJ test listener that conflicts with standard JUnit
     systemProperty("idea.test.cyclic.buffer.size", "0")

src/io/flutter/module/FlutterGeneratorPeer.java

@@ -13,8 +13,8 @@
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TextComponentAccessor;
 import com.intellij.openapi.ui.ValidationInfo;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.util.io.FileUtilRt;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.ComboboxWithBrowseButton;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.components.JBLabel;
@@ -23,14 +23,13 @@
 import io.flutter.module.settings.SettingsHelpForm;
 import io.flutter.sdk.FlutterSdk;
 import io.flutter.sdk.FlutterSdkUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.JTextComponent;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 public class FlutterGeneratorPeer {
   private final WizardContext myContext;
   private JPanel myMainPanel;
@@ -66,7 +65,7 @@ private void init() {
       // a running Application which is the case for users and bots on the initial startup
       // experience.
       final String flutterSDKPath = System.getenv("FLUTTER_SDK");
-      if (flutterSDKPath != null && !flutterSDKPath.isEmpty()) {
+      if (StringUtil.isNotEmpty(flutterSDKPath)) {
         mySdkPathComboWithBrowse.getComboBox().setSelectedItem(flutterSDKPath);
       }
     }

testSrc/integration/io/flutter/integrationTest/NewProjectUITest.kt

@@ -14,7 +14,13 @@ import com.intellij.ide.starter.driver.engine.BackgroundRun
 import com.intellij.ide.starter.driver.engine.runIdeWithDriver
 import com.intellij.ide.starter.junit5.config.UseLatestDownloadedIdeBuild
 import io.flutter.integrationTest.utils.newProjectWelcomeScreen
-import org.junit.jupiter.api.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.ExtendWith
 import java.nio.file.Paths
 import kotlin.time.Duration.Companion.minutes
@@ -25,7 +31,6 @@ import kotlin.time.Duration.Companion.minutes
 class MyProjectUITest {
 
   companion object {
-    // Generate a unique folder name for the test project to avoid conflicts
     var testProjectName = ""
 
     /**
@@ -57,6 +62,7 @@ class MyProjectUITest {
    */
   @BeforeEach
   fun initContext() {
+    // Generate a unique folder name for the test project to avoid conflicts
     testProjectName = "my_test_project_${System.currentTimeMillis()}"
   }
 

testSrc/integration/io/flutter/integrationTest/Setup.kt

@@ -57,8 +57,7 @@ class Setup {
     fun setupTestContextIC(hyphenateWithClass: String, projectInfoSpec: ProjectInfoSpec = NoProject): IDETestContext {
       return setupTestContext(
         "", IdeProductProvider.IC.copy(
-          // Intellij Platform UI Platform Build Version -> https://plugins.jetbrains.com/docs/intellij/integration-tests-ui.html
-//          buildNumber = "243.26574.91", //System.getProperty("uiPlatformBuildVersion"),
+          // TODO(team) should the version be fetched from some setting, i.e. System.getProperty("uiPlatformBuildVersion")
           buildNumber = "252.23892.409",
           buildType = BuildType.RELEASE.type
         ), projectInfoSpec
@@ -68,8 +67,7 @@ class Setup {
     fun setupTestContextUE(hyphenateWithClass: String, projectInfoSpec: ProjectInfoSpec = NoProject): IDETestContext {
       return setupTestContext(
         "", IdeProductProvider.IU.copy(
-          // Intellij Platform UI Platform Build Version -> https://plugins.jetbrains.com/docs/intellij/integration-tests-ui.html
-//          buildNumber = "243.26574.91", //System.getProperty("uiPlatformBuildVersion"),
+          // TODO(team) should the version be fetched from some setting, i.e. System.getProperty("uiPlatformBuildVersion")
           buildNumber = "252.23892.409",
           buildType = BuildType.RELEASE.type
         ), projectInfoSpec
@@ -79,8 +77,7 @@ class Setup {
     fun setupTestContextWS(hyphenateWithClass: String, projectInfoSpec: ProjectInfoSpec = NoProject): IDETestContext {
       return setupTestContext(
         "", IdeProductProvider.WS.copy(
-          // Intellij Platform UI Platform Build Version -> https://plugins.jetbrains.com/docs/intellij/integration-tests-ui.html
-//          buildNumber = "243.26574.91", //System.getProperty("uiPlatformBuildVersion"),
+          // TODO(team) should the version be fetched from some setting, i.e. System.getProperty("uiPlatformBuildVersion")
           buildNumber = "252.23892.411",
           buildType = BuildType.RELEASE.type
         ), projectInfoSpec
@@ -167,5 +164,4 @@ class Setup {
       }.addProjectToTrustedLocations()
     }
   }
-
-}
+}

testSrc/integration/io/flutter/integrationTest/utils/NewProject.kt

@@ -100,4 +100,4 @@ fun newProjectWelcomeScreen(run: BackgroundRun, testProjectName: String) {
       }
     }
   }
-}
+}