diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java index 7d704be0..8bb87fa7 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java @@ -32,20 +32,20 @@ import org.openqa.selenium.remote.RemoteWebDriver; public class ChromeUser extends BrowserUser { - public ChromeUser(String userName, int timeOfWaitInSeconds, boolean runningAsRoot) { - this(userName, timeOfWaitInSeconds, generateDefaultScreenChromeOptions(runningAsRoot)); + public ChromeUser(String userName, int timeOfWaitInSeconds, boolean headless) { + this(userName, timeOfWaitInSeconds, generateDefaultScreenChromeOptions(), headless); } - public ChromeUser(String userName, int timeOfWaitInSeconds, String screenToCapture, boolean runningAsRoot) { - this(userName, timeOfWaitInSeconds, generateCustomScreenChromeOptions(screenToCapture, runningAsRoot, - Paths.get("/opt/openvidu/fakeaudio.wav"))); + public ChromeUser(String userName, int timeOfWaitInSeconds, String screenToCapture) { + this(userName, timeOfWaitInSeconds, + generateCustomScreenChromeOptions(screenToCapture, Paths.get("/opt/openvidu/fakeaudio.wav")), false); } public ChromeUser(String userName, int timeOfWaitInSeconds, Path fakeVideoLocation) { - this(userName, timeOfWaitInSeconds, generateFakeVideoChromeOptions(fakeVideoLocation)); + this(userName, timeOfWaitInSeconds, generateFakeVideoChromeOptions(fakeVideoLocation), false); } - private ChromeUser(String userName, int timeOfWaitInSeconds, ChromeOptions options) { + private ChromeUser(String userName, int timeOfWaitInSeconds, ChromeOptions options, boolean headless) { super(userName, timeOfWaitInSeconds); String REMOTE_URL = System.getProperty("REMOTE_URL_CHROME"); @@ -53,7 +53,7 @@ public class ChromeUser extends BrowserUser { options.setAcceptInsecureCerts(true); options.setUnhandledPromptBehaviour(UnexpectedAlertBehaviour.IGNORE); - if (REMOTE_URL != null) { + if (REMOTE_URL != null && headless) { options.setHeadless(true); } @@ -81,7 +81,7 @@ public class ChromeUser extends BrowserUser { this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } - private static ChromeOptions generateDefaultScreenChromeOptions(boolean runningAsRoot) { + private static ChromeOptions generateDefaultScreenChromeOptions() { ChromeOptions options = new ChromeOptions(); // This flag avoids to grant the user media options.addArguments("--use-fake-ui-for-media-stream"); @@ -89,29 +89,16 @@ public class ChromeUser extends BrowserUser { options.addArguments("--use-fake-device-for-media-stream"); // This flag selects the entire screen as video source when screen sharing options.addArguments("--auto-select-desktop-capture-source=Entire screen"); - - // Background Chrome - // options.addArguments("--headless"); - - if (runningAsRoot) { - options.addArguments("--no-sandbox"); - } - return options; } - private static ChromeOptions generateCustomScreenChromeOptions(String screenToCapture, boolean runningAsRoot, - Path audioFileLocation) { + private static ChromeOptions generateCustomScreenChromeOptions(String screenToCapture, Path audioFileLocation) { ChromeOptions options = new ChromeOptions(); // This flag selects the entire screen as video source when screen sharing options.addArguments("--auto-select-desktop-capture-source=" + screenToCapture); options.addArguments("--use-fake-device-for-media-stream"); options.addArguments("--use-file-for-fake-audio-capture=" + audioFileLocation.toString()); - if (runningAsRoot) { - options.addArguments("--no-sandbox"); - } - return options; } diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java index cbfb900c..118bbbc0 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java @@ -10,6 +10,7 @@ import java.nio.file.Paths; import java.time.Duration; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -21,7 +22,6 @@ import java.util.stream.Stream; import org.apache.commons.io.FileUtils; import org.apache.http.HttpStatus; import org.junit.Assert; -import org.junit.ClassRule; import org.junit.jupiter.api.AfterEach; import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebDriver; @@ -58,21 +58,6 @@ import io.openvidu.test.browsers.utils.RecordingUtils; public class OpenViduTestE2e { - @ClassRule - public static GenericContainer chrome; - - @ClassRule - public static GenericContainer firefox; - - @ClassRule - public static GenericContainer opera; - - @ClassRule - public static GenericContainer edge; - - @ClassRule - public static GenericContainer android; - private final static WaitStrategy waitBrowser = Wait.forHttp("/wd/hub/status").forStatusCode(200); private final static WaitStrategy waitAndroid = Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(600)); @@ -112,6 +97,7 @@ public class OpenViduTestE2e { protected static final String RECORDING_IMAGE = "openvidu/openvidu-recording"; protected Collection browserUsers = new HashSet<>(); + protected Collection> containers = new HashSet<>(); protected volatile static boolean isRecordingTest; protected volatile static boolean isKurentoRestartTest; @@ -133,59 +119,89 @@ public class OpenViduTestE2e { } } - @SuppressWarnings("resource") - protected static void prepareBrowsers(Set browsers) { - if (browsers.contains(BrowserNames.CHROME)) { - if (isRemote(BrowserNames.CHROME)) { - chrome = new GenericContainer<>(DockerImageName.parse("selenium/standalone-chrome:" + CHROME_VERSION)) - .withSharedMemorySize(2147483648L).withFileSystemBind("/opt/openvidu", "/opt/openvidu") - .withEnv(Map.of("START_XVFB", "false", "SE_NODE_OVERRIDE_MAX_SESSIONS", "true", - "SE_NODE_MAX_SESSIONS", "2")) - .withExposedPorts(4444).waitingFor(waitBrowser); - chrome.setPortBindings(Arrays.asList("6666:4444")); - } else { - WebDriverManager.chromedriver().setup(); - } + private GenericContainer chromeContainer(String image, long shmSize, int maxBrowserSessions, boolean headless) { + Map map = new HashMap<>(); + if (headless) { + map.put("START_XVFB", "false"); } - if (browsers.contains(BrowserNames.FIREFOX)) { - if (isRemote(BrowserNames.FIREFOX)) { - firefox = new GenericContainer<>( - DockerImageName.parse("selenium/standalone-firefox:" + FIREFOX_VERSION)) - .withSharedMemorySize(2147483648L).withFileSystemBind("/opt/openvidu", "/opt/openvidu") - .withEnv(Map.of("START_XVFB", "false")).withExposedPorts(4444).waitingFor(waitBrowser); - firefox.setPortBindings(Arrays.asList("6667:4444")); - } else { - WebDriverManager.firefoxdriver().setup(); - } + if (maxBrowserSessions > 1) { + map.put("SE_NODE_OVERRIDE_MAX_SESSIONS", "true"); + map.put("SE_NODE_MAX_SESSIONS", String.valueOf(maxBrowserSessions)); } - if (browsers.contains(BrowserNames.OPERA)) { - if (isRemote(BrowserNames.OPERA)) { - opera = new GenericContainer<>(DockerImageName.parse("selenium/standalone-opera:" + OPERA_VERSION)) - .withSharedMemorySize(2147483648L).withFileSystemBind("/opt/openvidu", "/opt/openvidu") - .withExposedPorts(4444).waitingFor(waitBrowser); - opera.setPortBindings(Arrays.asList("6668:4444")); - } else { - WebDriverManager.operadriver().setup(); - } + GenericContainer chrome = new GenericContainer<>(DockerImageName.parse(image)).withSharedMemorySize(shmSize) + .withFileSystemBind("/opt/openvidu", "/opt/openvidu").withEnv(map).withExposedPorts(4444) + .waitingFor(waitBrowser); + chrome.setPortBindings(Arrays.asList("6666:4444")); + return chrome; + } + + private GenericContainer firefoxContainer(String image, long shmSize, int maxBrowserSessions, boolean headless) { + Map map = new HashMap<>(); + if (headless) { + map.put("START_XVFB", "false"); } - if (browsers.contains(BrowserNames.EDGE)) { - if (isRemote(BrowserNames.EDGE)) { - edge = new GenericContainer<>(DockerImageName.parse("selenium/standalone-edge:" + EDGE_VERSION)) - .withSharedMemorySize(2147483648L).withFileSystemBind("/opt/openvidu", "/opt/openvidu") - .withEnv(Map.of("START_XVFB", "false")).withExposedPorts(4444).waitingFor(waitBrowser); - edge.setPortBindings(Arrays.asList("6669:4444")); - } else { - WebDriverManager.edgedriver().setup(); - } + if (maxBrowserSessions > 1) { + map.put("SE_NODE_OVERRIDE_MAX_SESSIONS", "true"); + map.put("SE_NODE_MAX_SESSIONS", String.valueOf(maxBrowserSessions)); } - if (browsers.contains(BrowserNames.ANDROID)) { - android = new GenericContainer<>(DockerImageName.parse("budtmo/docker-android-x86-12.0:latest")) - .withPrivilegedMode(true) - .withEnv(Map.of("DEVICE", "Samsung Galaxy S10", "APPIUM", "true", "APPIUM_HOST", "172.17.0.1", - "APPIUM_PORT", "4723", "MOBILE_WEB_TEST", "true", "RELAXED_SECURITY", "true")) - .withSharedMemorySize(4294967296L).withExposedPorts(6080, 5554, 5555, 4723).waitingFor(waitAndroid) - .withFileSystemBind("/opt/openvidu-cache", "/opt/openvidu-cache"); - android.setPortBindings(Arrays.asList("6080:6080", "5554:5554", "5555:5555", "4723:4723")); + GenericContainer firefox = new GenericContainer<>(DockerImageName.parse(image)).withSharedMemorySize(shmSize) + .withFileSystemBind("/opt/openvidu", "/opt/openvidu").withEnv(map).withExposedPorts(4444) + .waitingFor(waitBrowser); + firefox.setPortBindings(Arrays.asList("6667:4444")); + return firefox; + } + + private GenericContainer operaContainer(String image, long shmSize, int maxBrowserSessions) { + Map map = new HashMap<>(); + if (maxBrowserSessions > 1) { + map.put("SE_NODE_OVERRIDE_MAX_SESSIONS", "true"); + map.put("SE_NODE_MAX_SESSIONS", String.valueOf(maxBrowserSessions)); + } + GenericContainer opera = new GenericContainer<>(DockerImageName.parse(image)).withSharedMemorySize(shmSize) + .withFileSystemBind("/opt/openvidu", "/opt/openvidu").withEnv(map).withExposedPorts(4444) + .waitingFor(waitBrowser); + opera.setPortBindings(Arrays.asList("6668:4444")); + return opera; + } + + private GenericContainer edgeContainer(String image, long shmSize, int maxBrowserSessions, boolean headless) { + Map map = new HashMap<>(); + if (headless) { + map.put("START_XVFB", "false"); + } + if (maxBrowserSessions > 1) { + map.put("SE_NODE_OVERRIDE_MAX_SESSIONS", "true"); + map.put("SE_NODE_MAX_SESSIONS", String.valueOf(maxBrowserSessions)); + } + GenericContainer edge = new GenericContainer<>(DockerImageName.parse(image)).withSharedMemorySize(shmSize) + .withFileSystemBind("/opt/openvidu", "/opt/openvidu").withEnv(map).withExposedPorts(4444) + .waitingFor(waitBrowser); + edge.setPortBindings(Arrays.asList("6669:4444")); + return edge; + } + + private GenericContainer androidContainer(String image, long shmSize) { + GenericContainer android = new GenericContainer<>(DockerImageName.parse(image)).withPrivilegedMode(true) + .withEnv(Map.of("DEVICE", "Samsung Galaxy S10", "APPIUM", "true", "APPIUM_HOST", "172.17.0.1", + "APPIUM_PORT", "4723", "MOBILE_WEB_TEST", "true", "RELAXED_SECURITY", "true")) + .withSharedMemorySize(shmSize).withExposedPorts(6080, 5554, 5555, 4723).waitingFor(waitAndroid) + .withFileSystemBind("/opt/openvidu-cache", "/opt/openvidu-cache"); + android.setPortBindings(Arrays.asList("6080:6080", "5554:5554", "5555:5555", "4723:4723")); + return android; + } + + protected static void prepareBrowserDrivers(Set browsers) { + if (browsers.contains(BrowserNames.CHROME) && !isRemote(BrowserNames.CHROME)) { + WebDriverManager.chromedriver().setup(); + } + if (browsers.contains(BrowserNames.FIREFOX) && !isRemote(BrowserNames.FIREFOX)) { + WebDriverManager.firefoxdriver().setup(); + } + if (browsers.contains(BrowserNames.OPERA) && !isRemote(BrowserNames.OPERA)) { + WebDriverManager.operadriver().setup(); + } + if (browsers.contains(BrowserNames.EDGE) && !isRemote(BrowserNames.EDGE)) { + WebDriverManager.edgedriver().setup(); } } @@ -294,43 +310,57 @@ public class OpenViduTestE2e { protected BrowserUser setupBrowser(String browser) { - BrowserUser browserUser; + BrowserUser browserUser = null; + GenericContainer container; switch (browser) { case "chrome": - setupBrowserAux(BrowserNames.CHROME, chrome, false); - browserUser = new ChromeUser("TestUser", 50, false); + container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true); + setupBrowserAux(BrowserNames.CHROME, container, false); + browserUser = new ChromeUser("TestUser", 50, true); + break; + case "chromeTwoInstances": + container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 2, true); + setupBrowserAux(BrowserNames.CHROME, container, false); + browserUser = new ChromeUser("TestUser", 50, true); + break; + case "chromeAlternateScreenShare": + container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false); + setupBrowserAux(BrowserNames.CHROME, container, false); + browserUser = new ChromeUser("TestUser", 50, "OpenVidu TestApp"); + break; + case "chromeAlternateFakeVideo": + container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false); + setupBrowserAux(BrowserNames.CHROME, container, false); + browserUser = new ChromeUser("TestUser", 50, Paths.get("/opt/openvidu/barcode.y4m")); break; case "firefox": - setupBrowserAux(BrowserNames.FIREFOX, firefox, false); + container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true); + setupBrowserAux(BrowserNames.FIREFOX, container, false); browserUser = new FirefoxUser("TestUser", 50, false); break; case "firefoxDisabledOpenH264": - setupBrowserAux(BrowserNames.FIREFOX, firefox, false); + container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true); + setupBrowserAux(BrowserNames.FIREFOX, container, false); browserUser = new FirefoxUser("TestUser", 50, true); break; case "opera": - setupBrowserAux(BrowserNames.OPERA, opera, false); + container = operaContainer("selenium/standalone-opera:" + OPERA_VERSION, 2147483648L, 1); + setupBrowserAux(BrowserNames.OPERA, container, false); browserUser = new OperaUser("TestUser", 50); break; case "edge": - setupBrowserAux(BrowserNames.EDGE, edge, false); + container = edgeContainer("selenium/standalone-edge:" + EDGE_VERSION, 2147483648L, 1, true); + setupBrowserAux(BrowserNames.EDGE, container, false); browserUser = new EdgeUser("TestUser", 50); break; - case "chromeAlternateScreenShare": - setupBrowserAux(BrowserNames.CHROME, chrome, false); - browserUser = new ChromeUser("TestUser", 50, "OpenVidu TestApp", false); - break; - case "chromeAsRoot": - setupBrowserAux(BrowserNames.CHROME, chrome, false); - browserUser = new ChromeUser("TestUser", 50, true); - break; case "androidChrome": - setupBrowserAux(BrowserNames.ANDROID, android, false); + container = androidContainer("budtmo/docker-android-x86-12.0:latest", 4294967296L); + setupBrowserAux(BrowserNames.ANDROID, container, false); try { // TODO: remove this try-catch when possible. Fixes // https://github.com/budtmo/docker-android/issues/309 - android.execInContainer("bash", "-c", + container.execInContainer("bash", "-c", "rm chromedriver && wget https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_linux64.zip && unzip chromedriver_linux64.zip && rm chromedriver_linux64.zip"); } catch (UnsupportedOperationException | IOException | InterruptedException e) { log.error("Error running command in Android container"); @@ -338,10 +368,11 @@ public class OpenViduTestE2e { browserUser = new AndroidChromeUser("TestUser", 50); break; case "androidFirefox": - setupBrowserAux(BrowserNames.ANDROID, android, false); + container = androidContainer("budtmo/docker-android-x86-12.0:latest", 4294967296L); + setupBrowserAux(BrowserNames.ANDROID, container, false); try { // Download geckodriver and place in PATH at /usr/bin/ - android.execInContainer("bash", "-c", + container.execInContainer("bash", "-c", "wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz && tar -xf geckodriver*.tar.gz && rm geckodriver*.tar.gz && mv geckodriver /usr/bin/."); } catch (UnsupportedOperationException | IOException | InterruptedException e) { log.error("Error running command in Android container"); @@ -349,11 +380,12 @@ public class OpenViduTestE2e { browserUser = new AndroidFirefoxUser("TestUser", 50); break; case "androidApp": - setupBrowserAux(BrowserNames.ANDROID, android, false); + container = androidContainer("budtmo/docker-android-x86-12.0:latest", 4294967296L); + setupBrowserAux(BrowserNames.ANDROID, container, false); try { // TODO: remove this try-catch when possible. Fixes // https://github.com/budtmo/docker-android/issues/309 - android.execInContainer("bash", "-c", + container.execInContainer("bash", "-c", "rm chromedriver && wget https://chromedriver.storage.googleapis.com/91.0.4472.101/chromedriver_linux64.zip && unzip chromedriver_linux64.zip && rm chromedriver_linux64.zip"); } catch (UnsupportedOperationException | IOException | InterruptedException e) { log.error("Error running command in Android container"); @@ -361,23 +393,13 @@ public class OpenViduTestE2e { browserUser = new AndroidAppUser("TestUser", 50, "/opt/openvidu-cache/app-debug.apk"); break; default: - setupBrowserAux(BrowserNames.CHROME, chrome, false); - browserUser = new ChromeUser("TestUser", 50, false); + log.error("Browser {} not recognized", browser); } this.browserUsers.add(browserUser); return browserUser; } - protected BrowserUser setupChromeWithFakeVideo(String absolutePathToVideoFile) { - if (isRemote(BrowserNames.CHROME)) { - setupBrowserAux(BrowserNames.CHROME, chrome, true); - } - BrowserUser browserUser = new ChromeUser("TestUser", 50, Paths.get(absolutePathToVideoFile)); - this.browserUsers.add(browserUser); - return browserUser; - } - private void setupBrowserAux(BrowserNames browser, GenericContainer container, boolean forceRestart) { if (isRemote(browser)) { if (forceRestart && container.isRunning()) { @@ -385,6 +407,7 @@ public class OpenViduTestE2e { } if (!container.isRunning()) { container.start(); + containers.add(container); } } } @@ -440,11 +463,12 @@ public class OpenViduTestE2e { it1.remove(); } // Stop and remove all browser containers if necessary - stopContainerIfPossible(chrome); - stopContainerIfPossible(firefox); - stopContainerIfPossible(opera); - stopContainerIfPossible(edge); - stopContainerIfPossible(android); + Iterator> it2 = containers.iterator(); + while (it2.hasNext()) { + GenericContainer c = it2.next(); + stopContainerIfPossible(c); + it2.remove(); + } // Reset REST client OV = new OpenVidu(OPENVIDU_URL, OPENVIDU_SECRET); } @@ -452,6 +476,7 @@ public class OpenViduTestE2e { private void stopContainerIfPossible(GenericContainer container) { if (container != null && container.isRunning()) { container.stop(); + container.close(); } } diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java index e79718d8..53e7b9bb 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/AbstractOpenViduTestappE2eTest.java @@ -35,20 +35,6 @@ public class AbstractOpenViduTestappE2eTest extends OpenViduTestE2e { return testappUser; } - protected OpenViduTestappUser setupChromeWithFakeVideoAndConnectToOpenViduTestApp(String absolutePathToVideoFile) { - BrowserUser browserUser = this.setupChromeWithFakeVideo(absolutePathToVideoFile); - OpenViduTestappUser testappUser = new OpenViduTestappUser(browserUser); - testappUser.getDriver().get(APP_URL); - WebElement urlInput = testappUser.getDriver().findElement(By.id("openvidu-url")); - urlInput.clear(); - urlInput.sendKeys(OPENVIDU_URL); - WebElement secretInput = testappUser.getDriver().findElement(By.id("openvidu-secret")); - secretInput.clear(); - secretInput.sendKeys(OPENVIDU_SECRET); - testappUser.getEventManager().startPolling(); - return testappUser; - } - protected void listEmptyRecordings(OpenViduTestappUser user) { // List existing recordings (empty) user.getDriver().findElement(By.id("list-recording-btn")).click(); diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java index 1f15c2ab..f2aab51e 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java @@ -57,7 +57,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest { protected static void setupAll() { checkFfmpegInstallation(); loadEnvironmentVariables(); - prepareBrowsers(new HashSet<>(Arrays.asList(BrowserNames.CHROME))); + prepareBrowserDrivers(new HashSet<>(Arrays.asList(BrowserNames.CHROME))); cleanFoldersAndSetUpOpenViduJavaClient(); } diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java index 49ae597a..9e04c345 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java @@ -100,7 +100,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { protected static void setupAll() throws Exception { checkFfmpegInstallation(); loadEnvironmentVariables(); - prepareBrowsers(new HashSet<>(Arrays.asList(BrowserNames.CHROME, BrowserNames.FIREFOX, BrowserNames.OPERA, + prepareBrowserDrivers(new HashSet<>(Arrays.asList(BrowserNames.CHROME, BrowserNames.FIREFOX, BrowserNames.OPERA, BrowserNames.EDGE, BrowserNames.ANDROID))); cleanFoldersAndSetUpOpenViduJavaClient(); getDefaultTranscodingValues(); @@ -139,8 +139,8 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { } @Test - @Disabled @DisplayName("One2One Chrome Android") + @Disabled void oneToOneChromeAndroid() throws Exception { long initTime = System.currentTimeMillis(); OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("androidChrome"); @@ -2204,7 +2204,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { @DisplayName("Video filter events test") void videoFilterEventsTest() throws Exception { - OpenViduTestappUser user = setupChromeWithFakeVideoAndConnectToOpenViduTestApp("/opt/openvidu/barcode.y4m"); + OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeAlternateFakeVideo"); log.info("Video filter events test"); @@ -3898,7 +3898,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { void webhookFilterEventTest() throws Exception { isRecordingTest = true; - OpenViduTestappUser user = setupChromeWithFakeVideoAndConnectToOpenViduTestApp("/opt/openvidu/barcode.y4m"); + OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeAlternateFakeVideo"); log.info("Webhook test");