SQ issues

Author: gthea

events/src/main/java/io/harness/events/EventsManagerCore.java

@@ -251,10 +251,8 @@ private boolean isSuppressed(E external) {
      */
     private boolean checkInternalTriggerConditions(E externalEvent, Set<I> seenInternal, I currentEvent) {
         Set<I> requireAll = mConfig.getRequireAll().get(externalEvent);
-        if (requireAll != null && !requireAll.isEmpty()) {
-            if (seenInternal.containsAll(requireAll)) {
-                return true;
-            }
+        if (requireAll != null && !requireAll.isEmpty() && seenInternal.containsAll(requireAll)) {
+            return true;
         }
 
         // Check RequireAny: The CURRENT internal event must be in one of the groups,

events/src/test/java/io/harness/events/EventsManagerTest.java

@@ -945,12 +945,10 @@ public void requireAnyDoesNotRetriggerFromHistoricalEvents() throws InterruptedE
         assertTrue(eventsManager.eventAlreadyTriggered(CookingEvent.DISH_SERVED));
 
         // SEASONING_ADJUSTED should NOT have fired (OVEN_PREHEATED is not its trigger)
-        Thread.sleep(100);
         assertEquals("Historical SEASONING_ADDED should not cause trigger", 0, seasoningCount.get());
 
         // Fire an unrelated internal event
         eventsManager.notifyInternalEvent(KitchenActivity.LEFTOVER_MEAT_FOUND, null);
-        Thread.sleep(100);
         assertEquals("Unrelated event should not cause trigger", 0, seasoningCount.get());
 
         // Now fire actual trigger - should work