fix wrong merge

 fix wrong merge

Author: vasile-baluta

src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java

@@ -109,38 +109,38 @@ public void before() {
     @Override
     List<String> getEventNamesToSend() {
         ArrayList<String> eventNames = new ArrayList<>();
-        // eventNames.add("EiffelActivityCanceledEvent");
-        // eventNames.add("EiffelActivityStartedEvent");
-        // eventNames.add("EiffelActivityFinishedEvent");
-        // eventNames.add("EiffelActivityTriggeredEvent");
-        // eventNames.add("EiffelAnnouncementPublishedEvent");
-        // eventNames.add("EiffelArtifactCreatedEvent");
-        // eventNames.add("EiffelArtifactPublishedEvent");
-        // eventNames.add("EiffelArtifactReusedEvent");
-        // eventNames.add("EiffelCompositionDefinedEvent");
+        eventNames.add("EiffelActivityCanceledEvent");
+        eventNames.add("EiffelActivityStartedEvent");
+        eventNames.add("EiffelActivityFinishedEvent");
+        eventNames.add("EiffelActivityTriggeredEvent");
+        eventNames.add("EiffelAnnouncementPublishedEvent");
+        eventNames.add("EiffelArtifactCreatedEvent");
+        eventNames.add("EiffelArtifactPublishedEvent");
+        eventNames.add("EiffelArtifactReusedEvent");
+        eventNames.add("EiffelCompositionDefinedEvent");
         eventNames.add("EiffelConfidenceLevelModifiedEvent");
-        // eventNames.add("EiffelEnvironmentDefinedEvent");
-        // eventNames.add("EiffelFlowContextDefinedEvent");
-        // eventNames.add("EiffelIssueVerifiedEvent");
-        // eventNames.add("EiffelSourceChangeCreatedEvent");
-        // eventNames.add("EiffelSourceChangeSubmittedEvent");
-        // eventNames.add("EiffelTestCaseCanceledEvent");
-        // eventNames.add("EiffelTestCaseFinishedEvent");
-        // eventNames.add("EiffelTestCaseStartedEvent");
-        // eventNames.add("EiffelTestCaseTriggeredEvent");
-        // eventNames.add("EiffelTestExecutionRecipeCollectionCreatedEvent");
-        // eventNames.add("EiffelTestSuiteFinishedEvent");
-        // eventNames.add("EiffelTestSuiteStartedEvent");
-        // eventNames.add("EiffelArtifactDeployedEvent");
-        // eventNames.add("EiffelServiceAllocatedEvent");
-        // eventNames.add("EiffelServiceDeployedEvent");
-        // eventNames.add("EiffelServiceDiscontinuedEvent");
-        // eventNames.add("EiffelServiceReturnedEvent");
-        // eventNames.add("EiffelServiceStartedEvent");
-        // eventNames.add("EiffelServiceStoppedEvent");
-        // eventNames.add("EiffelAlertAcknowledgedEvent");
-        // eventNames.add("EiffelAlertCeasedEvent");
-        // eventNames.add("EiffelAlertRaisedEvent");
+        eventNames.add("EiffelEnvironmentDefinedEvent");
+        eventNames.add("EiffelFlowContextDefinedEvent");
+        eventNames.add("EiffelIssueVerifiedEvent");
+        eventNames.add("EiffelSourceChangeCreatedEvent");
+        eventNames.add("EiffelSourceChangeSubmittedEvent");
+        eventNames.add("EiffelTestCaseCanceledEvent");
+        eventNames.add("EiffelTestCaseFinishedEvent");
+        eventNames.add("EiffelTestCaseStartedEvent");
+        eventNames.add("EiffelTestCaseTriggeredEvent");
+        eventNames.add("EiffelTestExecutionRecipeCollectionCreatedEvent");
+        eventNames.add("EiffelTestSuiteFinishedEvent");
+        eventNames.add("EiffelTestSuiteStartedEvent");
+        eventNames.add("EiffelArtifactDeployedEvent");
+        eventNames.add("EiffelServiceAllocatedEvent");
+        eventNames.add("EiffelServiceDeployedEvent");
+        eventNames.add("EiffelServiceDiscontinuedEvent");
+        eventNames.add("EiffelServiceReturnedEvent");
+        eventNames.add("EiffelServiceStartedEvent");
+        eventNames.add("EiffelServiceStoppedEvent");
+        eventNames.add("EiffelAlertAcknowledgedEvent");
+        eventNames.add("EiffelAlertCeasedEvent");
+        eventNames.add("EiffelAlertRaisedEvent");
 
         return eventNames;
     }

src/test/java/com/ericsson/ei/subscriptionhandler/test/SubscriptionHandlerTest.java

@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import javax.annotation.PostConstruct;
@@ -147,8 +148,8 @@ public static void setUpEmbeddedMongo() throws JSONException, IOException {
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             e.printStackTrace();
-        }       
-      
+        }
+
         url = new JSONObject(subscriptionData).getString("notificationMeta").replaceAll(REGEX, "");
         headerContentMediaType = new JSONObject(subscriptionData).getString("restPostBodyMediaType");
     }
@@ -262,9 +263,14 @@ public void missedNotificationTest() throws IOException {
 
     @Test
     public void missedNotificationWithTTLTest() throws IOException, InterruptedException {
+        System.out.println(subscriptionData);
         subscription.informSubscriber(aggregatedObject, new ObjectMapper().readTree(subscriptionData));
-        Thread.sleep(7000);
-        assertTrue(mongoDBHandler.getAllDocuments(DB_NAME, COLLECTION_NAME).isEmpty());
+        // Time to live lower than 60 seconds will not have any effect since
+        // removal runs every 60 seconds
+        Thread.sleep(65000);
+        List<String> allDocs = mongoDBHandler.getAllDocuments(DB_NAME, COLLECTION_NAME);
+        System.out.println(allDocs.toString());
+        assertTrue(allDocs.isEmpty());
     }
 
     @Test
@@ -323,4 +329,4 @@ private MultiValueMap<String, String> mapNotificationMessage() throws IOExceptio
         }
         return mapNotificationMessage;
     }
-}
+}