openvidui-test-e2e: make test compatible for mediasoup config

v2
pabloFuente 2025-11-14 17:26:21 +01:00
parent c06097d101
commit c9703a49b0
2 changed files with 19 additions and 4 deletions

View File

@ -26,6 +26,8 @@ import java.net.http.HttpResponse;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.time.Duration;
import java.util.Base64;
import java.util.Map.Entry;
@ -100,7 +102,10 @@ public class CustomHttpClient {
throw new RuntimeException(e);
}
this.client = HttpClient.newBuilder().sslContext(sslContext).build();
this.client = HttpClient.newBuilder()
.sslContext(sslContext)
.connectTimeout(Duration.ofSeconds(20))
.build();
}
public int getAndReturnStatus(String path, String credentials) throws Exception {
@ -287,7 +292,9 @@ public class CustomHttpClient {
public String commonRestString(HttpMethod method, String path, String body, int status) throws Exception {
path = openviduUrl + (path.startsWith("/") ? path : ("/" + path));
HttpRequest.Builder builder = HttpRequest.newBuilder().uri(new URI(path));
HttpRequest.Builder builder = HttpRequest.newBuilder()
.uri(new URI(path))
.timeout(Duration.ofSeconds(20));
if (body != null && !body.isEmpty()) {
body = body.replaceAll("'", "\"");
BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(body);

View File

@ -1179,9 +1179,15 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
restClient.rest(HttpMethod.GET, "/openvidu/api/sessions", null, HttpURLConnection.HTTP_OK, true, true, true,
"{'numberOfElements':0,'content':[]}");
JsonObject currentConfig = restClient.rest(HttpMethod.GET, "/openvidu/api/config", null,
HttpURLConnection.HTTP_OK);
boolean isMediasoup = currentConfig.get("OPENVIDU_EDITION").getAsString().equals("enterprise")
&& currentConfig.get("OPENVIDU_ENTERPRISE_MEDIA_SERVER").getAsString().equals("mediasoup");
/** GET /openvidu/api/config **/
restClient.rest(HttpMethod.GET, "/openvidu/api/config", null, HttpURLConnection.HTTP_OK, true, false, true,
"{'VERSION':'STR','DOMAIN_OR_PUBLIC_IP':'STR','HTTPS_PORT':0,'OPENVIDU_EDITION':'STR','OPENVIDU_PUBLICURL':'STR','OPENVIDU_CDR':false,'OPENVIDU_STREAMS_VIDEO_MAX_RECV_BANDWIDTH':0,'OPENVIDU_STREAMS_VIDEO_MIN_RECV_BANDWIDTH':0,"
"{" +
"'VERSION':'STR','DOMAIN_OR_PUBLIC_IP':'STR','HTTPS_PORT':0,'OPENVIDU_EDITION':'STR','OPENVIDU_PUBLICURL':'STR','OPENVIDU_CDR':false,'OPENVIDU_STREAMS_VIDEO_MAX_RECV_BANDWIDTH':0,'OPENVIDU_STREAMS_VIDEO_MIN_RECV_BANDWIDTH':0,"
+ "'OPENVIDU_STREAMS_VIDEO_MAX_SEND_BANDWIDTH':0,'OPENVIDU_STREAMS_VIDEO_MIN_SEND_BANDWIDTH':0,'OPENVIDU_WEBRTC_SIMULCAST':false,'OPENVIDU_SESSIONS_GARBAGE_INTERVAL':0,'OPENVIDU_SESSIONS_GARBAGE_THRESHOLD':0,"
+ "'OPENVIDU_RECORDING':false,'OPENVIDU_RECORDING_VERSION':'STR','OPENVIDU_RECORDING_PATH':'STR','OPENVIDU_RECORDING_PUBLIC_ACCESS':false,'OPENVIDU_RECORDING_NOTIFICATION':'STR',"
+ "'OPENVIDU_RECORDING_CUSTOM_LAYOUT':'STR','OPENVIDU_RECORDING_AUTOSTOP_TIMEOUT':0,'OPENVIDU_WEBHOOK':false,'OPENVIDU_SERVER_DEPENDENCY_VERSION':'STR','KMS_URIS':[],"
@ -1189,7 +1195,9 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
+ "'OPENVIDU_PRO_CLUSTER_ENVIRONMENT':'STR','OPENVIDU_PRO_CLUSTER_MEDIA_NODES':0,'OPENVIDU_PRO_CLUSTER_PATH':'STR','OPENVIDU_PRO_CLUSTER_RECONNECTION_TIMEOUT':0,'OPENVIDU_PRO_CLUSTER_AUTOSCALING':false,"
+ "'OPENVIDU_PRO_ELASTICSEARCH':true,'OPENVIDU_PRO_ELASTICSEARCH_VERSION':'STR','OPENVIDU_PRO_ELASTICSEARCH_HOST':'STR','OPENVIDU_PRO_KIBANA':true,'OPENVIDU_PRO_KIBANA_VERSION':'STR',"
+ "'OPENVIDU_PRO_KIBANA_HOST':'STR','OPENVIDU_PRO_RECORDING_STORAGE':'STR','OPENVIDU_PRO_NETWORK_QUALITY':false,'OPENVIDU_STREAMS_ALLOW_TRANSCODING':false,'OPENVIDU_STREAMS_FORCED_VIDEO_CODEC':'STR',"
+ "'OPENVIDU_PRO_SPEECH_TO_TEXT':'STR'}");
+ "'OPENVIDU_PRO_SPEECH_TO_TEXT':'STR'"
+ (isMediasoup ? ",'OPENVIDU_ENTERPRISE_MEDIA_SERVER':'STR'" : "")
+ "}");
/** GET /openvidu/api/health **/
restClient.rest(HttpMethod.GET, "/openvidu/api/health", null, HttpURLConnection.HTTP_OK, true, true, true,