Merge of new rebased code

[appc.git] / appc-event-listener / appc-event-listener-bundle / src / test / java / org / openecomp / appc / listener / demo / model / TestMessages.java

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/demo/model/TestMessages.java
similarity index 94%
rename from appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/CL1607/model/TestMessages.java
rename to appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java
index c7bc863..98dc91b 100644 (file)
--- 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/demo/model/TestMessages.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.appc.listener.CL1607.model;
+package org.openecomp.appc.listener.demo.model;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -32,9 +32,9 @@ 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.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 {
@@ -47,8 +47,8 @@ public class TestMessages {
     @Before
     public void setup() {
         try {
-            incomingStr = IOUtils.toString(getClass().getResourceAsStream("/IncomingMessage1607.txt"), "UTF-8");
-            outgoingStr = IOUtils.toString(getClass().getResourceAsStream("/OutgoingMessage1607.txt"), "UTF-8");
+            incomingStr = IOUtils.toString(getClass().getResourceAsStream("/IncomingMessagedemo.txt"), "UTF-8");
+            outgoingStr = IOUtils.toString(getClass().getResourceAsStream("/OutgoingMessagedemo.txt"), "UTF-8");
             assertNotNull(incomingStr);
             assertNotNull(outgoingStr);