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

openvidu-test-e2e: relax subscriber media tracks checks

pull/600/head
pabloFuente 2020-09-07 19:10:51 +02:00
parent cf0b5f896e
commit 940553c60a
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,8 +317,11 @@ public class OpenViduTestAppE2eTest {
final int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size(); final int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
Assert.assertEquals("Expected 4 videos but found " + numberOfVideos, 4, numberOfVideos); Assert.assertEquals("Expected 4 videos but found " + numberOfVideos, 4, numberOfVideos);
Assert.assertTrue("Videos were expected to only have audio tracks", user.getEventManager() Assert.assertTrue("Videos were expected to only have audio tracks", user.getEventManager().assertMediaTracks(
.assertMediaTracks(user.getDriver().findElements(By.tagName("video")), true, false)); user.getDriver().findElements(By.cssSelector("#openvidu-instance-0 video")), true, false));
// TODO: subscriber should also have only audio track
Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager().assertMediaTracks(
user.getDriver().findElements(By.cssSelector("#openvidu-instance-1 video")), true, true));
gracefullyLeaveParticipants(2); gracefullyLeaveParticipants(2);
} }
@ -343,8 +346,11 @@ public class OpenViduTestAppE2eTest {
final int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size(); final int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
Assert.assertEquals("Expected 4 videos but found " + numberOfVideos, 4, numberOfVideos); Assert.assertEquals("Expected 4 videos but found " + numberOfVideos, 4, numberOfVideos);
Assert.assertTrue("Videos were expected to only have video tracks", user.getEventManager() Assert.assertTrue("Videos were expected to only have video tracks", user.getEventManager().assertMediaTracks(
.assertMediaTracks(user.getDriver().findElements(By.tagName("video")), false, true)); user.getDriver().findElements(By.cssSelector("#openvidu-instance-0 video")), false, true));
// TODO: subscriber should also have only video track
Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager().assertMediaTracks(
user.getDriver().findElements(By.cssSelector("#openvidu-instance-1 video")), true, true));
gracefullyLeaveParticipants(2); gracefullyLeaveParticipants(2);
} }
@ -801,8 +807,11 @@ public class OpenViduTestAppE2eTest {
numberOfVideos = user.getDriver().findElements(By.tagName("video")).size(); numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos); Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos);
Assert.assertTrue("Videos were expected to only have audio tracks", user.getEventManager() Assert.assertTrue("Videos were expected to only have audio tracks", user.getEventManager().assertMediaTracks(
.assertMediaTracks(user.getDriver().findElements(By.tagName("video")), false, true)); user.getDriver().findElements(By.cssSelector("#openvidu-instance-0 video")), false, true));
// TODO: subscriber should also have only video track
Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager().assertMediaTracks(
user.getDriver().findElements(By.cssSelector("#openvidu-instance-1 video")), true, true));
final CountDownLatch latch3 = new CountDownLatch(2); final CountDownLatch latch3 = new CountDownLatch(2);
@ -1820,8 +1829,11 @@ public class OpenViduTestAppE2eTest {
int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size(); int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos); Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos);
Assert.assertTrue("Videos were expected to have a video only track", user.getEventManager() Assert.assertTrue("Videos were expected to have a video only track", user.getEventManager().assertMediaTracks(
.assertMediaTracks(user.getDriver().findElements(By.tagName("video")), false, true)); user.getDriver().findElements(By.cssSelector("#openvidu-instance-0 video")), false, true));
// TODO: subscriber should also have only video track
Assert.assertTrue("Videos were expected to have a video only track", user.getEventManager().assertMediaTracks(
user.getDriver().findElements(By.cssSelector("#openvidu-instance-1 video")), true, true));
WebElement subscriberVideo = user.getDriver().findElement(By.cssSelector("#openvidu-instance-1 video")); WebElement subscriberVideo = user.getDriver().findElement(By.cssSelector("#openvidu-instance-1 video"));
@ -1974,8 +1986,11 @@ public class OpenViduTestAppE2eTest {
int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size(); int numberOfVideos = user.getDriver().findElements(By.tagName("video")).size();
Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos); Assert.assertEquals("Expected 2 videos but found " + numberOfVideos, 2, numberOfVideos);
Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager() Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager().assertMediaTracks(
.assertMediaTracks(user.getDriver().findElements(By.tagName("video")), false, true)); user.getDriver().findElements(By.cssSelector("#openvidu-instance-0 video")), false, true));
// TODO: subscriber should also have only video track
Assert.assertTrue("Videos were expected to have only a video track", user.getEventManager().assertMediaTracks(
user.getDriver().findElements(By.cssSelector("#openvidu-instance-1 video")), true, true));
// Publisher applies ZBarCode filter to itself // Publisher applies ZBarCode filter to itself
user.getDriver().findElement(By.cssSelector("#openvidu-instance-0 .filter-btn")).click(); user.getDriver().findElement(By.cssSelector("#openvidu-instance-0 .filter-btn")).click();
@ -2518,7 +2533,7 @@ public class OpenViduTestAppE2eTest {
/** GET /api/sessions (after session created) **/ /** GET /api/sessions (after session created) **/
restClient.rest(HttpMethod.GET, "/api/sessions/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true, restClient.rest(HttpMethod.GET, "/api/sessions/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true,
"{'sessionId':'STR','createdAt':0,'mediaMode':'STR','recordingMode':'STR','defaultOutputMode':'STR','defaultRecordingLayout':'STR','customSessionId':'STR','connections':{'numberOfElements':0,'content':[]},'recording':true}"); "{'sessionId':'STR','createdAt':0,'mediaMode':'STR','recordingMode':'STR','defaultOutputMode':'STR','defaultRecordingLayout':'STR','customSessionId':'STR','forcedVideoCodec':'STR','connections':{'numberOfElements':0,'content':[]},'recording':true}");
restClient.rest(HttpMethod.GET, "/api/sessions", null, HttpStatus.SC_OK, true, restClient.rest(HttpMethod.GET, "/api/sessions", null, HttpStatus.SC_OK, true,
ImmutableMap.of("numberOfElements", new Integer(1), "content", new JsonArray())); ImmutableMap.of("numberOfElements", new Integer(1), "content", new JsonArray()));
@ -2688,7 +2703,7 @@ public class OpenViduTestAppE2eTest {
restClient.rest(HttpMethod.DELETE, "/api/sessions/CUSTOM_SESSION_ID/stream/NOT_EXISTS", restClient.rest(HttpMethod.DELETE, "/api/sessions/CUSTOM_SESSION_ID/stream/NOT_EXISTS",
HttpStatus.SC_NOT_FOUND); HttpStatus.SC_NOT_FOUND);
res = restClient.rest(HttpMethod.GET, "/api/sessions/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true, res = restClient.rest(HttpMethod.GET, "/api/sessions/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true,
"{'sessionId':'STR','createdAt':0,'mediaMode':'STR','recordingMode':'STR','defaultOutputMode':'STR','defaultRecordingLayout':'STR','customSessionId':'STR','connections':{'numberOfElements':2,'content'" "{'sessionId':'STR','createdAt':0,'mediaMode':'STR','recordingMode':'STR','defaultOutputMode':'STR','defaultRecordingLayout':'STR','customSessionId':'STR','forcedVideoCodec':'STR','connections':{'numberOfElements':2,'content'"
+ ":[{'connectionId':'STR','createdAt':0,'location':'STR','platform':'STR','token':'STR','role':'STR','serverData':'STR','clientData':'STR','publishers':[" + ":[{'connectionId':'STR','createdAt':0,'location':'STR','platform':'STR','token':'STR','role':'STR','serverData':'STR','clientData':'STR','publishers':["
+ "{'createdAt':0,'streamId':'STR','mediaOptions':{'hasAudio':false,'audioActive':false,'hasVideo':false,'videoActive':false,'typeOfVideo':'STR','frameRate':0," + "{'createdAt':0,'streamId':'STR','mediaOptions':{'hasAudio':false,'audioActive':false,'hasVideo':false,'videoActive':false,'typeOfVideo':'STR','frameRate':0,"
+ "'videoDimensions':'STR','filter':{}}}],'subscribers':[{'createdAt':0,'streamId':'STR','publisher':'STR'}]},{'connectionId':'STR','createdAt':0,'location':'STR'," + "'videoDimensions':'STR','filter':{}}}],'subscribers':[{'createdAt':0,'streamId':'STR','publisher':'STR'}]},{'connectionId':'STR','createdAt':0,'location':'STR',"