Skip to content

Commit 6bc594d

Browse files
committed
Fix mockClientManager initialization in TelemetryHelperTest for 2025.3
Changed from MockClientManagerExtension (JUnit 5) to MockClientManagerRule (JUnit 3/4) and manually initialize in setUp() using the Rule pattern. JUnit 5 @RegisterExtension doesn't work with HeavyPlatformTestCase. Also fixed MockTelemetryServiceExtension the same way.
1 parent 8db18ae commit 6bc594d

File tree

1 file changed

+12
-4
lines changed
  • plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq

1 file changed

+12
-4
lines changed

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.intellij.testFramework.replaceService
1010
import kotlinx.coroutines.runBlocking
1111
import kotlinx.coroutines.test.runTest
1212
import org.assertj.core.api.Assertions.assertThat
13+
import org.junit.runners.model.Statement
1314
import org.mockito.kotlin.any
1415
import org.mockito.kotlin.argumentCaptor
1516
import org.mockito.kotlin.doReturn
@@ -28,7 +29,7 @@ import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
2829
import software.amazon.awssdk.services.ssooidc.SsoOidcClient
2930
import software.aws.toolkits.core.telemetry.MetricEvent
3031
import software.aws.toolkits.core.telemetry.TelemetryBatcher
31-
import software.aws.toolkits.jetbrains.core.MockClientManagerExtension
32+
import software.aws.toolkits.jetbrains.core.MockClientManagerRule
3233
import software.aws.toolkits.jetbrains.core.credentials.LegacyManagedBearerSsoConnection
3334
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
3435
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
@@ -56,7 +57,7 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.IncomingCwcMessage
5657
import software.aws.toolkits.jetbrains.services.cwc.messages.LinkType
5758
import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionInfo
5859
import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
59-
import software.aws.toolkits.jetbrains.services.telemetry.MockTelemetryServiceExtension
60+
import software.aws.toolkits.jetbrains.services.telemetry.MockTelemetryServiceRule
6061
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
6162
import software.aws.toolkits.telemetry.CwsprChatConversationType
6263
import software.aws.toolkits.telemetry.CwsprChatInteractionType
@@ -79,8 +80,8 @@ class TelemetryHelperTest : HeavyPlatformTestCase() {
7980

8081
private lateinit var mockConnection: ToolkitConnection
8182

82-
private val mockClientManager = MockClientManagerExtension()
83-
private val mockTelemetryService = MockTelemetryServiceExtension()
83+
private val mockClientManager = MockClientManagerRule()
84+
private val mockTelemetryService = MockTelemetryServiceRule()
8485

8586
companion object {
8687
private const val mockUrl = "mockUrl"
@@ -147,6 +148,13 @@ class TelemetryHelperTest : HeavyPlatformTestCase() {
147148

148149
override fun setUp() {
149150
super.setUp()
151+
// Initialize mock managers using JUnit Rule pattern
152+
mockClientManager.apply(object : Statement() {
153+
override fun evaluate() {}
154+
}, org.junit.runner.Description.EMPTY).evaluate()
155+
mockTelemetryService.apply(object : Statement() {
156+
override fun evaluate() {}
157+
}, org.junit.runner.Description.EMPTY).evaluate()
150158
// set up sut
151159
appInitContext = AmazonQAppInitContext(
152160
project = project,

0 commit comments

Comments
 (0)