From 87a4efb3d0a4f74e360874105fb1249d913b868f Mon Sep 17 00:00:00 2001
From: SmithaManjunath <smanjunath@microsoft.com>
Date: Tue, 29 Mar 2022 16:32:22 +0530
Subject: [PATCH] increase code coverage to 80%
---
.../osdu/notification/api/HealthChecksApiTest.java | 5 +++++
.../opengroup/osdu/notification/api/InfoApiTest.java | 8 ++++++++
.../osdu/notification/api/PubsubEndpointTests.java | 3 ++-
.../azure/messageBus/thread/ThreadDpsHeadersTest.java | 3 +++
.../azure/messageBus/thread/ThreadScopeTest.java | 10 ----------
5 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/api/HealthChecksApiTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/api/HealthChecksApiTest.java
index fd9b0a452..3975603d1 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/api/HealthChecksApiTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/api/HealthChecksApiTest.java
@@ -18,11 +18,16 @@ package org.opengroup.osdu.notification.api;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.junit.MockitoJUnitRunner;
import static org.junit.Assert.assertEquals;
+@RunWith(MockitoJUnitRunner.class)
public class HealthChecksApiTest {
+ @InjectMocks
private HealthChecksApi sut;
@Before
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/api/InfoApiTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/api/InfoApiTest.java
index 343678e12..1b694967b 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/api/InfoApiTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/api/InfoApiTest.java
@@ -21,10 +21,13 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.io.IOException;
+
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner;
import org.opengroup.osdu.core.common.info.VersionInfoBuilder;
import org.opengroup.osdu.core.common.model.info.VersionInfo;
@@ -38,6 +41,11 @@ public class InfoApiTest {
@Mock
private VersionInfoBuilder versionInfoBuilder;
+ @Before
+ public void setup(){
+ MockitoAnnotations.initMocks(InfoApiTest.this);
+ }
+
@Test
public void should_return200_getVersionInfo() throws IOException {
VersionInfo versionInfo = VersionInfo.builder()
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTests.java b/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTests.java
index ce9816795..982ea8565 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTests.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTests.java
@@ -22,6 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opengroup.osdu.core.common.http.HttpResponse;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
@@ -38,7 +39,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
-@RunWith(PowerMockRunner.class)
+@RunWith(MockitoJUnitRunner.class)
public class PubsubEndpointTests {
@Mock
private IPubsubRequestBodyExtractor pubsubRequestBodyExtractor;
diff --git a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadDpsHeadersTest.java b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadDpsHeadersTest.java
index 3a988b769..019bd1806 100644
--- a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadDpsHeadersTest.java
+++ b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadDpsHeadersTest.java
@@ -9,6 +9,7 @@ import org.mockito.MockitoAnnotations;
import org.mockito.junit.MockitoJUnitRunner;
import org.opengroup.osdu.core.common.util.IServiceAccountJwtClient;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@RunWith(MockitoJUnitRunner.class)
@@ -28,6 +29,8 @@ public class ThreadDpsHeadersTest {
public void setThreadContextTest() {
try {
threadDpsHeaders.setThreadContext("opendes", "ut");
+ assertEquals(threadDpsHeaders.getHeaders().get("data-partition-id"),"opendes");
+ assertEquals(threadDpsHeaders.getHeaders().get("correlation-id"),"ut");
} catch (Exception e) {
fail("didn't expect any exceptions here");
}
diff --git a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadScopeTest.java b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadScopeTest.java
index 75a3faa0b..b7f86be02 100644
--- a/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadScopeTest.java
+++ b/provider/notification-azure/src/test/java/org/opengroup/osdu/notification/provider/azure/messageBus/thread/ThreadScopeTest.java
@@ -10,18 +10,8 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
--
GitLab