2 files changed, 0 insertions, 225 deletions
diff --git a/local-setup/src/test/java/onap/aai/AaiResourcesIT.java b/local-setup/src/test/java/onap/aai/AaiResourcesIT.java
deleted file mode 100644
index 7d8055f..0000000
--- a/local-setup/src/test/java/onap/aai/AaiResourcesIT.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2018-2019 Nokia 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 onap.aai;
-
-import static java.net.HttpURLConnection.HTTP_CREATED;
-import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
-import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
-import static java.net.HttpURLConnection.HTTP_OK;
-import static onap.aai.util.AaiRequest.v14;
-import static onap.aai.util.Resources.inputStreamFrom;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.github.kevinsawicki.http.HttpRequest;
-import com.jayway.jsonpath.JsonPath;
-import onap.aai.util.AaiRequest;
-import org.junit.After;
-import org.junit.Test;
-
-public class AaiResourcesIT {
-
-    private String id;
-
-    @After
-    public void tearDown() {
-        if (id != null && !id.isEmpty()) {
-            AaiRequest.delete(v14("/cloud-infrastructure/complexes/complex/clli2?resource-version=" + id));
-        }
-    }
-
-    @Test
-    public void aai_resources_docker_test() {
-        System.out.println("Get complexes...");
-        assert_getComplexes_returns_notFound();
-
-        System.out.println("Adding complex...");
-        assert_putComplex_returns_created();
-
-        System.out.println("Get complexes...");
-        id = assert_getComplexes_returns_complex();
-
-        System.out.println("Remove complex...");
-        assert_deleteComplex_returns_noContent(id);
-
-        System.out.println("Get complex...");
-        assert_getComplexes_returns_notFound();
-    }
-
-    private void assert_getComplexes_returns_notFound() {
-        HttpRequest request = AaiRequest.get(v14("/cloud-infrastructure/complexes"));
-
-        assertThat(request.code()).isEqualTo(HTTP_NOT_FOUND);
-        assertThat(request.body()).contains("requestError");
-    }
-
-    private void assert_putComplex_returns_created() {
-        HttpRequest request = AaiRequest
-            .put(v14("/cloud-infrastructure/complexes/complex/clli2"))
-            .send(inputStreamFrom("complex_data.json"));
-
-        assertThat(request.code()).isEqualTo(HTTP_CREATED);
-    }
-
-    private String assert_getComplexes_returns_complex() {
-        HttpRequest request = AaiRequest.get(v14("/cloud-infrastructure/complexes"))
-            .acceptJson();
-
-        assertThat(request.code()).isEqualTo(HTTP_OK);
-        String body = request.body();
-
-        assertThat(body).contains("clli2").contains("resource-version");
-
-        return JsonPath.read(body, "$.complex.[0].resource-version");
-    }
-
-    private void assert_deleteComplex_returns_noContent(String id) {
-        HttpRequest request = AaiRequest
-            .delete(v14("/cloud-infrastructure/complexes/complex/clli2?resource-version=" + id));
-
-        assertThat(request.code()).isEqualTo(HTTP_NO_CONTENT);
-    }
-}
-\ No newline at end of file
diff --git a/local-setup/src/test/java/onap/aai/AaiTraversalIT.java b/local-setup/src/test/java/onap/aai/AaiTraversalIT.java
deleted file mode 100644
index 8fdb74a..0000000
--- a/local-setup/src/test/java/onap/aai/AaiTraversalIT.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2018-2019 Nokia 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 onap.aai;
-
-import static com.fasterxml.jackson.databind.PropertyNamingStrategy.KEBAB_CASE;
-import static java.net.HttpURLConnection.HTTP_CREATED;
-import static java.net.HttpURLConnection.HTTP_OK;
-import static onap.aai.util.AaiRequest.v14;
-import static onap.aai.util.Resources.inputStreamFrom;
-import static onap.aai.util.Resources.rawTextFrom;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.kevinsawicki.http.HttpRequest;
-import java.io.UncheckedIOException;
-import onap.aai.dto.Model;
-import onap.aai.dto.ModelGenerator;
-import onap.aai.util.AaiRequest;
-import org.json.JSONException;
-import org.junit.Before;
-import org.junit.Test;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.skyscreamer.jsonassert.JSONCompareMode;
-
-public class AaiTraversalIT {
-
-    private static final String APPLICATION_XML = "application/xml";
-
-    private final ObjectMapper objectMapper = new ObjectMapper().setPropertyNamingStrategy(KEBAB_CASE);
-
-    @Before
-    public void prepare_aai_resources() throws Exception {
-        Model model = new Model("action", "123", "456");
-        assertThat(objectMapper.writeValueAsString(model))
-            .isEqualToIgnoringWhitespace(rawTextFrom("example_model.json"));
-
-        System.out.println("Adding models...");
-        assert_putModels_succeed();
-
-        System.out.println("Adding query...");
-        assert_putQuery_returns_created();
-
-        System.out.println("Adding customer...");
-        assert_putCustomer_returns_created();
-
-        System.out.println("Adding VNF...");
-        assert_putVnf_returns_created();
-    }
-
-    @Test
-    public void aai_traversal_docker_test() throws Exception {
-        assert_postQuery_returns_inventory();
-    }
-
-    private void assert_putModels_succeed() {
-        ModelGenerator
-            .generate("models.csv")
-            .forEach(this::assert_putModel_returns_created);
-    }
-
-    private void assert_putModel_returns_created(Model model) {
-        HttpRequest request;
-        try {
-            request = AaiRequest
-                .put(v14("/service-design-and-creation/models/model/" + model.getModelInvariantId()))
-                .send(objectMapper.writeValueAsString(model));
-        } catch (JsonProcessingException e) {
-            throw new UncheckedIOException(e);
-        }
-
-        assertThat(request.code()).isEqualTo(HTTP_CREATED);
-    }
-
-    private void assert_putQuery_returns_created() {
-        HttpRequest request = AaiRequest
-            .put(v14("/service-design-and-creation/named-queries/named-query/0367193e-c785-4d5f-9cb8-7bc89dc9ddb7"))
-            .send(inputStreamFrom("create_query.json"));
-
-        assertThat(request.code()).isEqualTo(HTTP_CREATED);
-    }
-
-    private void assert_putCustomer_returns_created() {
-        HttpRequest request = AaiRequest
-            .put(v14("/business/customers/customer/aai_demo_for_onap_community"))
-            .contentType(APPLICATION_XML)
-            .send(inputStreamFrom("add_customer.xml"));
-
-        assertThat(request.code()).isEqualTo(HTTP_CREATED);
-    }
-
-    private void assert_putVnf_returns_created() {
-        HttpRequest request = AaiRequest
-            .put(v14("/network/generic-vnfs/generic-vnf/de7cc3ab-0212-47df-9e64-da1c79234deb"))
-            .contentType(APPLICATION_XML)
-            .send(inputStreamFrom("add_generic_vnf.xml"));
-
-        assertThat(request.code()).isEqualTo(HTTP_CREATED);
-    }
-
-    private void assert_postQuery_returns_inventory() throws JSONException {
-        HttpRequest request = AaiRequest
-            .post("/search/named-query")
-            .contentType(HttpRequest.CONTENT_TYPE_JSON)
-            .send(inputStreamFrom("execute_query.json"));
-
-        assertThat(request.code()).isEqualTo(HTTP_OK);
-        JSONAssert.assertEquals(rawTextFrom("query_response.json"), request.body(), JSONCompareMode.LENIENT);
-    }
-}
-\ No newline at end of file