diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index 7bd3be63..e432e4fb 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -67,6 +67,24 @@ + + org.springframework.boot + spring-boot-starter-test + ${version.spring-boot} + test + + + org.skyscreamer + jsonassert + + + + + org.junit.jupiter + junit-jupiter + ${version.junit.jupiter} + test + io.github.bonigarcia selenium-jupiter @@ -79,7 +97,6 @@ ${version.webdrivermanager} test - org.seleniumhq.selenium selenium-java 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 ffc35cf1..83d198a5 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 @@ -59,8 +59,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.junit.platform.runner.JUnitPlatform; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.Dimension; @@ -72,6 +71,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.test.context.junit.jupiter.SpringExtension; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; @@ -116,7 +116,7 @@ import io.openvidu.test.browsers.utils.Unzipper; */ @Tag("e2e") @DisplayName("E2E tests for OpenVidu TestApp") -@RunWith(JUnitPlatform.class) +@ExtendWith(SpringExtension.class) public class OpenViduTestAppE2eTest { static String OPENVIDU_SECRET = "MY_SECRET"; @@ -3296,16 +3296,16 @@ public class OpenViduTestAppE2eTest { return colorMap; } + private void startKms() { + log.info("Starting KMS"); + commandLine.executeCommand("/usr/bin/kurento-media-server &>> /kms.log &"); + } + private void stopKms() { log.info("Stopping KMS"); commandLine.executeCommand("kill -9 $(pidof kurento-media-server)"); } - private void startKms() { - log.info("Starting KMS"); - commandLine.executeCommand("/usr/bin/kurento-media-server &> /kms.log &"); - } - private void restartKms() { this.stopKms(); try {