Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add AC controller with get/put policy methods
[portal/ric-dashboard.git]
/
webapp-backend
/
src
/
main
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
config
/
E2ManagerMockConfiguration.java
diff --git
a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index
3df6dc7
..
400397c
100644
(file)
--- a/
webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/
webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@
-1,6
+1,6
@@
/*-
* ========================LICENSE_START=================================
/*-
* ========================LICENSE_START=================================
- * O
RAN-O
SC
+ * O
-RAN-
SC
* %%
* Copyright (C) 2019 AT&T Intellectual Property and Nokia
* %%
* %%
* Copyright (C) 2019 AT&T Intellectual Property and Nokia
* %%
@@
-26,9
+26,7
@@
import static org.mockito.Mockito.when;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodHandles;
-import org.oransc.ric.e2mgr.client.api.EndcSetupRequestApi;
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi;
+import org.oransc.ric.e2mgr.client.api.E2ManagerApi;
import org.oransc.ric.e2mgr.client.invoker.ApiClient;
import org.oransc.ric.e2mgr.client.model.SetupRequest;
import org.slf4j.Logger;
import org.oransc.ric.e2mgr.client.invoker.ApiClient;
import org.oransc.ric.e2mgr.client.model.SetupRequest;
import org.slf4j.Logger;
@@
-39,8
+37,8
@@
import org.springframework.context.annotation.Profile;
import org.springframework.http.HttpStatus;
/**
import org.springframework.http.HttpStatus;
/**
- * Creates a
n implementation of the E2 manager client that answers requests with
- *
mock data
.
+ * Creates a
mock implementation of the E2 manager client API. This version
+ *
answers only status codes, no data, so the mock implementations are trivial
.
*/
@Profile("mock")
@Configuration
*/
@Profile("mock")
@Configuration
@@
-59,32
+57,23
@@
public class E2ManagerMockConfiguration {
}
@Bean
}
@Bean
- public E
ndcSetupRequestApi endcSetupRequest
Api() {
+ public E
2ManagerApi e2Manager
Api() {
ApiClient apiClient = apiClient();
ApiClient apiClient = apiClient();
- E
ndcSetupRequestApi mockApi = mock(EndcSetupRequest
Api.class);
+ E
2ManagerApi mockApi = mock(E2Manager
Api.class);
when(mockApi.getApiClient()).thenReturn(apiClient);
when(mockApi.getApiClient()).thenReturn(apiClient);
- return mockApi;
- }
- @Bean
- public HealthCheckApi healthCheckApi() {
- ApiClient apiClient = apiClient();
- HealthCheckApi mockApi = mock(HealthCheckApi.class);
- when(mockApi.getApiClient()).thenReturn(apiClient);
doAnswer(i -> {
return null;
}).when(mockApi).healthCheck();
doAnswer(i -> {
return null;
}).when(mockApi).healthCheck();
- return mockApi;
- }
- @Bean
- public X2SetupRequestApi x2SetupRequestApi() {
- ApiClient apiClient = apiClient();
- X2SetupRequestApi mockApi = mock(X2SetupRequestApi.class);
- when(mockApi.getApiClient()).thenReturn(apiClient);
+ doAnswer(i -> {
+ return null;
+ }).when(mockApi).endcSetup(any(SetupRequest.class));
+
doAnswer(i -> {
return null;
}).when(mockApi).setup(any(SetupRequest.class));
doAnswer(i -> {
return null;
}).when(mockApi).setup(any(SetupRequest.class));
+
return mockApi;
}
return mockApi;
}