1 files changed, 19 insertions, 1 deletions
diff --git a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java b/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java
index d65ad7c..6b306b0 100644
--- a/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java
+++ b/src/test/java/org/onap/a1pesimulator/service/fileready/CommonFileReady.java
@@ -12,7 +12,9 @@ import java.nio.file.Paths;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.junit.jupiter.api.AfterEach;
@@ -36,7 +38,9 @@ public class CommonFileReady {
     public List<File> filesToDelete;  //we collect files created during testing and then delete them
     public static final String PM_BULK_FILE = "pmBulkFile.xml";
     public static final String ARCHIVED_PM_BULK_FILE = "pmBulkFile.xml.gz";
+    public static final String TEST_CELL_ID = "Cell1";
     public static final Integer NO_OF_EVENTS = 3;
+    public static final Integer NO_OF_CELLS = 2;
 
     @InjectMocks
     private ObjectMapper mapper;
@@ -80,13 +84,27 @@ public class CommonFileReady {
     protected List<EventMemoryHolder> getTestEvents() {
         List<EventMemoryHolder> collectedEvents = new ArrayList<>();
         for (int i = 0; i < NO_OF_EVENTS; i++) {
-            EventMemoryHolder eventMemoryHolder = new EventMemoryHolder("Cell1", UUID.randomUUID().toString(), 10, ZonedDateTime.now(), loadEventFromFile());
+            EventMemoryHolder eventMemoryHolder = new EventMemoryHolder(TEST_CELL_ID, UUID.randomUUID().toString(), 10, ZonedDateTime.now(),
+                    loadEventFromFile());
             collectedEvents.add(eventMemoryHolder);
         }
         return collectedEvents;
     }
 
     /**
+     * Generate events by CellId
+     *
+     * @return Map by CellId and list of events
+     */
+    protected Map<String, List<EventMemoryHolder>> getTestEventsByCells(List<EventMemoryHolder> eventList) {
+        Map<String, List<EventMemoryHolder>> collectedEventsByCell = new HashMap<>();
+        for (int cellId = 0; cellId < NO_OF_CELLS; cellId++) {
+            collectedEventsByCell.put("Cell" + cellId, eventList);
+        }
+        return collectedEventsByCell;
+    }
+
+    /**
      * Converts json to VESEvent object
      *
      * @return created VESEvent