From 846c78de8dff13cd5780b4501bbb5e261a62ae38 Mon Sep 17 00:00:00 2001 From: Jerry Flood Date: Wed, 10 Oct 2018 18:10:43 -0400 Subject: Update CMSO dev project to pass all Robot ETE test Issue-ID: OPTFRA-373 Change-Id: I05cffb239909bf6ed68c9c79f17b203357d8b057 Signed-off-by: Jerry Flood Signed-off-by: Jerry Flood --- .../java/org/onap/optf/cmso/service/H2Test.java | 47 ------ .../optf/cmso/service/rs/CMSOServiceImplTest.java | 158 --------------------- 2 files changed, 205 deletions(-) delete mode 100644 cmso-service/src/test/java/org/onap/optf/cmso/service/H2Test.java delete mode 100644 cmso-service/src/test/java/org/onap/optf/cmso/service/rs/CMSOServiceImplTest.java (limited to 'cmso-service/src/test/java') diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/service/H2Test.java b/cmso-service/src/test/java/org/onap/optf/cmso/service/H2Test.java deleted file mode 100644 index 8a586a9..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/service/H2Test.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * 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. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. -*/ - -package org.onap.optf.cmso.service; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:testConfig.xml"}) -public class H2Test { - - @Test - public void h2Test() { - - } -} diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/CMSOServiceImplTest.java b/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/CMSOServiceImplTest.java deleted file mode 100644 index b989a73..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/CMSOServiceImplTest.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright © 2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * 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. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. -*/ - -package org.onap.optf.cmso.service.rs; - -import static org.junit.Assert.assertEquals; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; -import javax.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.onap.optf.cmso.JpaInit; -import org.onap.optf.cmso.JtestHelper; -import org.onap.optf.cmso.common.CMSRequestError; -import org.onap.optf.cmso.service.rs.models.CMSMessage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; -import org.springframework.test.context.junit4.SpringRunner; -import com.fasterxml.jackson.databind.ObjectMapper; -import scala.collection.mutable.StringBuilder; - -@RunWith(SpringRunner.class) -@DataJpaTest -public class CMSOServiceImplTest { - - @Autowired - CMSOService cMSOServiceImpl; - - @Autowired - private TestEntityManager entityManager; - - @Before - public void setUp() throws Exception { - JpaInit.init(entityManager); - } - - @Test - public void test_createScheduleRequest() { - String[] templates = {"changemanagement/MultipleVnfImmediate.json.template",}; - String[] domains = {"ChangeManagement",}; - String[] userIds = {"jf9860",}; - String[] callbackUrls = {"http://localhost:8089/",}; - String[] callbackDatum = {"sdafafadfdasfdsafdsa",}; - String[] workflows = {"Replace", "Update", "NewOne",}; - Integer[] normalDurationInSeeconds = {10,}; - Integer[] additionalDurationInSeeconds = {10,}; - String[] results = {"500:", // {additionalDurationInSeconds=10, workflow=Replace, - // domain=ChangeManagement, - // callbackData=sdafafadfdasfdsafdsa, testid=79e1, - // callbackUrl=http://localhost:8089/, - // uuid=a36b45b9-dff4-45b4-ac6b-2a4f35e179e1, userId=jf9860, - // normalDurationInSeconds=10} - "500:", // {additionalDurationInSeconds=10, workflow=Update, - // domain=ChangeManagement, - // callbackData=sdafafadfdasfdsafdsa, testid=c525, - // callbackUrl=http://localhost:8089/, - // uuid=26b189f7-b075-4013-b487-d938b895c525, userId=jf9860, - // normalDurationInSeconds=10} - "500:", // {additionalDurationInSeconds=10, workflow=NewOne, - // domain=ChangeManagement, - // callbackData=sdafafadfdasfdsafdsa, testid=8e87, - // callbackUrl=http://localhost:8089/, - // uuid=4f59b14a-8040-4257-8981-defcb8f38e87, userId=jf9860, - // normalDurationInSeconds=10} - }; - - int i = 0; - for (String template : templates) { - for (String domain : domains) { - for (String userId : userIds) { - for (String callbackUrl : callbackUrls) { - for (String callbackData : callbackDatum) { - for (String workflow : workflows) { - for (Integer normalDuration : normalDurationInSeeconds) { - for (Integer additionalDuration : additionalDurationInSeeconds) { - Map values = new HashMap(); - String scheduleId = UUID.randomUUID().toString(); - values.put("uuid", scheduleId); - values.put("testid", scheduleId.substring(scheduleId.length() - 4)); - values.put("domain", domain); - values.put("userId", userId); - values.put("callbackUrl", callbackUrl); - values.put("callbackData", callbackData); - values.put("workflow", workflow); - values.put("normalDurationInSeconds", normalDuration.toString()); - values.put("additionalDurationInSeconds", additionalDuration.toString()); - String json = JtestHelper.template(template, values); - ObjectMapper om = new ObjectMapper(); - CMSMessage scheduleMessage; - try { - scheduleMessage = om.readValue(json, CMSMessage.class); - MockHttpServletRequest mrequest = new MockHttpServletRequest(); - mrequest.url.append(scheduleId); - - Response response = cMSOServiceImpl.createScheduleRequest("v2", scheduleId, - scheduleMessage, mrequest.request); - - Object result = response.getEntity(); - StringBuilder sb = new StringBuilder(); - sb.append(response.getStatus()).append(":"); - if (result instanceof CMSRequestError) { - String r = result.toString().replaceAll(" : Reason :.*$", ""); - sb.append(r.replaceAll(scheduleId, "")); - } - // Generate results[] entry - System.out.println("\"" + sb.toString() + "\", //" + values.toString()); - - // Debug an assertion - System.out.println(results[i] + ":" + sb.toString()); - assertEquals(results[i].equals(sb.toString()), true); - i++; - - } catch (Exception e) { - e.printStackTrace(); - } - - } - } - } - - } - } - } - } - } - } -} -- cgit 1.2.3-korg