ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-test-e2e: fix ipCamera test

pull/553/head
pabloFuente 2020-10-19 13:38:54 +02:00
parent 759acb1f7c
commit 98d73023d0
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduProTestAppE2eTest.java
View File

@ -302,8 +302,7 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
+ tokenConnectionId + "','role':'SUBSCRIBER','record':true,'token':'" + token + tokenConnectionId + "','role':'SUBSCRIBER','record':true,'token':'" + token
+ "','sessionId':'CUSTOM_SESSION_ID','serverData':'','publishers':[],'subscribers':[]}"); + "','sessionId':'CUSTOM_SESSION_ID','serverData':'','publishers':[],'subscribers':[]}");
restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/" + tokenConnectionId, restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/" + tokenConnectionId,
"{'role':'PUBLISHER'}", HttpStatus.SC_OK, "{'role':'PUBLISHER'}", HttpStatus.SC_OK, false, true, true,
false, true, true,
"{'id':'" + tokenConnectionId "{'id':'" + tokenConnectionId
+ "','object':'connection','type':'WEBRTC','status':'active','connectionId':'" + "','object':'connection','type':'WEBRTC','status':'active','connectionId':'"
+ tokenConnectionId + "','role':'PUBLISHER','record':true,'token':'" + token + tokenConnectionId + "','role':'PUBLISHER','record':true,'token':'" + token

12
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
View File

@ -3264,7 +3264,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
CustomHttpClient restClient = new CustomHttpClient(OPENVIDU_URL, "OPENVIDUAPP", OPENVIDU_SECRET); CustomHttpClient restClient = new CustomHttpClient(OPENVIDU_URL, "OPENVIDUAPP", OPENVIDU_SECRET);
// Wrong session [404] // Wrong session [404]
restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/WRONG_SESSION/connection", "{}", restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/WRONG_SESSION/connection", "{'type':'IPCAM'}",
HttpStatus.SC_NOT_FOUND); HttpStatus.SC_NOT_FOUND);
// Init a session and publish IP camera AS FIRST PARTICIPANT // Init a session and publish IP camera AS FIRST PARTICIPANT
@ -3272,12 +3272,16 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
HttpStatus.SC_OK, true, false, true, DEFAULT_JSON_SESSION); HttpStatus.SC_OK, true, false, true, DEFAULT_JSON_SESSION);
// No rtspUri [400] // No rtspUri [400]
restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/IP_CAM_SESSION/connection", "{}", restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/IP_CAM_SESSION/connection", "{'type':'IPCAM'}",
HttpStatus.SC_BAD_REQUEST); HttpStatus.SC_BAD_REQUEST);
// Wrong rtspUri (invalid url format) [400] // Wrong rtspUri (invalid url format) [400]
restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/IP_CAM_SESSION/connection", restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/IP_CAM_SESSION/connection",
"{'rtspUri': 'NOT_A_URL'}", HttpStatus.SC_BAD_REQUEST); "{'type':'IPCAM','rtspUri': 'NOT_A_URL'}", HttpStatus.SC_BAD_REQUEST);
// Wrong adaptativeBitrate [400]
restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/IP_CAM_SESSION/connection",
"{'type':'IPCAM','rtspUri':'rtsp://dummyurl.com','adaptativeBitrate':123,}",
HttpStatus.SC_BAD_REQUEST);
// Publish IP camera. Dummy URL because no user will subscribe to it [200] // Publish IP camera. Dummy URL because no user will subscribe to it [200]
String ipCamBody = "{'type':'IPCAM','rtspUri':'rtsp://dummyurl.com','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'networkCache':1000,'data':'MY_IP_CAMERA'}"; String ipCamBody = "{'type':'IPCAM','rtspUri':'rtsp://dummyurl.com','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'networkCache':1000,'data':'MY_IP_CAMERA'}";
@ -3458,7 +3462,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
// Publish video only IPCAM // Publish video only IPCAM
fullRecordingPath = "file://" + recPath + "TestSession-1/videoOnly.mp4"; fullRecordingPath = "file://" + recPath + "TestSession-1/videoOnly.mp4";
ipCamBody = "{'rtspUri':'" + fullRecordingPath + "'}"; ipCamBody = "{'type':'IPCAM','rtspUri':'" + fullRecordingPath + "'}";
response = restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/TestSession/connection", ipCamBody, response = restClient.rest(HttpMethod.POST, "/openvidu/api/sessions/TestSession/connection", ipCamBody,
HttpStatus.SC_OK); HttpStatus.SC_OK);
CustomWebhook.waitForEvent("sessionCreated", 1); CustomWebhook.waitForEvent("sessionCreated", 1);