--- /dev/null
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2024 Deutsche Telekom AG Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.rest.resources;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphTransaction;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.onap.aai.config.WebClientConfiguration;
+import org.onap.aai.dbmap.AAIGraph;
+import org.onap.aai.entities.AAIErrorResponse;
+import org.onap.aai.entities.ServiceException;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.rest.db.HttpEntry;
+import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.util.AAIConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+
+import org.springframework.http.HttpMethod;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.reactive.server.WebTestClient;
+
+@DirtiesContext
+// This currently has to be executed last, since the @MockBean is dirtying the context.
+// Restarting the context leads to other test failures that would need to be investigated.
+@Order(Integer.MAX_VALUE)
+@Import(WebClientConfiguration.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+public class ResourcesControllerMockTest {
+
+ @MockBean(name = "traversalUriHttpEntry")
+ HttpEntry mockHttpEntry;
+
+ @Autowired
+ WebTestClient webClient;
+
+ @Autowired
+ SchemaVersions schemaVersions;
+
+ @ParameterizedTest
+ @CsvSource({
+ "GET, /cloud-infrastructure/pservers/pserver/someHostname",
+ "PUT, /cloud-infrastructure/pservers/pserver/someHostname",
+ "PUT, /cloud-infrastructure/pservers/pserver/someHostname/relationship-list/relationship",
+ "DELETE, /cloud-infrastructure/pservers/pserver/someHostname",
+ "DELETE, /cloud-infrastructure/pservers/pserver/someHostname/relationship-list/relationship",
+ })
+ public void thatInternalServerErrorsAreMappedToAAIErrorResponse(HttpMethod method, String uri) {
+ // assure that any exception is mapped to an AAIErrorResponse
+ when(mockHttpEntry.setHttpEntryProperties(any())).thenThrow(new IllegalArgumentException());
+ when(mockHttpEntry.setHttpEntryProperties(any(), anyString())).thenThrow(new IllegalArgumentException());
+
+ AAIErrorResponse errorResponse = webClient
+ .method(method)
+ .uri(uri)
+ .bodyValue("{}")
+ .exchange()
+ .expectStatus().isEqualTo(500)
+ .returnResult(AAIErrorResponse.class)
+ .getResponseBody()
+ .blockFirst();
+
+ ServiceException serviceException = errorResponse.getRequestError().getServiceException();
+ assertEquals("SVC3002", serviceException.getMessageId());
+ assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText());
+ List<String> expected = List.of(
+ method.toString(),
+ schemaVersions.getDefaultVersion() + uri,
+ "Internal Error:java.lang.IllegalArgumentException",
+ "ERR.5.4.4000");
+ assertIterableEquals(expected, serviceException.getVariables());
+ }
+
+ @BeforeEach
+ public void setup() throws AAIException {
+ if(!AAIGraph.isInit()) {
+ AAIConfig.init();
+ AAIGraph.getInstance();
+ }
+ }
+
+ @AfterEach
+ public void tearDown() {
+ JanusGraph janusGraph = AAIGraph.getInstance().getGraph();
+ JanusGraphTransaction transaction = janusGraph.newTransaction();
+ boolean success = true;
+ try {
+ GraphTraversalSource g = transaction.traversal();
+ g.V().drop().iterate();
+ } catch (Exception ex) {
+ success = false;
+ } finally {
+ if (success) {
+ transaction.commit();
+ } else {
+ transaction.rollback();
+ }
+ }
+ }
+}
* ============LICENSE_END=========================================================
*/
-package org.onap.aai.rest;
+package org.onap.aai.rest.resources;
import static org.hamcrest.MatcherAssert.assertThat;
import org.json.simple.parser.ParseException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EnumSource;
import org.mockito.Mockito;
import org.onap.aai.config.WebClientConfiguration;
import org.onap.aai.db.props.AAIProperties;
import org.onap.aai.entities.PolicyException;
import org.onap.aai.entities.ServiceException;
import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.rest.ResourcesController;
import org.onap.aai.service.ResourcesService;
import org.onap.aai.setup.SchemaVersions;
import org.onap.aai.util.AAIConfig;
-import org.onap.aai.util.AAIConstants;
import org.skyscreamer.jsonassert.JSONAssert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Import;
import org.springframework.http.HttpMethod;
import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
import org.springframework.test.web.reactive.server.WebTestClient;
import com.fasterxml.jackson.databind.ObjectMapper;
import reactor.core.publisher.Mono;
+// @DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@Import(WebClientConfiguration.class)
public class ResourcesControllerTest {
private String defaultSchemaVersion;
@BeforeEach
- public void setup() {
+ public void setup() throws AAIException {
if(!AAIGraph.isInit()) {
+ AAIConfig.init();
AAIGraph.getInstance();
}
logger.info("Starting the setup for the integration tests of Rest Endpoints");
doSetupResource(pserverUri, payload);
}
- @Test
- public void thatUnknownPathReturnsBadRequest() throws JSONException {
+ @ParameterizedTest
+ @EnumSource(value = HttpMethod.class, names = {"GET", "PUT", "DELETE"})
+ public void thatUnknownPathReturnsBadRequest(HttpMethod method) throws JSONException {
String uri = "/fake-infrastructure/pservers/pserver/fajsidj";
- AAIErrorResponse errorResponse = webClient.put()
+ AAIErrorResponse errorResponse = webClient
+ .method(method)
.uri(uri)
.bodyValue("{}")
.exchange()
assertEquals("SVC3000", serviceException.getMessageId());
assertEquals("Invalid input performing %1 on %2 (msg=%3) (ec=%4)", serviceException.getText());
List<String> expected = List.of(
- "PUT",
- "v29/fake-infrastructure/pservers/pserver/fajsidj",
+ method.toString(),
+ schemaVersions.getDefaultVersion() + uri,
"Invalid input performing %1 on %2:Unrecognized AAI object fake-infrastructure",
"ERR.5.2.3000");
assertIterableEquals(expected, serviceException.getVariables());
}
- @Test
- public void testInvalidUriThrowRandomException() throws JSONException {
-
- String payload = "{}";
- String uri = "fake-infrastructure/pservers/pserver/fajsidj";
-
- // webClient.put()
- // .uri(uri)
- // .bodyValue(payload)
- // .exchange()
- // .expectStatus().isEqualTo(500)
- // .expectBody(AAIErrorResponse.class)
- // .value(responseBody -> {
- // assertNotNull(responseBody, "Response body should not be null");
- // assertEquals("SVC3002", responseBody.getRequestError().getServiceException().getMessageId());
- // });
-
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenThrow(new IllegalArgumentException());
- MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri);
- Response response = resourcesController.update(payload, defaultSchemaVersion, uri,
- httpHeaders, uriInfo, mockReq);
-
- int code = response.getStatus();
- assertNotNull(response, "Response from the legacy moxy consumer returned null");
- assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
-
- response = resourcesController.updateRelationship(payload, defaultSchemaVersion, uri,
- httpHeaders, uriInfo, mockReq);
-
- code = response.getStatus();
- assertNotNull(response, "Response from the legacy moxy consumer returned null");
- assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
- mockReq = new MockHttpServletRequest("GET", uri);
- response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1, false,
- "all", "false", httpHeaders, uriInfo, mockReq);
-
- assertNotNull(response, "Response from the legacy moxy consumer returned null");
- assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
- mockReq = new MockHttpServletRequest("DELETE", uri);
- response = resourcesController.delete(defaultSchemaVersion, uri, httpHeaders, uriInfo,
- "", mockReq);
-
- code = response.getStatus();
- assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
-
- response = resourcesController.deleteRelationship(payload, defaultSchemaVersion, uri,
- httpHeaders, uriInfo, mockReq);
- code = response.getStatus();
- assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
- }
-
@Test
public void testInvalidUriContainingRelatedToShouldThrowAAIException() throws JSONException {
"ERR.5.6.3010");
assertIterableEquals(expected, serviceException.getVariables());
+ // Not sure if this is really the response that should be given
+ uri = "/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship";
+ errorResponse = webClient
+ .method(HttpMethod.DELETE)
+ .uri(uri)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus().isBadRequest()
+ .returnResult(AAIErrorResponse.class)
+ .getResponseBody()
+ .blockFirst();
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenReturn(uri);
- MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri);
- Response response;
- int code;
- mockReq = new MockHttpServletRequest("GET", uri);
- response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1, false,
- "all", "false", httpHeaders, uriInfo, mockReq);
- code = response.getStatus();
- assertNotNull(response, "Response from the legacy moxy consumer returned null");
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
-
- mockReq = new MockHttpServletRequest("DELETE", uri);
- queryParameters.add("resource-version", "3434394839483");
- response = resourcesController.delete(defaultSchemaVersion, uri, httpHeaders, uriInfo,
- "", mockReq);
-
- code = response.getStatus();
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
-
- response = resourcesController.deleteRelationship(payload, defaultSchemaVersion, uri,
- httpHeaders, uriInfo, mockReq);
- code = response.getStatus();
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
+ serviceException = errorResponse.getRequestError().getServiceException();
+ expected = List.of(
+ "DELETE",
+ schemaVersions.getDefaultVersion() + "/cloud-infrastructure/pservers/pserver/hostname/related-to/fsdf/relationship-list/relationship",
+ "Cannot write via this URL",
+ "ERR.5.6.3010");
+ assertIterableEquals(expected, serviceException.getVariables());
}
@Test
- @Disabled("Unable to test this method due to WRITE_BIGDECIMAL_AS_PLAIN error")
public void testPatchWithValidData() throws IOException {
String payload = getResourcePayload("pserver-patch-test");
- String uri = getUri("pserver-patch-test");
-
- if (uri.length() != 0 && uri.charAt(0) == '/') {
- uri = uri.substring(1);
- }
-
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenReturn(uri);
-
- MockHttpServletRequest mockReq = new MockHttpServletRequest("GET", uri);
- Response response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1,
- false, "all", "false", httpHeaders, uriInfo, mockReq);
-
- assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
- mockReq = new MockHttpServletRequest("PUT", uri);
- response = resourcesController.update(payload, defaultSchemaVersion, uri, httpHeaders,
- uriInfo, mockReq);
-
- int code = response.getStatus();
- if (!VALID_HTTP_STATUS_CODES.contains(code)) {
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
- }
+ String uri = "/cloud-infrastructure/pservers/pserver/pserver-patch-test";
+ webClient.get()
+ .uri(uri)
+ .exchange()
+ .expectStatus()
+ .isNotFound();
- assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+ webClient.put()
+ .uri(uri)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus()
+ .isCreated();
String patchData = "{\"in-maint\": false}";
outputMediaTypes.remove(APPLICATION_JSON);
outputMediaTypes.add(MediaType.valueOf("application/merge-patch+json"));
- mockReq = new MockHttpServletRequest("PATCH", uri);
- response = resourcesController.patch(patchData, defaultSchemaVersion, uri, httpHeaders,
- uriInfo, mockReq);
-
- code = response.getStatus();
- assertNotNull(response, "Response from the patch returned null");
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
- assertEquals(Response.Status.OK.getStatusCode(), code);
-
+ webClient.patch()
+ .uri(uri)
+ .header("Content-Type", "application/merge-patch+json")
+ .bodyValue(patchData)
+ .exchange()
+ .expectStatus()
+ .isOk();
}
protected void doSetupResource(String uri, String payload) throws JSONException {
return getUri("pserver-hostname-test");
}
- @Test
- public void checkTimeoutEnabled() throws Exception {
- boolean isTimeoutEnabled = resourcesController.isTimeoutEnabled("JUNITTESTAPP1",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_ENABLED), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP),
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(true, isTimeoutEnabled);
- }
-
- @Test
- public void checkTimeoutEnabledOverride() throws Exception {
- boolean isTimeoutEnabled = resourcesController.isTimeoutEnabled("JUNITTESTAPP2",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_ENABLED), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP),
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(false, isTimeoutEnabled);
- }
-
- @Test
- public void checkTimeoutEnabledDefaultLimit() throws Exception {
- boolean isTimeoutEnabled = resourcesController.isTimeoutEnabled("JUNITTESTAPP3",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_ENABLED), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP),
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(true, isTimeoutEnabled);
- int timeout = resourcesController.getTimeoutLimit("JUNITTESTAPP3",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(100000, timeout);
- }
-
- @Test
- public void getTimeout() throws Exception {
- int timeout = resourcesController.getTimeoutLimit("JUNITTESTAPP1",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(1, timeout);
- }
-
- @Test
- public void getTimeoutOverride() throws Exception {
- int timeout = resourcesController.getTimeoutLimit("JUNITTESTAPP2",
- AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_APP), AAIConfig.get(AAIConstants.AAI_CRUD_TIMEOUT_LIMIT));
- assertEquals(-1, timeout);
- }
-
- @Disabled("Time sensitive test only times out if the response takes longer than 1 second")
- @Test
- public void testTimeoutGetCall() throws Exception {
- String uri = getUri();
-
- if (uri.length() != 0 && uri.charAt(0) == '/') {
- uri = uri.substring(1);
- }
-
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenReturn(uri);
- headersMultiMap.putSingle("X-FromAppId", "JUNITTESTAPP1");
- when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
-
- MockHttpServletRequest mockReqGet = new MockHttpServletRequest("GET", uri);
- Response response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1,
- false, "all", "false", httpHeaders, uriInfo, mockReqGet);
-
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
- }
-
@Test
public void testBypassTimeoutGetCall() throws Exception {
- String uri = getUri();
-
- if (uri.length() != 0 && uri.charAt(0) == '/') {
- uri = uri.substring(1);
- }
-
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenReturn(uri);
- headersMultiMap.putSingle("X-FromAppId", "JUNITTESTAPP2");
- when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
-
- MockHttpServletRequest mockReqGet = new MockHttpServletRequest("GET", uri);
- Response response = resourcesController.getLegacy(defaultSchemaVersion, uri, -1, -1,
- false, "all", "false", httpHeaders, uriInfo, mockReqGet);
-
- assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+ String uri = "/cloud-infrastructure/pservers/pserver/pserver-hostname-test";
+ webClient.get()
+ .uri(uri)
+ .exchange()
+ .expectStatus()
+ .isNotFound();
}
@Test
}
private void putResourceWithQueryParam(String uri, String payload) {
-
- String[] uriSplit = uri.split("\\?");
- if (uriSplit[1] != null && !uriSplit[1].isEmpty()) {
- String[] params;
- if (!uriSplit[1].contains("&")) {
- String param = uriSplit[1];
- params = new String[] {param};
- } else {
- params = uriSplit[1].split("&");
- }
- for (String param : params) {
- String[] splitParam = param.split("=");
- String key = splitParam[0];
- String value = splitParam[1];
- uriInfo.getQueryParameters().add(key, value);
- }
- }
- uri = uriSplit[0];
-
- when(uriInfo.getPath()).thenReturn(uri);
- when(uriInfo.getPath(false)).thenReturn(uri);
-
- MockHttpServletRequest mockReq = new MockHttpServletRequest("PUT", uri);
- Response response = resourcesController.update(payload, defaultSchemaVersion, uri,
- httpHeaders, uriInfo, mockReq);
-
- assertNotNull(response, "Response from the legacy moxy consumer returned null");
- int code = response.getStatus();
- if (!VALID_HTTP_STATUS_CODES.contains(code)) {
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
- }
-
- assertEquals(Response.Status.CREATED.getStatusCode(),
- response.getStatus(),
- "Expected to return status created from the response");
- logger.info("Response Code: " + code + "\tEntity: " + response.getEntity());
+ webClient.put()
+ .uri(uri)
+ .bodyValue(payload)
+ .exchange()
+ .expectStatus()
+ .isCreated();
}
private String getResponse(String uri) {
Code Review / aai / resources.git / commitdiff