ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-test-e2e: clear filter events once listener is removed

pull/391/head
pabloFuente 2020-01-03 13:31:49 +01:00
parent 09cdcccd5f
commit 35fe6aa3da
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduEventManager.java
View File

@ -180,6 +180,12 @@ public class OpenViduEventManager {
} }
} }
// Sets any event count to 0
public synchronized void clearCurrentEvents(String eventName) {
this.eventNumbers.put(eventName, new AtomicInteger(0));
this.setCountDown(eventName, new CountDownLatch(0));
}
public boolean assertMediaTracks(WebElement videoElement, boolean audioTransmission, boolean videoTransmission, public boolean assertMediaTracks(WebElement videoElement, boolean audioTransmission, boolean videoTransmission,
String parentSelector) { String parentSelector) {
return this.assertMediaTracks(Collections.singleton(videoElement), audioTransmission, videoTransmission, return this.assertMediaTracks(Collections.singleton(videoElement), audioTransmission, videoTransmission,
@ -237,7 +243,7 @@ public class OpenViduEventManager {
} }
} }
private void getEventsFromBrowser() { private synchronized void getEventsFromBrowser() {
String rawEvents = this.getAndClearEventsInBrowser(); String rawEvents = this.getAndClearEventsInBrowser();
if (rawEvents == null || rawEvents.length() == 0) { if (rawEvents == null || rawEvents.length() == 0) {

15
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
View File

@ -1895,11 +1895,16 @@ public class OpenViduTestAppE2eTest {
// Publisher unsubscribes from "CodeFound" filter event // Publisher unsubscribes from "CodeFound" filter event
user.getDriver().findElement(By.id("unsub-filter-event-btn")).click(); user.getDriver().findElement(By.id("unsub-filter-event-btn")).click();
user.getWaiter().until(ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value",
"Filter event listener removed"));
// In case some filter event was receive while waiting for unsubscription
user.getEventManager().clearCurrentEvents("CodeFound");
try { try {
// If this active wait finishes successfully, then the removal of the event // If this active wait finishes successfully, then the removal of the event
// listener has not worked fine // listener has not worked fine
user.getEventManager().waitUntilEventReaches("CodeFound", 3, 3, false); user.getEventManager().waitUntilEventReaches("CodeFound", 1, 3, false);
Assert.fail("'filterEvent' was received. Filter.removeEventListener() failed"); Assert.fail("'filterEvent' was received. Filter.removeEventListener() failed");
} catch (Exception e) { } catch (Exception e) {
System.out.println("Filter event removal worked fine"); System.out.println("Filter event removal worked fine");
@ -1918,18 +1923,22 @@ public class OpenViduTestAppE2eTest {
user.getWaiter().until(ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value", user.getWaiter().until(ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value",
"Filter event listener added")); "Filter event listener added"));
user.getEventManager().waitUntilEventReaches("CodeFound", 4); user.getEventManager().waitUntilEventReaches("CodeFound", 1);
// Moderator removes the Publisher's filter // Moderator removes the Publisher's filter
user.getDriver().findElement(By.id("remove-filter-btn")).click(); user.getDriver().findElement(By.id("remove-filter-btn")).click();
user.getWaiter().until( user.getWaiter().until(
ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value", "Filter removed")); ExpectedConditions.attributeContains(By.id("filter-response-text-area"), "value", "Filter removed"));
// In case some filter event was receive while waiting for filter removal
user.getEventManager().clearCurrentEvents("CodeFound");
user.getEventManager().waitUntilEventReaches("streamPropertyChanged", 4); user.getEventManager().waitUntilEventReaches("streamPropertyChanged", 4);
try { try {
// If this active wait finishes successfully, then the removal of the filter has // If this active wait finishes successfully, then the removal of the filter has
// not worked fine // not worked fine
user.getEventManager().waitUntilEventReaches("CodeFound", 5, 3, false); user.getEventManager().waitUntilEventReaches("CodeFound", 1, 3, false);
Assert.fail("'filterEvent' was received. Stream.removeFilter() failed"); Assert.fail("'filterEvent' was received. Stream.removeFilter() failed");
} catch (Exception e) { } catch (Exception e) {
System.out.println("Filter removal worked fine"); System.out.println("Filter removal worked fine");