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

openvidu-test-e2e: updated to new RecordingProperties

pull/621/head
pabloFuente 2021-04-05 20:57:23 +02:00
parent 6cf14dfce2
commit 8cbaedb403
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1637,13 +1637,13 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
String recPath = recordingsPath + SESSION_NAME + "/"; String recPath = recordingsPath + SESSION_NAME + "/";
Recording recording = new OpenVidu(OPENVIDU_URL, OPENVIDU_SECRET).getRecording(SESSION_NAME); Recording recording = new OpenVidu(OPENVIDU_URL, OPENVIDU_SECRET).getRecording(SESSION_NAME);
this.recordingUtils.checkMultimediaFile(new File(recPath + recording.getName() + ".mp4"), false, true, this.recordingUtils.checkMultimediaFile(new File(recPath + recording.getName() + ".mp4"), false, true,
recording.getDuration(), recording.getResolution(), null, "h264", true); recording.getDuration(), recording.getResolution(), recording.getFrameRate(), null, "h264", true);
// Check audio-only COMPOSED recording // Check audio-only COMPOSED recording
recPath = recordingsPath + SESSION_NAME + "-1/"; recPath = recordingsPath + SESSION_NAME + "-1/";
recording = new OpenVidu(OPENVIDU_URL, OPENVIDU_SECRET).getRecording(SESSION_NAME + "-1"); recording = new OpenVidu(OPENVIDU_URL, OPENVIDU_SECRET).getRecording(SESSION_NAME + "-1");
this.recordingUtils.checkMultimediaFile(new File(recPath + recording.getName() + ".webm"), true, false, this.recordingUtils.checkMultimediaFile(new File(recPath + recording.getName() + ".webm"), true, false,
recording.getDuration(), null, "opus", null, true); recording.getDuration(), null, null, "opus", null, true);
// Check video-only INDIVIDUAL recording // Check video-only INDIVIDUAL recording
recPath = recordingsPath + SESSION_NAME + "-2/"; recPath = recordingsPath + SESSION_NAME + "-2/";
@ -2200,7 +2200,8 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
SessionProperties properties = new SessionProperties.Builder().customSessionId(customSessionId) SessionProperties properties = new SessionProperties.Builder().customSessionId(customSessionId)
.mediaMode(MediaMode.ROUTED).recordingMode(RecordingMode.ALWAYS) .mediaMode(MediaMode.ROUTED).recordingMode(RecordingMode.ALWAYS)
.defaultOutputMode(OutputMode.INDIVIDUAL).build(); .defaultRecordingProperties(new RecordingProperties.Builder().outputMode(OutputMode.INDIVIDUAL).build())
.build();
Session session = OV.createSession(properties); Session session = OV.createSession(properties);
Assert.assertFalse("Session.fetch() should return false after OpenVidu.createSession()", session.fetch()); Assert.assertFalse("Session.fetch() should return false after OpenVidu.createSession()", session.fetch());
@ -2294,7 +2295,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
Assert.assertEquals("Wrong sessionId", customSessionId, session.getSessionId()); Assert.assertEquals("Wrong sessionId", customSessionId, session.getSessionId());
Assert.assertEquals("Wrong recording mode", RecordingMode.ALWAYS, session.getProperties().recordingMode()); Assert.assertEquals("Wrong recording mode", RecordingMode.ALWAYS, session.getProperties().recordingMode());
Assert.assertEquals("Wrong default output mode", Recording.OutputMode.INDIVIDUAL, Assert.assertEquals("Wrong default output mode", Recording.OutputMode.INDIVIDUAL,
session.getProperties().defaultOutputMode()); session.getProperties().defaultRecordingProperties().outputMode());
Assert.assertTrue("Session should be being recorded", session.isBeingRecorded()); Assert.assertTrue("Session should be being recorded", session.isBeingRecorded());
Assert.assertEquals("Expected 2 active connections but found " + session.getActiveConnections().size(), 2, Assert.assertEquals("Expected 2 active connections but found " + session.getActiveConnections().size(), 2,
session.getActiveConnections().size()); session.getActiveConnections().size());
@ -2385,9 +2386,8 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
String widthAndHeight = user.getEventManager().getDimensionOfViewport(); String widthAndHeight = user.getEventManager().getDimensionOfViewport();
JsonObject obj = JsonParser.parseString(widthAndHeight).getAsJsonObject(); JsonObject obj = JsonParser.parseString(widthAndHeight).getAsJsonObject();
Assert.assertEquals( Assert.assertEquals("{\"width\":" + obj.get("width").getAsLong() + ",\"height\":"
"{\"width\":" + obj.get("width").getAsLong() + ",\"height\":" + obj.get("height").getAsLong() + "}", + (obj.get("height").getAsLong() - 1) + "}", pub.getVideoDimensions());
pub.getVideoDimensions());
Assert.assertEquals(Integer.valueOf(30), pub.getFrameRate()); Assert.assertEquals(Integer.valueOf(30), pub.getFrameRate());
Assert.assertEquals("SCREEN", pub.getTypeOfVideo()); Assert.assertEquals("SCREEN", pub.getTypeOfVideo());
Assert.assertTrue(pub.hasVideo()); Assert.assertTrue(pub.hasVideo());
@ -2474,9 +2474,10 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
Assert.assertEquals("Wrong recording size", 0, recording.getSize()); Assert.assertEquals("Wrong recording size", 0, recording.getSize());
Assert.assertNull("Wrong recording url", recording.getUrl()); Assert.assertNull("Wrong recording url", recording.getUrl());
Assert.assertEquals("Wrong recording output mode", Recording.OutputMode.INDIVIDUAL, recording.getOutputMode()); Assert.assertEquals("Wrong recording output mode", Recording.OutputMode.INDIVIDUAL, recording.getOutputMode());
Assert.assertNull("Wrong recording layout", recording.getRecordingLayout()); Assert.assertEquals("Wrong recording layout", RecordingLayout.BEST_FIT, recording.getRecordingLayout());
Assert.assertNull("Wrong recording custom layout", recording.getCustomLayout()); Assert.assertEquals("Wrong recording custom layout", "", recording.getCustomLayout());
Assert.assertNull("Wrong recording resolution", recording.getResolution()); Assert.assertEquals("Wrong recording resolution", "1280x720", recording.getResolution());
Assert.assertEquals("Wrong recording frameRate", 25, recording.getFrameRate());
Assert.assertEquals("Wrong recording status", Recording.Status.started, recording.getStatus()); Assert.assertEquals("Wrong recording status", Recording.Status.started, recording.getStatus());
Assert.assertTrue("Wrong recording hasAudio", recording.hasAudio()); Assert.assertTrue("Wrong recording hasAudio", recording.hasAudio());
Assert.assertTrue("Wrong recording hasVideo", recording.hasVideo()); Assert.assertTrue("Wrong recording hasVideo", recording.hasVideo());
@ -2660,7 +2661,8 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
/** Test transcoding defined properties */ /** Test transcoding defined properties */
SessionProperties.Builder basePropertiesBuilder = new SessionProperties.Builder().mediaMode(MediaMode.ROUTED) SessionProperties.Builder basePropertiesBuilder = new SessionProperties.Builder().mediaMode(MediaMode.ROUTED)
.recordingMode(RecordingMode.ALWAYS).defaultOutputMode(OutputMode.INDIVIDUAL); .recordingMode(RecordingMode.ALWAYS).defaultRecordingProperties(
new RecordingProperties.Builder().outputMode(OutputMode.INDIVIDUAL).build());
SessionProperties propertiesDefaultCodec = basePropertiesBuilder.build(); SessionProperties propertiesDefaultCodec = basePropertiesBuilder.build();
SessionProperties propertiesH264AllowTranscoding = basePropertiesBuilder.forcedVideoCodec(VideoCodec.H264) SessionProperties propertiesH264AllowTranscoding = basePropertiesBuilder.forcedVideoCodec(VideoCodec.H264)