Convert CodeInsightsSettingsFacadeTest and CodeWhispererUtilTest to HeavyPlatformTestCase for 2025.3

- Replace ProjectExtension with HeavyPlatformTestCase base class
- Replace @BeforeEach/@TestDisposable with setUp()/testRootDisposable
- Replace backtick test names with camelCase and Disposable lambdas with objects for JUnit 3 compatibility
- 5 tests passing

Author: aseemxs

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeInsightsSettingsFacadeTest.kt

@@ -7,47 +7,34 @@ import com.intellij.codeInsight.CodeInsightSettings
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.util.Disposer
-import com.intellij.testFramework.ProjectExtension
-import com.intellij.testFramework.junit5.TestDisposable
+import com.intellij.testFramework.HeavyPlatformTestCase
 import com.intellij.testFramework.replaceService
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 
-class CodeInsightsSettingsFacadeTest {
+class CodeInsightsSettingsFacadeTest : HeavyPlatformTestCase() {
     private lateinit var settings: CodeInsightSettings
     private lateinit var sut: CodeInsightsSettingsFacade
 
-    @TestDisposable
-    private lateinit var disposable: Disposable
-
-    companion object {
-        @JvmField
-        @RegisterExtension
-        val projectExtension = ProjectExtension()
-    }
-
-    @BeforeEach
-    fun setUp() {
+    override fun setUp() {
+        super.setUp()
         sut = spy(CodeInsightsSettingsFacade())
         settings = spy { CodeInsightSettings() }
 
         ApplicationManager.getApplication().replaceService(
             CodeInsightSettings::class.java,
             settings,
-            disposable
+            testRootDisposable
         )
     }
 
-    @Test
-    fun `disableCodeInsightUntil should revert when parent is disposed`() {
-        val myFakePopup = Disposable {}.also {
-            Disposer.register(disposable, it)
+    fun testDisableCodeInsightUntilShouldRevertWhenParentIsDisposed() {
+        val myFakePopup = object : Disposable {
+            override fun dispose() {}
         }
+        Disposer.register(testRootDisposable, myFakePopup)
 
         // assume users' enable the following two codeinsight functionalities
         settings.TAB_EXITS_BRACKETS_AND_QUOTES = true
@@ -71,14 +58,13 @@ class CodeInsightsSettingsFacadeTest {
         assertThat(settings.AUTO_POPUP_COMPLETION_LOOKUP).isTrue
     }
 
-    @Test
-    fun `revertAll should revert back all changes made by codewhisperer`() {
+    fun testRevertAllShouldRevertBackAllChangesMadeByCodewhisperer() {
         settings.TAB_EXITS_BRACKETS_AND_QUOTES = true
         assertThat(settings.TAB_EXITS_BRACKETS_AND_QUOTES).isTrue
         settings.AUTOCOMPLETE_ON_CODE_COMPLETION = true
         assertThat(settings.AUTO_POPUP_COMPLETION_LOOKUP).isTrue
 
-        sut.disableCodeInsightUntil(disposable)
+        sut.disableCodeInsightUntil(testRootDisposable)
 
         assertThat(settings.TAB_EXITS_BRACKETS_AND_QUOTES).isFalse
         assertThat(settings.AUTO_POPUP_COMPLETION_LOOKUP).isFalse
@@ -91,14 +77,16 @@ class CodeInsightsSettingsFacadeTest {
         assertThat(settings.AUTO_POPUP_COMPLETION_LOOKUP).isTrue
     }
 
-    @Test
-    fun `disableCodeInsightUntil should always flush pending reverts before making next changes`() {
-        val myFakePopup = Disposable {}.also {
-            Disposer.register(disposable, it)
+    fun testDisableCodeInsightUntilShouldAlwaysFlushPendingRevertsBeforeMakingNextChanges() {
+        val myFakePopup = object : Disposable {
+            override fun dispose() {}
         }
-        val myAnotherFakePopup = Disposable {}.also {
-            Disposer.register(disposable, it)
+        Disposer.register(testRootDisposable, myFakePopup)
+        
+        val myAnotherFakePopup = object : Disposable {
+            override fun dispose() {}
         }
+        Disposer.register(testRootDisposable, myAnotherFakePopup)
 
         // assume users' enable the following two codeinsight functionalities
         settings.TAB_EXITS_BRACKETS_AND_QUOTES = true
@@ -129,8 +117,7 @@ class CodeInsightsSettingsFacadeTest {
         assertThat(settings.AUTO_POPUP_COMPLETION_LOOKUP).isTrue
     }
 
-    @Test
-    fun `dispose should call revertAll to revert all changes made by CodeWhisperer`() {
+    fun testDisposeShouldCallRevertAllToRevertAllChangesMadeByCodeWhisperer() {
         sut.dispose()
         verify(sut).revertAll()
     }

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtilTest.kt

@@ -3,17 +3,13 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.util
 
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.testFramework.ProjectExtension
-import com.intellij.testFramework.junit5.TestDisposable
+import com.intellij.testFramework.HeavyPlatformTestCase
 import com.intellij.testFramework.replaceService
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.verify
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
 import software.aws.toolkits.core.utils.test.aString
 import software.aws.toolkits.jetbrains.core.credentials.ManagedBearerSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.ReauthSource
@@ -22,24 +18,15 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.reauthConnectionIfNeeded
 import software.aws.toolkits.jetbrains.core.region.MockRegionProviderExtension
 
-class CodeWhispererUtilTest {
-    companion object {
-        @JvmField
-        @RegisterExtension
-        val projectExtension = ProjectExtension()
-    }
-
-    @JvmField
-    @RegisterExtension
-    val mockRegionProviderExtension = MockRegionProviderExtension()
+class CodeWhispererUtilTest : HeavyPlatformTestCase() {
+    private val mockRegionProviderExtension = MockRegionProviderExtension()
 
-    @Test
-    fun `reconnectCodeWhisperer respects connection settings`(@TestDisposable disposable: Disposable) {
+    fun testReconnectCodeWhispererRespectsConnectionSettings() {
         mockkStatic(::reauthConnectionIfNeeded)
         val mockConnectionManager = mockk<ToolkitConnectionManager>(relaxed = true)
         val mockConnection = mockk<ManagedBearerSsoConnection>()
-        projectExtension.project.replaceService(ToolkitConnectionManager::class.java, mockConnectionManager, disposable)
-        ApplicationManager.getApplication().replaceService(ToolkitAuthManager::class.java, mockk(relaxed = true), disposable)
+        project.replaceService(ToolkitConnectionManager::class.java, mockConnectionManager, testRootDisposable)
+        ApplicationManager.getApplication().replaceService(ToolkitAuthManager::class.java, mockk(relaxed = true), testRootDisposable)
         val startUrl = aString()
         val region = mockRegionProviderExtension.createAwsRegion().id
         val scopes = listOf(aString(), aString())
@@ -49,10 +36,10 @@ class CodeWhispererUtilTest {
         every { mockConnection.region } returns region
         every { mockConnection.scopes } returns scopes
 
-        CodeWhispererUtil.reconnectCodeWhisperer(projectExtension.project)
+        CodeWhispererUtil.reconnectCodeWhisperer(project)
 
         verify {
-            reauthConnectionIfNeeded(projectExtension.project, mockConnection, isReAuth = true, reauthSource = ReauthSource.CODEWHISPERER)
+            reauthConnectionIfNeeded(project, mockConnection, isReAuth = true, reauthSource = ReauthSource.CODEWHISPERER)
         }
     }
 }