aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java55
-rw-r--r--appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/demo/model/TestMessages.java41
2 files changed, 60 insertions, 36 deletions
diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java
index ae32828ac..45b99a9f6 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/onap/appc/listener/demo/model/CommonMessage.java
@@ -5,6 +5,8 @@
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -265,7 +267,7 @@ public class CommonMessage implements Serializable {
public void setGenericVnfId(String genericVnfId) {
this.genericVnfId = genericVnfId;
}
-
+
@JsonProperty("pg-streams")
private pgStreams pgStreams;
@@ -303,38 +305,35 @@ public class CommonMessage implements Serializable {
};
@JsonIgnoreProperties(ignoreUnknown = true)
public static class pgStreams {
- @JsonProperty("pg-stream")
+ @JsonProperty("pg-stream")
private Collection<pgStream> streams;
-
- public Collection<pgStream> getStreams() {
- return streams;
- }
-
- public void setStreams(Collection<pgStream> streams) {
- this.streams = streams;
- }
+ public Collection<pgStream> getStreams() {
+ return streams;
+ }
+ public void setStreams(Collection<pgStream> streams) {
+ this.streams = streams;
+ }
};
- @JsonIgnoreProperties(ignoreUnknown = true)
- public static class pgStream{
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public String getIsEnabled() {
- return isEnabled;
- }
- public void setIsEnabled(String isEnabled) {
- this.isEnabled = isEnabled;
- }
- @JsonProperty("id")
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static class pgStream{
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getIsEnabled() {
+ return isEnabled;
+ }
+ public void setIsEnabled(String isEnabled) {
+ this.isEnabled = isEnabled;
+ }
+ @JsonProperty("id")
private String id;
@JsonProperty("is-enabled")
private String isEnabled;
- };
-
-
+ };
}
diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/demo/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/demo/model/TestMessages.java
index 2462e517e..62ea83a2d 100644
--- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/demo/model/TestMessages.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/onap/appc/listener/demo/model/TestMessages.java
@@ -7,6 +7,8 @@
* Copyright (C) 2017 Amdocs
* =============================================================================
* Modification Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Ericsson
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,16 +29,17 @@ package org.onap.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 java.util.ArrayList;
+import java.util.Collection;
import org.apache.commons.io.IOUtils;
import org.json.JSONObject;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import org.onap.appc.listener.demo.model.CommonMessage.pgStream;
import org.onap.appc.listener.demo.model.IncomingMessage;
import org.onap.appc.listener.demo.model.OutgoingMessage;
import org.onap.appc.listener.demo.model.Status;
@@ -64,7 +67,6 @@ public class TestMessages {
assertNotNull(in);
assertNotNull(out);
} catch (Exception e) {
- e.printStackTrace();
fail(e.getMessage());
}
}
@@ -79,7 +81,7 @@ public class TestMessages {
assertNotNull(in.getHeader().getRequestID());
assertNotNull(in.getHeader().getSubRequestId());
assertNotNull(in.getHeader().getTimeStamp());
-
+
assertNotNull(out);
assertNotNull(out.getHeader().getApiVer());
assertNotNull(out.getHeader().getOriginatorId());
@@ -90,7 +92,7 @@ public class TestMessages {
assertNotNull(out.getStatus().getValue());
}
-
+
@Test
public void testGetRequest()
{
@@ -98,7 +100,7 @@ public class TestMessages {
in.setRequest(request);
assertEquals(request, in.getRequest());
}
-
+
@Test
public void testIsValid()
{
@@ -106,6 +108,30 @@ public class TestMessages {
}
@Test
+ public void testTime() {
+ in.setStartTime(0);
+ assertEquals(0, in.getStartTime());
+ }
+
+ @Test
+ public void testPayload() {
+ CommonMessage.Payload payload = new CommonMessage.Payload();
+ payload.setGenericVnfId("VNF_ID");
+ CommonMessage.pgStream pgStream = new CommonMessage.pgStream();
+ pgStream.setId("ID");
+ pgStream.setIsEnabled("true");
+ CommonMessage.pgStreams pgStreams = new CommonMessage.pgStreams();
+ Collection<pgStream> collectionPgStreams = new ArrayList<pgStream>();
+ collectionPgStreams.add(pgStream);
+ pgStreams.setStreams(collectionPgStreams);
+ payload.setPgStreams(pgStreams);
+ in.setPayload(payload);
+ assertEquals("VNF_ID", in.getPayload().getGenericVnfId());
+ assertEquals("{\\\"pg-streams\\\": {\\\"pg-stream\\\":[{\\\"id\\\":\\\"ID\\\", \\\"is-enabled\\\":\\\"true\\\"}]}}",
+ in.getPayload().getPgStreams());
+ }
+
+ @Test
@Ignore
public void testIncommingToOutgoing(){
OutgoingMessage newOut;
@@ -119,7 +145,7 @@ public class TestMessages {
assertNotNull(newOut.getStatus().getCode());
assertNotNull(newOut.getStatus().getValue());
}
-
+
@Test
@Ignore
public void testToString() {
@@ -131,7 +157,6 @@ public class TestMessages {
assertTrue(in.toString().contains(id));
}
-
@Test
@Ignore
public void testOutgoingUpdateTime() {