From 81916a9226f64c42c4d44ec99b3bc06b12b594f5 Mon Sep 17 00:00:00 2001 From: hermeswaldemarin Date: Wed, 8 Nov 2023 18:45:58 +0000 Subject: [PATCH 1/2] Bumping POM Version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 153bd81..17317b9 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { ext { - VERSION = "1.6.1" + VERSION = "1.6.2" GROUP_ID = "com.absmartly.sdk" slf4jVersion = "1.7.30" From 476f15ef968dae662b73c7f5a63298bfd752d0c8 Mon Sep 17 00:00:00 2001 From: hermeswaldemarin Date: Wed, 8 Nov 2023 18:45:58 +0000 Subject: [PATCH 2/2] Bumping POM Version --- build.gradle | 2 +- .../src/test/java/com/absmartly/sdk/ClientTest.java | 11 +++++++---- .../src/test/java/com/absmartly/sdk/ContextTest.java | 8 +++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 153bd81..17317b9 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { ext { - VERSION = "1.6.1" + VERSION = "1.6.2" GROUP_ID = "com.absmartly.sdk" slf4jVersion = "1.7.30" diff --git a/core-api/src/test/java/com/absmartly/sdk/ClientTest.java b/core-api/src/test/java/com/absmartly/sdk/ClientTest.java index 66bcff9..a7a6422 100644 --- a/core-api/src/test/java/com/absmartly/sdk/ClientTest.java +++ b/core-api/src/test/java/com/absmartly/sdk/ClientTest.java @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedConstruction; import org.mockito.MockedStatic; +import org.mockito.Mockito; import com.absmartly.sdk.java.nio.charset.StandardCharsets; import com.absmartly.sdk.json.ContextData; @@ -108,11 +109,13 @@ void createWithDefaults() { verify(httpClient, times(1)).put("https://localhost/v1/context", null, expectedHeaders, publishBytes); verify(httpClient, times(1)).close(); - verify(deserCtor.constructed().get(0), times(1)).deserialize(any(), anyInt(), anyInt()); - verify(deserCtor.constructed().get(0), times(1)).deserialize(dataBytes, 0, dataBytes.length); + verify(deserCtor.constructed().get(0), Mockito.timeout(5000).times(1)).deserialize(any(), anyInt(), + anyInt()); + verify(deserCtor.constructed().get(0), Mockito.timeout(5000).times(1)).deserialize(dataBytes, 0, + dataBytes.length); - verify(serCtor.constructed().get(0), times(1)).serialize(any()); - verify(serCtor.constructed().get(0), times(1)).serialize(event); + verify(serCtor.constructed().get(0), Mockito.timeout(5000).times(1)).serialize(any()); + verify(serCtor.constructed().get(0), Mockito.timeout(5000).times(1)).serialize(event); } } diff --git a/core-api/src/test/java/com/absmartly/sdk/ContextTest.java b/core-api/src/test/java/com/absmartly/sdk/ContextTest.java index 081fd7f..598dd28 100644 --- a/core-api/src/test/java/com/absmartly/sdk/ContextTest.java +++ b/core-api/src/test/java/com/absmartly/sdk/ContextTest.java @@ -1721,9 +1721,11 @@ void closeCallsEventLoggerWithPendingEvents() throws InterruptedException { context.close(); publisher.join(); - verify(eventLogger, times(2)).handleEvent(any(), any(), any()); - verify(eventLogger, times(1)).handleEvent(context, ContextEventLogger.EventType.Publish, expected); - verify(eventLogger, times(1)).handleEvent(context, ContextEventLogger.EventType.Close, null); + verify(eventLogger, Mockito.timeout(5000).times(2)).handleEvent(any(), any(), any()); + verify(eventLogger, Mockito.timeout(5000).times(1)).handleEvent(context, ContextEventLogger.EventType.Publish, + expected); + verify(eventLogger, Mockito.timeout(5000).times(1)).handleEvent(context, ContextEventLogger.EventType.Close, + null); } @Test