From 261ce3c43385e08134f95c905af8ac467214a616 Mon Sep 17 00:00:00 2001
From: SmithaManjunath <smanjunath@microsoft.com>
Date: Thu, 7 Apr 2022 22:35:28 +0530
Subject: [PATCH] code cleanuo
---
.../osdu/notification/api/PubsubEndpointTest.java | 4 ++++
.../osdu/notification/auth/AuthorizationFilterTest.java | 7 ++++++-
.../auth/AuthorizationServiceEntitlementsTest.java | 9 +++------
.../opengroup/osdu/notification/auth/GsaAuthTest.java | 3 +++
.../opengroup/osdu/notification/auth/HmacAuthTest.java | 3 +++
.../osdu/notification/auth/factory/AuthFactoryTest.java | 3 ++-
.../notification/di/CredentialHeadersProviderTest.java | 1 +
.../osdu/notification/di/RequestInfoExtTest.java | 9 +++++++--
.../osdu/notification/logging/ResponseLogFilterTest.java | 1 -
.../notification/service/NotificationHandlerTest.java | 9 ++++++++-
.../notification/service/SubscriptionHandlerTest.java | 5 +++++
.../osdu/notification/utils/NotificationFilterTest.java | 1 -
12 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTest.java
index 75c9461fd..ebc388a71 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/api/PubsubEndpointTest.java
@@ -40,12 +40,16 @@ public class PubsubEndpointTest {
private static final String NOTIFICATION_ID = "test-notification-id";
private static final String PUBSUB_MESSAGE = "test-pubsub-message-data";
private final HttpResponse response = new HttpResponse();
+
@Mock
private IPubsubRequestBodyExtractor pubsubRequestBodyExtractor;
+
@Mock
private NotificationHandler notificationHandler;
+
@Mock
private JaxRsDpsLog log;
+
@InjectMocks
private PubsubEndpoint sut;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
index 485acc74b..44cfac89b 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationFilterTest.java
@@ -53,16 +53,22 @@ public class AuthorizationFilterTest {
@Mock
private DpsHeaders headers;
+
@Mock
private HttpServletRequest request;
+
@Mock
private RequestInfoExt requestInfo;
+
@Mock
private IAuthorizationService authorizationService;
+
@Mock
private IServiceAccountValidator validator;
+
@Mock
private IPubsubRequestBodyExtractor extractor;
+
@InjectMocks
private AuthorizationFilter sut;
@@ -87,7 +93,6 @@ public class AuthorizationFilterTest {
public void should_throwAppError_when_noAuthzProvided() {
when(headers.getAuthorization()).thenReturn("");
final String USER_EMAIL = "test@test.com";
-
this.sut.hasAnyPermission(ROLE1, ROLE2);
assertEquals(USER_EMAIL, this.headers.getUserEmail());
}
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationServiceEntitlementsTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationServiceEntitlementsTest.java
index 82895fd06..722c856aa 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationServiceEntitlementsTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/AuthorizationServiceEntitlementsTest.java
@@ -48,10 +48,13 @@ public class AuthorizationServiceEntitlementsTest {
@Mock
private IEntitlementsFactory entitlementsFactory;
+
@Mock
private IEntitlementsService service;
+
@Mock
private JaxRsDpsLog log;
+
@InjectMocks
private AuthorizationServiceImpl sut;
@@ -63,7 +66,6 @@ public class AuthorizationServiceEntitlementsTest {
@Test
public void should_returnUser_when_userHasPermission() throws EntitlementsException {
sut = createSut("service.register.user");
-
AuthorizationResponse result = sut.authorizeAny(DpsHeaders.createFromMap(new HashMap<>()), "service.register.user");
assertEquals("akelham@bbc.com", result.getUser());
@@ -72,7 +74,6 @@ public class AuthorizationServiceEntitlementsTest {
@Test
public void should_returnUser_when_userHasAnyPermission() throws EntitlementsException {
sut = createSut("service.register.editor");
-
AuthorizationResponse result = sut.authorizeAny(DpsHeaders.createFromMap(new HashMap<>()), "service.register.user", "service.register.editor");
assertEquals("akelham@bbc.com", result.getUser());
@@ -81,7 +82,6 @@ public class AuthorizationServiceEntitlementsTest {
@Test
public void should_throwUnauthorized_when_userDoesNotHaveRequiredPermission() throws EntitlementsException {
sut = createSut("service.register.user");
-
try {
sut.authorizeAny(DpsHeaders.createFromMap(new HashMap<>()), "service.register.editor");
fail("expected exception");
@@ -129,12 +129,9 @@ public class AuthorizationServiceEntitlementsTest {
Groups output = new Groups();
output.setMemberEmail("akelham@bbc.com");
output.setGroups(groupInfos);
-
when(service.getGroups()).thenReturn(output);
-
return sut;
}
-
}
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/GsaAuthTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/GsaAuthTest.java
index 803fe3f54..628e9f833 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/GsaAuthTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/GsaAuthTest.java
@@ -36,10 +36,13 @@ import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
public class GsaAuthTest {
+
private static final String GOOGLE_ID_TOKEN = "testHeader.testPayload.testSignature";
private static Subscription gsa_subscription;
+
@Mock
private IGoogleServiceAccount gsaTokenProvider;
+
@InjectMocks
private GsaAuth sut;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/HmacAuthTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/HmacAuthTest.java
index 06ae5e765..406795fa3 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/HmacAuthTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/HmacAuthTest.java
@@ -34,10 +34,13 @@ import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
public class HmacAuthTest {
+
private static final String SIGNED_SIGNATURE = "testEncodedInfo.testSignature";
private static Subscription hmac_subscription;
+
@Mock
private ISignatureService signatureService;
+
@InjectMocks
private HmacAuth sut;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/factory/AuthFactoryTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/factory/AuthFactoryTest.java
index a1acb7de9..5375c87c3 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/auth/factory/AuthFactoryTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/auth/factory/AuthFactoryTest.java
@@ -28,14 +28,15 @@ import org.opengroup.osdu.notification.auth.interfaces.SecretAuth;
import static org.junit.Assert.assertTrue;
-
@RunWith(MockitoJUnitRunner.class)
public class AuthFactoryTest {
@InjectMocks
AuthFactory authFactory;
+
@Mock
private HmacAuth hmacAuth;
+
@Mock
private GsaAuth gsaAuth;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/di/CredentialHeadersProviderTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/di/CredentialHeadersProviderTest.java
index 83a349952..e7966e43b 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/di/CredentialHeadersProviderTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/di/CredentialHeadersProviderTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class CredentialHeadersProviderTest {
+
@Mock
private HttpServletRequest httpRequest;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/di/RequestInfoExtTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/di/RequestInfoExtTest.java
index 3ea97c721..16e3f8c80 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/di/RequestInfoExtTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/di/RequestInfoExtTest.java
@@ -38,15 +38,21 @@ import static org.powermock.api.mockito.PowerMockito.when;
@RunWith(MockitoJUnitRunner.class)
public class RequestInfoExtTest {
+
+ Map<String, String> httpHeaders;
+
@Mock
DpsHeaders headers;
+
@Mock
IPubsubRequestBodyExtractor requestBodyExtractor;
- Map<String, String> httpHeaders;
+
@Mock
private IAppProperties config;
+
@Mock
private HttpServletRequest http;
+
@Spy
@InjectMocks
private RequestInfoExt sut;
@@ -61,7 +67,6 @@ public class RequestInfoExtTest {
MockitoAnnotations.initMocks(RequestInfoExtTest.this);
}
-
@Test
public void assignPartitionIdIfNotInHeaderTest() {
when(http.getMethod()).thenReturn("POST");
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/logging/ResponseLogFilterTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/logging/ResponseLogFilterTest.java
index c78c8743f..945ef7fda 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/logging/ResponseLogFilterTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/logging/ResponseLogFilterTest.java
@@ -80,6 +80,5 @@ public class ResponseLogFilterTest {
when(servletRequest.getMethod()).thenReturn("OPTIONS");
responseLogFilter.doFilter(servletRequest, servletResponse, filterChain);
verify(logger, times(1)).request(eq("notification.request"), any(Request.class), anyMap());
-
}
}
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/service/NotificationHandlerTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/service/NotificationHandlerTest.java
index 783597c91..3336ef1f2 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/service/NotificationHandlerTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/service/NotificationHandlerTest.java
@@ -43,23 +43,30 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class NotificationHandlerTest {
+
private static final String NOTIFICATION_ID = "test-notification-id";
private static final String PUBSUB_MESSAGE = "test-pubsub-message-data";
private static Subscription gsa_subscription;
private static Subscription hmac_subscription;
+ private final HttpResponse response = new HttpResponse();
+
@Mock
private SubscriptionHandler subscriptionHandler;
+
@Mock
private AuthFactory authFactory;
+
@Mock
private SecretAuth secretAuth;
+
@Mock
private HttpClient httpClient;
+
@Mock
private JaxRsDpsLog log;
+
@InjectMocks
private NotificationHandler sut;
- private final HttpResponse response = new HttpResponse();
@BeforeClass
public static void setup() {
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/service/SubscriptionHandlerTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/service/SubscriptionHandlerTest.java
index f917f1fe9..f90a0cf90 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/service/SubscriptionHandlerTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/service/SubscriptionHandlerTest.java
@@ -42,13 +42,18 @@ import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
public class SubscriptionHandlerTest {
+
private static final String NOTIFICATION_ID = "test-notification-id";
+
@Mock
private ISubscriptionFactory subscriptionFactory;
+
@Mock
private SubscriptionCacheFactory subscriptionCacheFactory;
+
@Mock
private ObjectMapper objectMapper;
+
@InjectMocks
private SubscriptionHandler sut;
diff --git a/notification-core/src/test/java/org/opengroup/osdu/notification/utils/NotificationFilterTest.java b/notification-core/src/test/java/org/opengroup/osdu/notification/utils/NotificationFilterTest.java
index ed6d109d7..ae67d0617 100644
--- a/notification-core/src/test/java/org/opengroup/osdu/notification/utils/NotificationFilterTest.java
+++ b/notification-core/src/test/java/org/opengroup/osdu/notification/utils/NotificationFilterTest.java
@@ -63,7 +63,6 @@ public class NotificationFilterTest {
@Test
public void doFilterTest() throws ServletException, IOException {
-
notificationFilter.doFilter(servletRequest, servletResponse, filterChain);
assertNotNull(dpsHeaders.getHeaders().get("correlation-id"));
assertEquals(dpsHeaders.getHeaders().get("content-type"), "application/json");
--
GitLab