openvidu-test-e2e: make OPENVIDU_PRO_SPEECH_TO_TEXT prop configurable

pull/761/head
pabloFuente 2022-11-11 14:24:06 +01:00
parent 8aad8948bf
commit 55c97c3d78
2 changed files with 37 additions and 33 deletions

View File

@ -80,6 +80,7 @@ public class OpenViduTestE2e {
protected static String EXTERNAL_CUSTOM_LAYOUT_URL = "http://localhost:4114";
protected static String OPENVIDU_PRO_LICENSE = "not_valid";
protected static String OPENVIDU_PRO_LICENSE_API = "not_valid";
protected static String OPENVIDU_PRO_SPEECH_TO_TEXT = "vosk";
protected static String EXTERNAL_CUSTOM_LAYOUT_PARAMS = "sessionId,CUSTOM_LAYOUT_SESSION,secret,MY_SECRET";
// https://hub.docker.com/r/selenium/standalone-chrome/tags
@ -308,6 +309,11 @@ public class OpenViduTestE2e {
if (openviduProLicenseApi != null) {
OPENVIDU_PRO_LICENSE_API = openviduProLicenseApi;
}
String openviduProSpeechToText = System.getProperty("OPENVIDU_PRO_SPEECH_TO_TEXT");
if (openviduProSpeechToText != null) {
OPENVIDU_PRO_SPEECH_TO_TEXT = openviduProSpeechToText;
}
}
protected BrowserUser setupBrowser(String browser) {
@ -337,10 +343,10 @@ public class OpenViduTestE2e {
browserUser = new ChromeUser("TestUser", 50, Paths.get("/opt/openvidu/barcode.y4m"));
break;
case "chromeFakeAudio":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, null, Paths.get("/opt/openvidu/stt-test.wav"));
break;
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, true);
setupBrowserAux(BrowserNames.CHROME, container, false);
browserUser = new ChromeUser("TestUser", 50, null, Paths.get("/opt/openvidu/stt-test.wav"));
break;
case "chromeVirtualBackgroundFakeVideo":
container = chromeContainer("selenium/standalone-chrome:" + CHROME_VERSION, 2147483648L, 1, false);
setupBrowserAux(BrowserNames.CHROME, container, false);
@ -687,19 +693,19 @@ public class OpenViduTestE2e {
}
}
protected void waitUntilUserHasEventsPresent(BrowserUser user, int numberOfUser, String eventType,
int numberOfEvents) {
user.getWaiter().until(d -> {
List<WebElement> elements = d.findElements(By.cssSelector("#openvidu-instance-" + numberOfUser
+ " .mat-expansion-panel .mat-expansion-panel-header .mat-content"));
long numberOfEventsOfRequiredType = elements.stream().filter(e -> eventType.equals(e.getText().trim()))
.count();
if (numberOfEvents == numberOfEventsOfRequiredType) {
return true;
} else {
return null;
}
});
}
protected void waitUntilUserHasEventsPresent(BrowserUser user, int numberOfUser, String eventType,
int numberOfEvents) {
user.getWaiter().until(d -> {
List<WebElement> elements = d.findElements(By.cssSelector("#openvidu-instance-" + numberOfUser
+ " .mat-expansion-panel .mat-expansion-panel-header .mat-content"));
long numberOfEventsOfRequiredType = elements.stream().filter(e -> eventType.equals(e.getText().trim()))
.count();
if (numberOfEvents == numberOfEventsOfRequiredType) {
return true;
} else {
return null;
}
});
}
}

View File

@ -781,7 +781,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("Simple transcription STT test");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
List<String> expectedRecognitionList = Arrays.asList(
"for example we used to think that after childhood the brain didnt really could not change and it turns out nothing is farther from the truth",
@ -857,7 +857,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("Close session STT test");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -912,7 +912,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("Expected errors STT test");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1005,7 +1005,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("1 session 1 stream 2 subscriptions 1 language STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1077,7 +1077,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("1 session 2 streams 2 subscriptions 1 language STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1148,7 +1148,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("1 session 1 stream 2 subscriptions 2 languages STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1216,7 +1216,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("1 session 2 streams 2 subscriptions 2 languages STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1285,7 +1285,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("2 sessions 2 streams 2 subscriptions 1 language STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1355,7 +1355,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("4 sessions 4 streams 4 subscriptions 4 languages STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1412,7 +1412,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("COMPOSED recording and STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1481,7 +1481,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
log.info("Memory leak STT");
restartOpenViduServerIfNecessary(false, null, "vosk");
restartOpenViduServerIfNecessary(false, null, OPENVIDU_PRO_SPEECH_TO_TEXT);
OpenViduTestappUser user = setupBrowserAndConnectToOpenViduTestapp("chromeFakeAudio");
@ -1541,10 +1541,8 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
protected void restartOpenViduServerIfNecessary(Boolean wantedNetworkQuality, Integer wantedNetworkQualityInterval,
String wantedSpeechToText) {
wantedSpeechToText = "azure";
try {
try {
CustomHttpClient restClient = new CustomHttpClient(OPENVIDU_URL, "OPENVIDUAPP", OPENVIDU_SECRET);
JsonObject config = restClient.rest(HttpMethod.GET, "/openvidu/api/config", 200);