Skip to content

Commit 5fa35c6

Browse files
fix wrong merge
fix wrong merge
1 parent 0aaae1d commit 5fa35c6

File tree

2 files changed

+42
-36
lines changed

2 files changed

+42
-36
lines changed

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -109,38 +109,38 @@ public void before() {
109109
@Override
110110
List<String> getEventNamesToSend() {
111111
ArrayList<String> eventNames = new ArrayList<>();
112-
// eventNames.add("EiffelActivityCanceledEvent");
113-
// eventNames.add("EiffelActivityStartedEvent");
114-
// eventNames.add("EiffelActivityFinishedEvent");
115-
// eventNames.add("EiffelActivityTriggeredEvent");
116-
// eventNames.add("EiffelAnnouncementPublishedEvent");
117-
// eventNames.add("EiffelArtifactCreatedEvent");
118-
// eventNames.add("EiffelArtifactPublishedEvent");
119-
// eventNames.add("EiffelArtifactReusedEvent");
120-
// eventNames.add("EiffelCompositionDefinedEvent");
112+
eventNames.add("EiffelActivityCanceledEvent");
113+
eventNames.add("EiffelActivityStartedEvent");
114+
eventNames.add("EiffelActivityFinishedEvent");
115+
eventNames.add("EiffelActivityTriggeredEvent");
116+
eventNames.add("EiffelAnnouncementPublishedEvent");
117+
eventNames.add("EiffelArtifactCreatedEvent");
118+
eventNames.add("EiffelArtifactPublishedEvent");
119+
eventNames.add("EiffelArtifactReusedEvent");
120+
eventNames.add("EiffelCompositionDefinedEvent");
121121
eventNames.add("EiffelConfidenceLevelModifiedEvent");
122-
// eventNames.add("EiffelEnvironmentDefinedEvent");
123-
// eventNames.add("EiffelFlowContextDefinedEvent");
124-
// eventNames.add("EiffelIssueVerifiedEvent");
125-
// eventNames.add("EiffelSourceChangeCreatedEvent");
126-
// eventNames.add("EiffelSourceChangeSubmittedEvent");
127-
// eventNames.add("EiffelTestCaseCanceledEvent");
128-
// eventNames.add("EiffelTestCaseFinishedEvent");
129-
// eventNames.add("EiffelTestCaseStartedEvent");
130-
// eventNames.add("EiffelTestCaseTriggeredEvent");
131-
// eventNames.add("EiffelTestExecutionRecipeCollectionCreatedEvent");
132-
// eventNames.add("EiffelTestSuiteFinishedEvent");
133-
// eventNames.add("EiffelTestSuiteStartedEvent");
134-
// eventNames.add("EiffelArtifactDeployedEvent");
135-
// eventNames.add("EiffelServiceAllocatedEvent");
136-
// eventNames.add("EiffelServiceDeployedEvent");
137-
// eventNames.add("EiffelServiceDiscontinuedEvent");
138-
// eventNames.add("EiffelServiceReturnedEvent");
139-
// eventNames.add("EiffelServiceStartedEvent");
140-
// eventNames.add("EiffelServiceStoppedEvent");
141-
// eventNames.add("EiffelAlertAcknowledgedEvent");
142-
// eventNames.add("EiffelAlertCeasedEvent");
143-
// eventNames.add("EiffelAlertRaisedEvent");
122+
eventNames.add("EiffelEnvironmentDefinedEvent");
123+
eventNames.add("EiffelFlowContextDefinedEvent");
124+
eventNames.add("EiffelIssueVerifiedEvent");
125+
eventNames.add("EiffelSourceChangeCreatedEvent");
126+
eventNames.add("EiffelSourceChangeSubmittedEvent");
127+
eventNames.add("EiffelTestCaseCanceledEvent");
128+
eventNames.add("EiffelTestCaseFinishedEvent");
129+
eventNames.add("EiffelTestCaseStartedEvent");
130+
eventNames.add("EiffelTestCaseTriggeredEvent");
131+
eventNames.add("EiffelTestExecutionRecipeCollectionCreatedEvent");
132+
eventNames.add("EiffelTestSuiteFinishedEvent");
133+
eventNames.add("EiffelTestSuiteStartedEvent");
134+
eventNames.add("EiffelArtifactDeployedEvent");
135+
eventNames.add("EiffelServiceAllocatedEvent");
136+
eventNames.add("EiffelServiceDeployedEvent");
137+
eventNames.add("EiffelServiceDiscontinuedEvent");
138+
eventNames.add("EiffelServiceReturnedEvent");
139+
eventNames.add("EiffelServiceStartedEvent");
140+
eventNames.add("EiffelServiceStoppedEvent");
141+
eventNames.add("EiffelAlertAcknowledgedEvent");
142+
eventNames.add("EiffelAlertCeasedEvent");
143+
eventNames.add("EiffelAlertRaisedEvent");
144144

145145
return eventNames;
146146
}

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.IOException;
2525
import java.util.HashSet;
2626
import java.util.Iterator;
27+
import java.util.List;
2728
import java.util.Set;
2829

2930
import javax.annotation.PostConstruct;
@@ -147,8 +148,8 @@ public static void setUpEmbeddedMongo() throws JSONException, IOException {
147148
} catch (Exception e) {
148149
LOGGER.error(e.getMessage(), e);
149150
e.printStackTrace();
150-
}
151-
151+
}
152+
152153
url = new JSONObject(subscriptionData).getString("notificationMeta").replaceAll(REGEX, "");
153154
headerContentMediaType = new JSONObject(subscriptionData).getString("restPostBodyMediaType");
154155
}
@@ -262,9 +263,14 @@ public void missedNotificationTest() throws IOException {
262263

263264
@Test
264265
public void missedNotificationWithTTLTest() throws IOException, InterruptedException {
266+
System.out.println(subscriptionData);
265267
subscription.informSubscriber(aggregatedObject, new ObjectMapper().readTree(subscriptionData));
266-
Thread.sleep(7000);
267-
assertTrue(mongoDBHandler.getAllDocuments(DB_NAME, COLLECTION_NAME).isEmpty());
268+
// Time to live lower than 60 seconds will not have any effect since
269+
// removal runs every 60 seconds
270+
Thread.sleep(65000);
271+
List<String> allDocs = mongoDBHandler.getAllDocuments(DB_NAME, COLLECTION_NAME);
272+
System.out.println(allDocs.toString());
273+
assertTrue(allDocs.isEmpty());
268274
}
269275

270276
@Test
@@ -323,4 +329,4 @@ private MultiValueMap<String, String> mapNotificationMessage() throws IOExceptio
323329
}
324330
return mapNotificationMessage;
325331
}
326-
}
332+
}

0 commit comments

Comments
 (0)