openvidu-test-e2e: multiple button click with foreach lambdas

pull/203/head
pabloFuente 2019-01-28 11:43:50 +01:00
parent 927bfcf22e
commit 56ea6c4a13
2 changed files with 30 additions and 57 deletions

View File

@ -230,16 +230,9 @@ public class OpenViduTestAppE2eTest {
log.info("One2One [Audio]"); log.info("One2One [Audio]");
user.getDriver().findElement(By.id("one2one-btn")).click(); user.getDriver().findElement(By.id("one2one-btn")).click();
List<WebElement> l1 = user.getDriver().findElements(By.className("send-video-checkbox")); user.getDriver().findElements(By.className("send-video-checkbox")).forEach(el -> el.click());
for (WebElement el : l1) { user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
el.click();
}
List<WebElement> l2 = user.getDriver().findElements(By.className("join-btn"));
for (WebElement el : l2) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 2); user.getEventManager().waitUntilEventReaches("accessAllowed", 2);
@ -262,16 +255,9 @@ public class OpenViduTestAppE2eTest {
log.info("One2One [Video]"); log.info("One2One [Video]");
user.getDriver().findElement(By.id("one2one-btn")).click(); user.getDriver().findElement(By.id("one2one-btn")).click();
List<WebElement> l1 = user.getDriver().findElements(By.className("send-audio-checkbox")); user.getDriver().findElements(By.className("send-audio-checkbox")).forEach(el -> el.click());
for (WebElement el : l1) { user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
el.click();
}
List<WebElement> l2 = user.getDriver().findElements(By.className("join-btn"));
for (WebElement el : l2) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 2); user.getEventManager().waitUntilEventReaches("accessAllowed", 2);
@ -388,11 +374,8 @@ public class OpenViduTestAppE2eTest {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
addUser.click(); addUser.click();
} }
List<WebElement> l = user.getDriver().findElements(By.className("join-btn")); user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
for (WebElement el : l) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 16); user.getEventManager().waitUntilEventReaches("connectionCreated", 16);
user.getEventManager().waitUntilEventReaches("accessAllowed", 4); user.getEventManager().waitUntilEventReaches("accessAllowed", 4);
@ -517,16 +500,9 @@ public class OpenViduTestAppE2eTest {
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
addUser.click(); addUser.click();
} }
List<WebElement> publishCheckboxes = user.getDriver().findElements(By.className("publish-checkbox")); user.getDriver().findElements(By.className("publish-checkbox")).forEach(el -> el.click());
for (WebElement el : publishCheckboxes) { user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
el.click();
}
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn"));
for (WebElement el : joinButtons) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 16); user.getEventManager().waitUntilEventReaches("connectionCreated", 16);
user.getDriver().findElements(By.className(("message-btn"))).get(0).click(); user.getDriver().findElements(By.className(("message-btn"))).get(0).click();
@ -547,10 +523,7 @@ public class OpenViduTestAppE2eTest {
user.getDriver().findElement(By.id("one2one-btn")).click(); user.getDriver().findElement(By.id("one2one-btn")).click();
user.getDriver().findElement(By.cssSelector("#openvidu-instance-0 .publish-checkbox")).click(); user.getDriver().findElement(By.cssSelector("#openvidu-instance-0 .publish-checkbox")).click();
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn")); user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
for (WebElement el : joinButtons) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 1); user.getEventManager().waitUntilEventReaches("accessAllowed", 1);
@ -794,10 +767,7 @@ public class OpenViduTestAppE2eTest {
user.getDriver().findElement(By.id("save-btn")).click(); user.getDriver().findElement(By.id("save-btn")).click();
Thread.sleep(1000); Thread.sleep(1000);
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn")); user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
for (WebElement el : joinButtons) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 9); user.getEventManager().waitUntilEventReaches("connectionCreated", 9);
user.getEventManager().waitUntilEventReaches("accessAllowed", 1); user.getEventManager().waitUntilEventReaches("accessAllowed", 1);
@ -1259,7 +1229,7 @@ public class OpenViduTestAppE2eTest {
void remoteRecordAudioOnlyVideoOnlyTest() throws Exception { void remoteRecordAudioOnlyVideoOnlyTest() throws Exception {
isRecordingTest = true; isRecordingTest = true;
setupBrowser("chrome"); setupBrowser("chromeAlternateScreenShare");
log.info("Remote record cross-browser audio-only and video-only"); log.info("Remote record cross-browser audio-only and video-only");
@ -1307,9 +1277,17 @@ public class OpenViduTestAppE2eTest {
}); });
t.setUncaughtExceptionHandler(h); t.setUncaughtExceptionHandler(h);
t.start(); t.start();
// Chrome user screen share only-video
user.getDriver().findElement(By.id("add-user-btn")).click(); user.getDriver().findElement(By.id("add-user-btn")).click();
user.getDriver().findElement(By.className("join-btn")).click(); user.getDriver().findElement(By.cssSelector("#openvidu-instance-0 .screen-radio")).click();
// Chrome user audio-only
user.getDriver().findElement(By.id("add-user-btn")).click();
user.getDriver().findElement(By.cssSelector("#openvidu-instance-1 .send-video-checkbox")).click();
// Join Chrome users
user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 2); user.getEventManager().waitUntilEventReaches("accessAllowed", 2);
@ -1322,7 +1300,7 @@ public class OpenViduTestAppE2eTest {
gracefullyLeaveParticipants(1); gracefullyLeaveParticipants(1);
t.join(); // t.join();
synchronized (lock) { synchronized (lock) {
if (OpenViduTestAppE2eTest.ex != null) { if (OpenViduTestAppE2eTest.ex != null) {
@ -1458,10 +1436,7 @@ public class OpenViduTestAppE2eTest {
user.getDriver().findElement(By.id("add-user-btn")).click(); user.getDriver().findElement(By.id("add-user-btn")).click();
user.getDriver().findElement(By.cssSelector("#openvidu-instance-1 .publish-checkbox")).click(); user.getDriver().findElement(By.cssSelector("#openvidu-instance-1 .publish-checkbox")).click();
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn")); user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
for (WebElement el : joinButtons) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 1); user.getEventManager().waitUntilEventReaches("accessAllowed", 1);
@ -1611,10 +1586,7 @@ public class OpenViduTestAppE2eTest {
user.getDriver().findElement(By.id("save-btn")).click(); user.getDriver().findElement(By.id("save-btn")).click();
Thread.sleep(1000); Thread.sleep(1000);
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn")); user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
for (WebElement el : joinButtons) {
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4); user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 1); user.getEventManager().waitUntilEventReaches("accessAllowed", 1);

View File

@ -67,9 +67,9 @@ public class MultimediaFileMetadata {
if (iteration == 0) { if (iteration == 0) {
this.executeCommand("chmod 777 /tmp/jave/ffmpeg*"); this.executeCommand("chmod 777 /tmp/jave/ffmpeg*");
} else if (iteration < 5) { } else if (iteration < 5) {
this.processMultimediaFile(iteration++); this.processMultimediaFile(++iteration);
} else { } else {
log.error("Couldn't run jave 5 iterations"); log.error("Couldn't run jave in 5 iterations");
return; return;
} }
} }
@ -144,6 +144,7 @@ public class MultimediaFileMetadata {
} }
private void executeCommand(String command) { private void executeCommand(String command) {
log.info("Running bash command '{}'", command);
try { try {
String s; String s;
Process p; Process p;