From c7d0075d223eab9f89fd28853c4b138792059be9 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 1 Jun 2017 10:45:37 -0700 Subject: Merge of new rebased code Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47 Signed-off-by: Patrick Brady --- .../appc/listener/CL/impl/TestListenerImpl.java | 43 ------ .../listener/CL/impl/TestProviderOperations.java | 122 ---------------- .../appc/listener/CL/impl/TestWorker.java | 72 ---------- .../appc/listener/CL/model/TestEnums.java | 58 -------- .../appc/listener/CL/model/TestMessages.java | 151 ------------------- .../appc/listener/CL1607/model/TestEnums.java | 59 -------- .../appc/listener/CL1607/model/TestMessages.java | 160 --------------------- .../openecomp/appc/listener/LCM/TestConverter.java | 2 +- .../appc/listener/TestListenerProperties.java | 18 +-- .../appc/listener/demo/model/TestEnums.java | 58 ++++++++ .../appc/listener/demo/model/TestMessages.java | 160 +++++++++++++++++++++ .../appc/listener/impl/TestEventHandler.java | 5 +- .../openecomp/appc/listener/impl/TestListener.java | 2 +- 13 files changed, 231 insertions(+), 679 deletions(-) delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestListenerImpl.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestProviderOperations.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestWorker.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestEnums.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestMessages.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestEnums.java delete mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestMessages.java create mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java create mode 100644 appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java (limited to 'appc-event-listener/appc-event-listener-bundle/src/test/java/org') diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestListenerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestListenerImpl.java deleted file mode 100644 index 63c98458a..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestListenerImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL.impl; - -import java.util.Properties; - -import org.junit.Before; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.CL.impl.ListenerImpl; - -public class TestListenerImpl { - - ListenerImpl listener; - - @Before - public void setup() { - Properties props = ConfigurationFactory.getConfiguration().getProperties(); - ListenerProperties lProps = new ListenerProperties((String) props.get("test.prefix"), props); - lProps.getProperties().setProperty("topic.read.timeout", "5"); // Just for this test - listener = new ListenerImpl(lProps); - } - -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestProviderOperations.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestProviderOperations.java deleted file mode 100644 index 3d7a7182f..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestProviderOperations.java +++ /dev/null @@ -1,122 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL.impl; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.util.Properties; - -import org.eclipse.osgi.internal.signedcontent.Base64; -import org.junit.Before; -import org.junit.Test; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.listener.CL.impl.ProviderOperations; -import org.openecomp.appc.listener.CL.model.IncomingMessage; - -public class TestProviderOperations { - - private String ACTIVE_ENDPOINT; - - @Before - public void setup() { - Properties props = ConfigurationFactory.getConfiguration().getProperties(); - ACTIVE_ENDPOINT = props.getProperty("appc.ClosedLoop.provider.url"); - assertNotNull(ACTIVE_ENDPOINT); - ProviderOperations.setUrl(ACTIVE_ENDPOINT); - - props.getProperty("test.vm_url"); - assertNotNull("VM_URL"); - } - - @Test - public void testTopologyOperation() { - IncomingMessage msg = new IncomingMessage(); - // Client and Time are for ID - msg.setRequestClient("APPC"); - msg.setRequestTime("TEST"); - msg.setRequest("Restart"); - - // Null Input - try { - ProviderOperations.topologyDG(null); - fail("Topology Operation with null input should fail"); - } catch (APPCException e) { - assertNotNull(e.getMessage()); - } - - // Bad URL - msg.setUrl("some bad url here"); - try { - ProviderOperations.topologyDG(msg); - // Could also be issue in IaaS Adapter - fail("Topology Operation with bad url should fail"); - } catch (APPCException e) { - assertNotNull(e.getMessage()); - } - - // Will be tested in worker - // msg.setUrl(VM_URL); - // System.out.println("Rebooting real VM. Test can take up to 90s"); - // try { - // assertTrue(ProviderOperations.topologyDG(msg)); - // } catch (APPCException e) { - // fail("Topology Operation with good url should succeed. Check url in gui first"); - // } - - } - - @Test - public void testConfigurationOperation() { - try { - ProviderOperations.topologyDG(null); - fail("Configuration Operation should throw execption. Not yet supported"); - } catch (APPCException e) { - assertNotNull(e.getMessage()); - } - } - - @Test - public void testBasicAuthFormating() { - String user = "user"; - String pass = "pass"; - - String result = ProviderOperations.setAuthentication(user, pass); - - assertNotNull(result); - String decode = new String(Base64.decode(result.getBytes())); - assertEquals(user + ":" + pass, decode); - } - - @Test - public void testGetSet() { - // Every test URL will get reset - assertEquals(ACTIVE_ENDPOINT, ProviderOperations.getUrl()); - - String newUrl = "http://example.com"; - ProviderOperations.setUrl(newUrl); - assertEquals(newUrl, ProviderOperations.getUrl()); - } - -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestWorker.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestWorker.java deleted file mode 100644 index 1cd9cdc44..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/impl/TestWorker.java +++ /dev/null @@ -1,72 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL.impl; - -import static org.junit.Assert.assertNotNull; - -import java.util.Properties; - -import org.junit.Before; -import org.junit.Test; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.listener.EventHandler; -import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.CL.impl.ProviderOperations; -import org.openecomp.appc.listener.CL.impl.WorkerImpl; -import org.openecomp.appc.listener.CL.model.IncomingMessage; -import org.openecomp.appc.listener.impl.EventHandlerImpl; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestWorker { - - private static final Logger LOG = LoggerFactory.getLogger(WorkerImpl.class); - - private IncomingMessage msg; - private EventHandler dmaap; - - @Before - public void setup() { - Properties props = ConfigurationFactory.getConfiguration().getProperties(); - String activeEndpoint = props.getProperty("appc.ClosedLoop.provider.url"); - assertNotNull(activeEndpoint); - ProviderOperations.setUrl(activeEndpoint); - - String vmUrl = props.getProperty("test.vm_url"); - assertNotNull(vmUrl); - msg = new IncomingMessage(); - // Client and Time are for ID - msg.setRequestClient("APPC"); - msg.setRequestTime("TEST"); - msg.setRequest("Restart"); - msg.setUrl(vmUrl); - - dmaap = new EventHandlerImpl(new ListenerProperties("appc.ClosedLoop", props)); - } - - @Test - public void testWorker() { - WorkerImpl w = new WorkerImpl(msg, dmaap); - w.run(); - } - -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestEnums.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestEnums.java deleted file mode 100644 index a934cb432..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestEnums.java +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; -import org.openecomp.appc.listener.CL.model.Action; -import org.openecomp.appc.listener.CL1607.model.Status; - -public class TestEnums { - - @Test - public void testAction() { - assertEquals(Action.Rebuild, Action.toAction("Rebuild")); - assertEquals(Action.Restart, Action.toAction("restart")); - assertEquals(Action.Migrate, Action.toAction("MIGRATE")); - assertEquals(Action.Evacuate, Action.toAction("Evacuate")); - assertNull(Action.toAction("Unknown")); - assertNull(Action.toAction(null)); - - assertEquals(4, Action.values().length); - } - - @Test - public void testStatus() { - - assertEquals(Status.ACCEPTED, Status.toStatus("ACCEPTED")); - assertEquals(Status.SUCCESS, Status.toStatus("SuCcEsS")); - assertEquals(Status.FAILURE, Status.toStatus("Failure")); - assertNull(Status.toStatus("Unknown")); - assertNull(Status.toStatus(null)); - - assertEquals(3, Status.values().length); - - } - -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestMessages.java deleted file mode 100644 index e9fa1ace8..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL/model/TestMessages.java +++ /dev/null @@ -1,151 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.commons.io.IOUtils; -import org.json.JSONObject; -import org.junit.Before; -import org.junit.Test; -import org.openecomp.appc.listener.CL.model.IncomingMessage; -import org.openecomp.appc.listener.CL.model.OutgoingMessage; -import org.openecomp.appc.listener.CL.model.Status; -import org.openecomp.appc.listener.util.Mapper; - -public class TestMessages { - private IncomingMessage in; - private OutgoingMessage out; - - private String incomingStr; - private String outgoingStr; - - @Before - public void setup() { - try { - incomingStr = IOUtils.toString(getClass().getResourceAsStream("/IncomingMessage.txt"), "UTF-8"); - outgoingStr = IOUtils.toString(getClass().getResourceAsStream("/OutgoingMessage.txt"), "UTF-8"); - assertNotNull(incomingStr); - assertNotNull(outgoingStr); - - in = Mapper.mapOne(incomingStr, IncomingMessage.class); - - out = Mapper.mapOne(in.toOutgoing(Status.PENDING), OutgoingMessage.class); - out.updateResponseTime(); - - assertNotNull(in); - assertNotNull(out); - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); - } - } - - // NOTE Test Mapper will be used to test an event from dmaap. - @Test - public void testGetterSetter() { - assertNotNull(in); - assertNotNull(in.getRequestClient()); - assertNotNull(in.getRequestTime()); - assertNotNull(in.getMessage()); - assertNotNull(in.getTenantId()); - assertNotNull(in.getVmId()); - assertNotNull(in.getVmName()); - assertNotNull(in.getAction()); - assertNotNull(in.getId()); - assertNotNull(in.getPolicyName()); - assertNotNull(in.getPolicyVersion()); - assertNotNull(in.getRequest()); - - out = Mapper.mapOne(in.toOutgoing(null), OutgoingMessage.class); - assertNotNull(out.getRequestClient()); - assertEquals(in.getRequestClient(), out.getRequestClient()); - assertNotNull(out.getRequestTime()); - assertEquals(in.getRequestTime(), out.getRequestTime()); - assertNotNull(out.getMessage()); - assertEquals(in.getMessage(), out.getMessage()); - assertNotNull(out.getVmName()); - assertEquals(in.getVmName(), out.getVmName()); - assertNotNull(out.getPolicyName()); - assertEquals(in.getPolicyName(), out.getPolicyName()); - assertNotNull(out.getPolicyVersion()); - assertEquals(in.getPolicyVersion(), out.getPolicyVersion()); - assertNotNull(out.getOriginalRequest()); - assertNotNull(in.getRequest(), out.getOriginalRequest()); - } - - @Test - public void testToString() { - in = new IncomingMessage(); - assertNotNull(in.toString()); - String id = "test"; - in.setId(id); - assertNotNull(in.toString()); - assertTrue(in.toString().contains(id)); - } - - @Test - public void testOutgoingUpdateTime() { - String old = out.getResponseTime(); - out.updateResponseTime(); - assertFalse(old.equals(out.getResponseTime())); - } - - // Testing for 1510 - @Test - public void testOutgoingToJson() { - // Message Set - String message = "MSG"; - out.setMessage(message); - JSONObject json = out.toResponse(); - assertNotNull(json); - String respStr = json.getString("response"); - assertTrue(respStr.contains(out.getResponse().getValue())); - - String msgStr = json.getString("message"); - assertNotNull(msgStr); - assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 - assertTrue(msgStr.contains(out.getMessage())); - - // Null Message - out.setMessage(null); - json = out.toResponse(); - assertNotNull(json); - msgStr = json.getString("message"); - assertNotNull(msgStr); - assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 - assertTrue(msgStr.contains(out.getResponse().getValue())); - - // Echoing request - assertNotNull(out.getOriginalRequest()); - } - - @Test - public void testOutgoingToString() { - String s = out.toString(); - assertTrue(s.contains(out.getId())); - } -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestEnums.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestEnums.java deleted file mode 100644 index 73e38aa4f..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestEnums.java +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL1607.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; -import org.openecomp.appc.listener.CL.model.Action; -import org.openecomp.appc.listener.CL.model.Status; - -public class TestEnums { - - @Test - public void testAction() { - assertEquals(Action.Rebuild, Action.toAction("Rebuild")); - assertEquals(Action.Restart, Action.toAction("restart")); - assertEquals(Action.Migrate, Action.toAction("MIGRATE")); - assertEquals(Action.Evacuate, Action.toAction("Evacuate")); - assertNull(Action.toAction("Unknown")); - assertNull(Action.toAction(null)); - - assertEquals(4, Action.values().length); - } - - @Test - public void testStatus() { - - assertEquals(Status.PENDING, Status.toStatus("Pending")); - assertEquals(Status.ACTIVE, Status.toStatus("active")); - assertEquals(Status.SUCCESS, Status.toStatus("SuCcEsS")); - assertEquals(Status.FAILURE, Status.toStatus("Failure")); - assertNull(Status.toStatus("Unknown")); - assertNull(Status.toStatus(null)); - - assertEquals(4, Status.values().length); - - } - -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestMessages.java deleted file mode 100644 index c7bc86300..000000000 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestMessages.java +++ /dev/null @@ -1,160 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.CL1607.model; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.commons.io.IOUtils; -import org.json.JSONObject; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.openecomp.appc.listener.CL1607.model.IncomingMessage; -import org.openecomp.appc.listener.CL1607.model.OutgoingMessage; -import org.openecomp.appc.listener.CL1607.model.Status; -import org.openecomp.appc.listener.util.Mapper; - -public class TestMessages { - private IncomingMessage in; - private OutgoingMessage out; - - private String incomingStr; - private String outgoingStr; - - @Before - public void setup() { - try { - incomingStr = IOUtils.toString(getClass().getResourceAsStream("/IncomingMessage1607.txt"), "UTF-8"); - outgoingStr = IOUtils.toString(getClass().getResourceAsStream("/OutgoingMessage1607.txt"), "UTF-8"); - assertNotNull(incomingStr); - assertNotNull(outgoingStr); - - in = Mapper.mapOne(incomingStr, IncomingMessage.class); - - out = Mapper.mapOne(outgoingStr, OutgoingMessage.class); - - assertNotNull(in); - assertNotNull(out); - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); - } - } - - // NOTE Test Mapper will be used to test an event from dmaap. - @Test - public void testGetterSetter() { - assertNotNull(in); - assertNotNull(in.getAction()); - assertNotNull(in.getHeader().getApiVer()); - assertNotNull(in.getHeader().getOriginatorId()); - assertNotNull(in.getHeader().getRequestID()); - assertNotNull(in.getHeader().getSubRequestId()); - assertNotNull(in.getHeader().getTimeStamp()); - - assertNotNull(out); - assertNotNull(out.getHeader().getApiVer()); - assertNotNull(out.getHeader().getOriginatorId()); - assertNotNull(out.getHeader().getRequestID()); - assertNotNull(out.getHeader().getSubRequestId()); - assertNotNull(out.getHeader().getTimeStamp()); - assertNotNull(out.getStatus().getCode()); - assertNotNull(out.getStatus().getValue()); - - } - - @Test - @Ignore - public void testIncommingToOutgoing(){ - OutgoingMessage newOut; - newOut = Mapper.mapOne(in.toOutgoing(Status.ACCEPTED), OutgoingMessage.class); - assertNotNull(newOut); - assertNotNull(newOut.getHeader().getApiVer()); - assertNotNull(newOut.getHeader().getOriginatorId()); - assertNotNull(newOut.getHeader().getRequestID()); - assertNotNull(newOut.getHeader().getSubRequestId()); - assertNotNull(newOut.getHeader().getTimeStamp()); - assertNotNull(newOut.getStatus().getCode()); - assertNotNull(newOut.getStatus().getValue()); - } - - @Test - @Ignore - public void testToString() { - in = new IncomingMessage(); - assertNotNull(in.toString()); - String id = "test"; - //in.setId(id); - assertNotNull(in.toString()); - assertTrue(in.toString().contains(id)); - } - - - @Test - @Ignore - public void testOutgoingUpdateTime() { - //String old = out.getResponseTime(); - out.updateResponseTime(); - //assertFalse(old.equals(out.getResponseTime())); - } - - // Testing for 1510 - @Test - @Ignore - public void testOutgoingToJson() { - // Message Set - String message = "MSG"; - //out.setMessage(message); - JSONObject json = out.toResponse(); - assertNotNull(json); - String respStr = json.getString("response"); - //assertTrue(respStr.contains(out.getResponse().getValue())); - - String msgStr = json.getString("message"); - assertNotNull(msgStr); - //assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 - //assertTrue(msgStr.contains(out.getMessage())); - - // Null Message - //out.setMessage(null); - json = out.toResponse(); - assertNotNull(json); - msgStr = json.getString("message"); - assertNotNull(msgStr); - //assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 - //assertTrue(msgStr.contains(out.getResponse().getValue())); - - // Echoing request - //assertNotNull(out.getOriginalRequest()); - } - - @Test - @Ignore - public void testOutgoingToString() { - String s = out.toString(); - //assertTrue(s.contains(out.getId())); - } -} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java index 2062e80d8..35042ba95 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java @@ -39,7 +39,7 @@ public class TestConverter { public void buildDmaapOutgoingMessageWithUnexpectedErrorTest() throws JsonProcessingException { DmaapIncomingMessage dmaapIncomingMessage = buildDmaapIncomingMessage(); String errMsg = "TestException"; - DmaapOutgoingMessage dmaapOutgoingMessage = Converter.buildDmaapOutgoingMessageWithUnexpectedError(dmaapIncomingMessage.getBody(), "test", new Exception(errMsg)); + DmaapOutgoingMessage dmaapOutgoingMessage = Converter.buildDmaapOutgoingMessageWithUnexpectedError(dmaapIncomingMessage, new Exception(errMsg)); int code = dmaapOutgoingMessage.getBody().get("output").get("status").get("code").asInt(); String value = dmaapOutgoingMessage.getBody().get("output").get("status").get("value").asText(); Assert.assertEquals(200,code); diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java index 9a70a8427..a2ce827a5 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java @@ -32,6 +32,7 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; +import org.openecomp.appc.adapter.factory.MessageService; import org.openecomp.appc.listener.AbstractListener; import org.openecomp.appc.listener.ListenerProperties; import org.openecomp.appc.listener.ListenerProperties.KEYS; @@ -101,19 +102,18 @@ public class TestListenerProperties { @Test public void testMessageServices() { // Hardcode count so tests must be updated when values are added - assertEquals(1, ListenerProperties.MessageService.values().length); + assertEquals(1, MessageService.values().length); // Bad Input - ListenerProperties.MessageService def = ListenerProperties.MessageService.DMaaP; - assertEquals(def, ListenerProperties.MessageService.parse(null)); - assertEquals(def, ListenerProperties.MessageService.parse("")); - assertEquals(def, ListenerProperties.MessageService.parse("NotDmaapOrDMaaP")); + MessageService def = MessageService.DMaaP; + assertEquals(def, MessageService.parse(null)); + assertEquals(def, MessageService.parse("")); + assertEquals(def, MessageService.parse("NotDMaaP")); - // DMaaP case sensitivity - assertEquals(ListenerProperties.MessageService.DMaaP, ListenerProperties.MessageService.parse("dmaap")); - assertEquals(ListenerProperties.MessageService.DMaaP, ListenerProperties.MessageService.parse("DMAAP")); - assertEquals(ListenerProperties.MessageService.DMaaP, ListenerProperties.MessageService.parse("DMaaP")); + assertEquals(MessageService.DMaaP, MessageService.parse("dmaap")); + assertEquals(MessageService.DMaaP, MessageService.parse("DMAAP")); + assertEquals(MessageService.DMaaP, MessageService.parse("DMaaP")); } @Test diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java new file mode 100644 index 000000000..2170af46c --- /dev/null +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java @@ -0,0 +1,58 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : APP-C + * ================================================================================ + * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.demo.model; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; +import org.openecomp.appc.listener.demo.model.Action; +import org.openecomp.appc.listener.demo.model.Status; + +public class TestEnums { + + @Test + public void testAction() { + assertEquals(Action.Rebuild, Action.toAction("Rebuild")); + assertEquals(Action.Restart, Action.toAction("restart")); + assertEquals(Action.Migrate, Action.toAction("MIGRATE")); + assertEquals(Action.Evacuate, Action.toAction("Evacuate")); + assertNull(Action.toAction("Unknown")); + assertNull(Action.toAction(null)); + + assertEquals(6, Action.values().length); + } + + @Test + public void testStatus() { + + assertEquals(Status.ACCEPTED, Status.toStatus("accepted")); + assertEquals(Status.SUCCESS, Status.toStatus("SuCcEsS")); + assertEquals(Status.FAILURE, Status.toStatus("Failure")); + assertNull(Status.toStatus("Unknown")); + assertNull(Status.toStatus(null)); + + assertEquals(3, Status.values().length); + + } + +} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java new file mode 100644 index 000000000..98dc91b7d --- /dev/null +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java @@ -0,0 +1,160 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : APP-C + * ================================================================================ + * Copyright (C) 2017 AT&T 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.openecomp.appc.listener.demo.model; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.apache.commons.io.IOUtils; +import org.json.JSONObject; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.openecomp.appc.listener.demo.model.IncomingMessage; +import org.openecomp.appc.listener.demo.model.OutgoingMessage; +import org.openecomp.appc.listener.demo.model.Status; +import org.openecomp.appc.listener.util.Mapper; + +public class TestMessages { + private IncomingMessage in; + private OutgoingMessage out; + + private String incomingStr; + private String outgoingStr; + + @Before + public void setup() { + try { + incomingStr = IOUtils.toString(getClass().getResourceAsStream("/IncomingMessagedemo.txt"), "UTF-8"); + outgoingStr = IOUtils.toString(getClass().getResourceAsStream("/OutgoingMessagedemo.txt"), "UTF-8"); + assertNotNull(incomingStr); + assertNotNull(outgoingStr); + + in = Mapper.mapOne(incomingStr, IncomingMessage.class); + + out = Mapper.mapOne(outgoingStr, OutgoingMessage.class); + + assertNotNull(in); + assertNotNull(out); + } catch (Exception e) { + e.printStackTrace(); + fail(e.getMessage()); + } + } + + // NOTE Test Mapper will be used to test an event from dmaap. + @Test + public void testGetterSetter() { + assertNotNull(in); + assertNotNull(in.getAction()); + assertNotNull(in.getHeader().getApiVer()); + assertNotNull(in.getHeader().getOriginatorId()); + assertNotNull(in.getHeader().getRequestID()); + assertNotNull(in.getHeader().getSubRequestId()); + assertNotNull(in.getHeader().getTimeStamp()); + + assertNotNull(out); + assertNotNull(out.getHeader().getApiVer()); + assertNotNull(out.getHeader().getOriginatorId()); + assertNotNull(out.getHeader().getRequestID()); + assertNotNull(out.getHeader().getSubRequestId()); + assertNotNull(out.getHeader().getTimeStamp()); + assertNotNull(out.getStatus().getCode()); + assertNotNull(out.getStatus().getValue()); + + } + + @Test + @Ignore + public void testIncommingToOutgoing(){ + OutgoingMessage newOut; + newOut = Mapper.mapOne(in.toOutgoing(Status.ACCEPTED), OutgoingMessage.class); + assertNotNull(newOut); + assertNotNull(newOut.getHeader().getApiVer()); + assertNotNull(newOut.getHeader().getOriginatorId()); + assertNotNull(newOut.getHeader().getRequestID()); + assertNotNull(newOut.getHeader().getSubRequestId()); + assertNotNull(newOut.getHeader().getTimeStamp()); + assertNotNull(newOut.getStatus().getCode()); + assertNotNull(newOut.getStatus().getValue()); + } + + @Test + @Ignore + public void testToString() { + in = new IncomingMessage(); + assertNotNull(in.toString()); + String id = "test"; + //in.setId(id); + assertNotNull(in.toString()); + assertTrue(in.toString().contains(id)); + } + + + @Test + @Ignore + public void testOutgoingUpdateTime() { + //String old = out.getResponseTime(); + out.updateResponseTime(); + //assertFalse(old.equals(out.getResponseTime())); + } + + // Testing for 1510 + @Test + @Ignore + public void testOutgoingToJson() { + // Message Set + String message = "MSG"; + //out.setMessage(message); + JSONObject json = out.toResponse(); + assertNotNull(json); + String respStr = json.getString("response"); + //assertTrue(respStr.contains(out.getResponse().getValue())); + + String msgStr = json.getString("message"); + assertNotNull(msgStr); + //assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 + //assertTrue(msgStr.contains(out.getMessage())); + + // Null Message + //out.setMessage(null); + json = out.toResponse(); + assertNotNull(json); + msgStr = json.getString("message"); + assertNotNull(msgStr); + //assertFalse(msgStr.contains(out.getOriginalRequest())); // False for 1602 + //assertTrue(msgStr.contains(out.getResponse().getValue())); + + // Echoing request + //assertNotNull(out.getOriginalRequest()); + } + + @Test + @Ignore + public void testOutgoingToString() { + String s = out.toString(); + //assertTrue(s.contains(out.getId())); + } +} diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java index 788aa961a..a5a6e1e7f 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java @@ -126,8 +126,7 @@ public class TestEventHandler { } - @Test - @Ignore +// @Test public void testRun() { // Runoff any old data List result1 = adapter.getIncomingEvents(); @@ -144,7 +143,7 @@ public class TestEventHandler { // Get data back List result2 = adapter.getIncomingEvents(DummyObj.class); assertNotNull(result2); - assertEquals(1, result2.size()); +// assertEquals(1, result2.size()); assertEquals(data.toJson(), result2.get(0).toJson()); } diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java index a1c7917f9..af50e6d3d 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java @@ -31,7 +31,7 @@ import org.junit.Ignore; import org.junit.Test; import org.openecomp.appc.listener.Listener; import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.CL.impl.ListenerImpl; +import org.openecomp.appc.listener.demo.impl.ListenerImpl; @Ignore public class TestListener { -- cgit 1.2.3-korg