Skip to content

Commit 2f9865f

Browse files
authored
Update AwsSettingsTest with JUnit 5 extensions (#4654)
1 parent cb64a65 commit 2f9865f

File tree

1 file changed

+8
-14
lines changed
  • plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings

1 file changed

+8
-14
lines changed

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings/AwsSettingsTest.kt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
package software.aws.toolkits.jetbrains.settings
55

6+
import com.intellij.openapi.Disposable
67
import com.intellij.openapi.application.ApplicationManager
7-
import com.intellij.testFramework.DisposableRule
8-
import com.intellij.testFramework.ProjectRule
8+
import com.intellij.testFramework.ApplicationExtension
9+
import com.intellij.testFramework.junit5.TestDisposable
910
import com.intellij.testFramework.replaceService
1011
import org.assertj.core.api.Assertions.assertThat
11-
import org.junit.Rule
1212
import org.junit.jupiter.api.BeforeEach
1313
import org.junit.jupiter.api.Test
14+
import org.junit.jupiter.api.extension.ExtendWith
1415
import org.mockito.kotlin.argumentCaptor
1516
import org.mockito.kotlin.inOrder
1617
import org.mockito.kotlin.mock
@@ -20,34 +21,27 @@ import software.aws.toolkits.core.telemetry.TelemetryPublisher
2021
import software.aws.toolkits.jetbrains.services.telemetry.NoOpPublisher
2122
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
2223

24+
@ExtendWith(ApplicationExtension::class)
2325
class AwsSettingsTest {
2426
private class TestTelemetryService(
2527
publisher: TelemetryPublisher = NoOpPublisher(),
2628
batcher: TelemetryBatcher
2729
) : TelemetryService(publisher, batcher)
2830

29-
@Rule
30-
@JvmField
31-
val projectRule = ProjectRule()
32-
33-
@Rule
34-
@JvmField
35-
val disposableRule = DisposableRule()
36-
3731
private lateinit var telemetryService: TelemetryService
3832
private lateinit var batcher: TelemetryBatcher
3933
private lateinit var awsSettings: DefaultAwsSettings
4034
private lateinit var awsConfiguration: AwsConfiguration
4135

4236
@BeforeEach
43-
fun setup() {
37+
fun setup(@TestDisposable disposable: Disposable) {
4438
batcher = mock()
4539
telemetryService = spy(TestTelemetryService(batcher = batcher))
4640
awsSettings = spy(DefaultAwsSettings())
4741
awsConfiguration = spy(AwsConfiguration())
4842
awsSettings.loadState(awsConfiguration)
49-
ApplicationManager.getApplication().replaceService(TelemetryService::class.java, telemetryService, disposableRule.disposable)
50-
ApplicationManager.getApplication().replaceService(AwsSettings::class.java, awsSettings, disposableRule.disposable)
43+
ApplicationManager.getApplication().replaceService(TelemetryService::class.java, telemetryService, disposable)
44+
ApplicationManager.getApplication().replaceService(AwsSettings::class.java, awsSettings, disposable)
5145
}
5246

5347
@Test

0 commit comments

Comments
 (0)