update TestScope

Author: samgst-amazon

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/apprunner/actions/DeployActionTest.kt

@@ -10,7 +10,7 @@ import com.intellij.testFramework.DisposableRule
 import com.intellij.testFramework.runInEdtAndWait
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before
@@ -85,7 +85,7 @@ class DeployActionTest : BaseCoroutineTest(30) {
             on { startDeployment(any<StartDeploymentRequest>()) } doAnswer { throw RuntimeException("Failed to start deployment") }
         }
 
-        runBlockingTest {
+        runTest {
             action.deploy(
                 AppRunnerServiceNode(projectRule.project, ServiceSummary.builder().serviceName(aString()).serviceArn(aString()).build()),
                 appRunnerClient,
@@ -114,7 +114,7 @@ class DeployActionTest : BaseCoroutineTest(30) {
             on { describeLogStreams(any<DescribeLogStreamsRequest>()) } doAnswer { throw RuntimeException("broke") }
         }
 
-        runBlockingTest {
+        runTest {
             action.deploy(
                 AppRunnerServiceNode(projectRule.project, ServiceSummary.builder().serviceName(aString()).serviceArn(aString()).build()),
                 appRunnerClient,

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryActorTest.kt

@@ -8,7 +8,7 @@ import com.intellij.util.ui.ListTableModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.After
 import org.junit.Before
@@ -75,7 +75,7 @@ class QueryActorTest : BaseCoroutineTest() {
                 GetQueryResultsResponse.builder().status(QueryStatus.COMPLETE).results(sampleResults).build()
             )
 
-        runBlockingTest {
+        runTest {
             queryactor.channel.send(InsightsQueryResultsActor.Message.StartLoadingAll)
             tableModel.waitForModelToBeAtLeast(1)
         }
@@ -103,7 +103,7 @@ class QueryActorTest : BaseCoroutineTest() {
             .thenReturn(
                 GetQueryResultsResponse.builder().status(QueryStatus.COMPLETE).results(firstSampleResultList, secondSampleResultList).build()
             )
-        runBlockingTest {
+        runTest {
             queryactor.channel.send(InsightsQueryResultsActor.Message.StartLoadingAll)
             tableModel.waitForModelToBeAtLeast(2)
         }
@@ -133,7 +133,7 @@ class QueryActorTest : BaseCoroutineTest() {
                 CloudWatchLogsException::class.java
             )
 
-        runBlockingTest {
+        runTest {
             queryactor.channel.send(InsightsQueryResultsActor.Message.StartLoadingAll)
             while (!queryactor.channel.isClosedForSend) {
                 delay(10)
@@ -150,7 +150,7 @@ class QueryActorTest : BaseCoroutineTest() {
             .thenReturn(
                 GetQueryResultsResponse.builder().status(QueryStatus.COMPLETE).build()
             )
-        runBlockingTest {
+        runTest {
             queryactor.channel.send(InsightsQueryResultsActor.Message.StartLoadingAll)
             waitForTrue { table.emptyText.text == message("cloudwatch.logs.no_results_found") }
         }
@@ -201,7 +201,7 @@ class QueryActorTest : BaseCoroutineTest() {
                 latch.countDown()
             }
 
-        runBlockingTest {
+        runTest {
             queryactor.channel.send(InsightsQueryResultsActor.Message.StartLoadingAll)
             tableModel.waitForModelToBeAtLeast(1)
             queryactor.channel.send(InsightsQueryResultsActor.Message.StopLoading)

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/BaseCoroutineTest.kt

@@ -5,8 +5,7 @@ package software.aws.toolkits.jetbrains.utils
 
 import com.intellij.testFramework.ProjectRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.TestCoroutineScope
-import org.junit.After
+import kotlinx.coroutines.test.TestScope
 import org.junit.Rule
 import software.aws.toolkits.jetbrains.core.MockClientManagerRule
 
@@ -29,10 +28,5 @@ abstract class BaseCoroutineTest(@Suppress("UnusedPrivateMember") timeoutSeconds
 //    @Rule
 //    val timeout = CoroutinesTimeout.seconds(timeoutSeconds)
 
-    val testCoroutineScope: TestCoroutineScope = TestCoroutineScope()
-
-    @After
-    fun after() {
-        testCoroutineScope.cleanupTestCoroutines()
-    }
+    val testCoroutineScope: TestScope = TestScope()
 }