Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): use returns instead of answers on coEvery #2653

Merged
merged 16 commits into from
Jan 29, 2024
Merged

fix(core): use returns instead of answers on coEvery #2653

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
81abe95
use returns instead of answers on coEvery
Dec 13, 2023
b71778b
more Unit
Dec 13, 2023
b5084ef
use JDK 11 to bump mockk
Dec 13, 2023
767be5c
Merge branch 'main' into fix-uncompleted-coroutines-error
gpanshu Dec 14, 2023
cc8193a
add try/catch to cursor and use JDK 11 across the project
Dec 23, 2023
ceb24f0
Merge branch 'main' into fix-uncompleted-coroutines-error
tjleing Jan 5, 2024
d4f7411
lint
Jan 5, 2024
516dacc
aws-auth-cognito slipped through the cracks in adding JDK 11 to all g…
Jan 5, 2024
dce1c98
isCaptured in mockk is now a val, setting captured also sets isCaptured
Jan 5, 2024
e06aa63
add meta-inf/license to packaging block
Jan 9, 2024
48e678b
Merge branch 'main' into fix-uncompleted-coroutines-error
tjleing Jan 9, 2024
d06310b
more meta-inf paths
Jan 9, 2024
19f4599
Merge branch 'main' into fix-uncompleted-coroutines-error
tjleing Jan 11, 2024
3a8d07f
Merge branch 'main' into fix-uncompleted-coroutines-error
tjleing Jan 11, 2024
27b0ef7
Merge branch 'main' into fix-uncompleted-coroutines-error
tjleing Jan 22, 2024
25ec6c0
Merge branch 'main' into fix-uncompleted-coroutines-error
mattcreaser Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...n/com/amplifyframework/logging/cloudwatch/AWSCloudWatchLoggingPluginImplementationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ internal class AWSCloudWatchLoggingPluginImplementationTest {
region = "REGION",
logGroupName = "LOG_GROUP"
)
every { loggingConstraintsResolver::localLoggingConstraint.set(capture(loggingConstraintsSlot)) }.answers { }
coEvery { cloudWatchLogManager.startSync() }.answers { }
every { loggingConstraintsResolver::localLoggingConstraint.set(capture(loggingConstraintsSlot)) } returns Unit
coEvery { cloudWatchLogManager.startSync() } returns Unit
awsCloudWatchLoggingPluginImplementation.configure(
awsLoggingConfig
)
Expand All @@ -77,8 +77,8 @@ internal class AWSCloudWatchLoggingPluginImplementationTest {
region = "REGION",
logGroupName = "LOG_GROUP"
)
every { loggingConstraintsResolver::localLoggingConstraint.set(any()) }.answers { }
coEvery { cloudWatchLogManager.startSync() }.answers { }
every { loggingConstraintsResolver::localLoggingConstraint.set(any()) } returns Unit
coEvery { cloudWatchLogManager.startSync() } returns Unit
awsCloudWatchLoggingPluginImplementation.configure(
awsLoggingConfig
)
Expand All @@ -88,15 +88,15 @@ internal class AWSCloudWatchLoggingPluginImplementationTest {

@Test
fun `on enable`() = runTest {
coEvery { cloudWatchLogManager.startSync() }.answers { }
coEvery { cloudWatchLogManager.startSync() } returns Unit
awsCloudWatchLoggingPluginImplementation.enable()
assertTrue(awsCloudWatchLoggingPluginImplementation.isPluginEnabled)
coVerify(exactly = 1) { cloudWatchLogManager.startSync() }
}

@Test
fun `on disable`() {
every { cloudWatchLogManager.stopSync() }.answers { }
every { cloudWatchLogManager.stopSync() } returns Unit
awsCloudWatchLoggingPluginImplementation.disable()
assertFalse(awsCloudWatchLoggingPluginImplementation.isPluginEnabled)
verify(exactly = 1) { cloudWatchLogManager.stopSync() }
Expand All @@ -106,8 +106,8 @@ internal class AWSCloudWatchLoggingPluginImplementationTest {
fun `on flush logs success`() = runTest {
val onSuccess = mockk<Action>()
val onError = mockk<Consumer<AmplifyException>>()
coEvery { cloudWatchLogManager.syncLogEventsWithCloudwatch() }.answers { }
every { onSuccess.call() }.answers { }
coEvery { cloudWatchLogManager.syncLogEventsWithCloudwatch() } returns Unit
every { onSuccess.call() } returns Unit
awsCloudWatchLoggingPluginImplementation.flushLogs(onSuccess, onError)
coVerify(exactly = 1) { cloudWatchLogManager.syncLogEventsWithCloudwatch() }
verify(exactly = 1) { onSuccess.call() }
Expand All @@ -120,7 +120,7 @@ internal class AWSCloudWatchLoggingPluginImplementationTest {
val onError = mockk<Consumer<AmplifyException>>()
val exception = slot<AmplifyException>()
coEvery { cloudWatchLogManager.syncLogEventsWithCloudwatch() }.throws(IllegalStateException())
every { onError.accept(capture(exception)) }.answers { }
every { onError.accept(capture(exception)) } returns Unit
awsCloudWatchLoggingPluginImplementation.flushLogs(onSuccess, onError)
coVerify(exactly = 1) { cloudWatchLogManager.syncLogEventsWithCloudwatch() }
verify(exactly = 0) { onSuccess.call() }
Expand Down
10 changes: 8 additions & 2 deletions aws-pinpoint-core/src/test/java/com/amplifyframework/pinpoint/core/AnalyticsClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import java.util.UUID
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.runTest
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test
Expand All @@ -60,8 +61,8 @@ class AnalyticsClientTest {
fun setup() = runTest {
mockkStatic("com.amplifyframework.pinpoint.core.util.SharedPreferencesUtilKt")
every { sharedPrefs.getUniqueId() } answers { "UNIQUE_ID" }
coEvery { sessionClient.setAnalyticsClient(any()) } answers { }
coEvery { sessionClient.startSession() } answers { }
coEvery { sessionClient.setAnalyticsClient(any()) } returns Unit
coEvery { sessionClient.startSession() } returns Unit

analyticsClient = AnalyticsClient(
ApplicationProvider.getApplicationContext(),
Expand Down Expand Up @@ -159,4 +160,9 @@ class AnalyticsClientTest {
analyticsClient.addGlobalMetric(metricName, metricValue)
assertEquals(metricValue, analyticsClient.getGlobalMetrics()[metricName])
}

@After
fun tearDown() {
analyticsClient.disableEventSubmitter()
}
}
Loading