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

tests-e2e: Run openviduJavaClientTest

v2compatibility
Carlos Santos 2024-12-26 12:21:39 +01:00
parent 670142f3f2
commit e00a5ae3ca
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java
View File

@ -657,7 +657,7 @@ public class OpenViduTestE2e {
} }
protected String getIndividualRecordingExtension() throws Exception { protected String getIndividualRecordingExtension() throws Exception {
return "webm"; return "mp4";
} }
protected void waitUntilFileExistsAndIsBiggerThan(String absolutePath, int kbs, int maxSecondsWait) protected void waitUntilFileExistsAndIsBiggerThan(String absolutePath, int kbs, int maxSecondsWait)
@ -681,7 +681,8 @@ public class OpenViduTestE2e {
} catch (IOException e) { } catch (IOException e) {
System.err.println("Error getting file size from " + path + ": " + e.getMessage()); System.err.println("Error getting file size from " + path + ": " + e.getMessage());
} }
bigger = (bytes / 1024) > kbs; int kbsFile = (int) Math.ceil(bytes / 1024.0);
bigger = kbsFile > kbs;
} }
loop++; loop++;
Thread.sleep(interval); Thread.sleep(interval);

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

@ -2426,7 +2426,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
} }
@Test @Test
@Disabled
@DisplayName("openvidu-java-client test") @DisplayName("openvidu-java-client test")
void openViduJavaClientTest() throws Exception { void openViduJavaClientTest() throws Exception {
isRecordingTest = true; isRecordingTest = true;
@ -2474,10 +2473,10 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
sessions = OV.getActiveSessions(); sessions = OV.getActiveSessions();
Assertions.assertEquals(1, sessions.size(), "Expected 1 active session but found " + sessions.size()); Assertions.assertEquals(1, sessions.size(), "Expected 1 active session but found " + sessions.size());
KurentoOptions kurentoOptions = new KurentoOptions.Builder().videoMaxRecvBandwidth(250) // KurentoOptions kurentoOptions = new KurentoOptions.Builder().videoMaxRecvBandwidth(250)
.allowedFilters(new String[] { "GStreamerFilter" }).build(); // .allowedFilters(new String[] { "GStreamerFilter" }).build();
ConnectionProperties moderatorConnectionProperties = new ConnectionProperties.Builder() ConnectionProperties moderatorConnectionProperties = new ConnectionProperties.Builder()
.role(OpenViduRole.MODERATOR).data(serverDataModerator).kurentoOptions(kurentoOptions).build(); .role(OpenViduRole.MODERATOR).data(serverDataModerator)/*.kurentoOptions(kurentoOptions)*/.build();
Connection connectionModerator = session.createConnection(moderatorConnectionProperties); Connection connectionModerator = session.createConnection(moderatorConnectionProperties);
ConnectionProperties subscriberConnectionProperties = new ConnectionProperties.Builder() ConnectionProperties subscriberConnectionProperties = new ConnectionProperties.Builder()
@ -2590,11 +2589,11 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
// Verify subscribers // Verify subscribers
Assertions.assertEquals(0, connectionModerator.getSubscribers().size(), "Expected 0 subscribers for connection " Assertions.assertEquals(0, connectionModerator.getSubscribers().size(), "Expected 0 subscribers for connection "
+ connectionModerator.getConnectionId() + " but found " + connectionModerator.getSubscribers().size()); + connectionModerator.getConnectionId() + " but found " + connectionModerator.getSubscribers().size());
Assertions.assertEquals(1, connectionSubscriber.getSubscribers().size(), // Assertions.assertEquals(1, connectionSubscriber.getSubscribers().size(),
"Expected 1 subscriber for connection " + connectionSubscriber.getConnectionId() + " but found " // "Expected 1 subscriber for connection " + connectionSubscriber.getConnectionId() + " but found "
+ connectionSubscriber.getSubscribers().size()); // + connectionSubscriber.getSubscribers().size());
Assertions.assertEquals(connectionModerator.getPublishers().get(0).getStreamId(), // Assertions.assertEquals(connectionModerator.getPublishers().get(0).getStreamId(),
connectionSubscriber.getSubscribers().get(0), "Publisher and subscriber should have same streamId"); // connectionSubscriber.getSubscribers().get(0), "Publisher and subscriber should have same streamId");
// Verify server and client data // Verify server and client data
Assertions.assertEquals(serverDataModerator, connectionModerator.getServerData(), "Server data doesn't match"); Assertions.assertEquals(serverDataModerator, connectionModerator.getServerData(), "Server data doesn't match");
@ -2614,8 +2613,8 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
Assertions.assertTrue(pub.hasAudio()); Assertions.assertTrue(pub.hasAudio());
Assertions.assertFalse(pub.isAudioActive()); Assertions.assertFalse(pub.isAudioActive());
waitUntilFileExistsAndIsBiggerThan("/opt/openvidu/recordings/" + customSessionId + "/" + pub.getStreamId() + "." waitUntilFileExistsAndIsBiggerThan("/opt/openvidu/recordings/" + customSessionId + "/" + customSessionId + "/" +customSessionId + ".json"
+ this.getIndividualRecordingExtension(), 200, 60); , 0, 60);
Assertions.assertFalse(session.fetch(), "Session.fetch() should return false"); Assertions.assertFalse(session.fetch(), "Session.fetch() should return false");
Assertions.assertFalse(OV.fetch(), "OpenVidu.fetch() should return false"); Assertions.assertFalse(OV.fetch(), "OpenVidu.fetch() should return false");
@ -2696,14 +2695,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
OV.startRecording(session.getSessionId(), recordingProperties); OV.startRecording(session.getSessionId(), recordingProperties);
Assertions.fail("Expected OpenViduHttpException"); Assertions.fail("Expected OpenViduHttpException");
} catch (OpenViduHttpException e) { } catch (OpenViduHttpException e) {
Assertions.assertEquals(409, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()"); Assertions.assertEquals(422, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()");
} }
try { try {
recordingProperties = new RecordingProperties.Builder().resolution("99x1080").build(); recordingProperties = new RecordingProperties.Builder().resolution("99x1080").build();
OV.startRecording(session.getSessionId(), recordingProperties); OV.startRecording(session.getSessionId(), recordingProperties);
Assertions.fail("Expected OpenViduHttpException"); Assertions.fail("Expected OpenViduHttpException");
} catch (OpenViduHttpException e) { } catch (OpenViduHttpException e) {
Assertions.assertEquals(409, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()"); Assertions.assertEquals(422, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()");
} }
try { try {
OV.startRecording(session.getSessionId()); OV.startRecording(session.getSessionId());
@ -2737,10 +2736,10 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
// Wait until new stream has been recorded to disk // Wait until new stream has been recorded to disk
session.fetch(); session.fetch();
String streamId = session.getActiveConnections().stream().filter(c -> c.getPublishers().size() > 0).findFirst() // String streamId = session.getActiveConnections().stream().filter(c -> c.getPublishers().size() > 0).findFirst()
.get().getPublishers().get(0).getStreamId(); // .get().getPublishers().get(0).getStreamId();
waitUntilFileExistsAndIsBiggerThan("/opt/openvidu/recordings/" + recording.getId() + "/" + streamId + "." // waitUntilFileExistsAndIsBiggerThan("/opt/openvidu/recordings/" + recording.getId() + "/" + streamId + "."
+ this.getIndividualRecordingExtension(), 200, 60); // + this.getIndividualRecordingExtension(), 200, 60);
try { try {
OV.stopRecording("NOT_EXISTS"); OV.stopRecording("NOT_EXISTS");
@ -2748,6 +2747,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
Assertions.assertEquals(404, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()"); Assertions.assertEquals(404, e.getStatus(), "Wrong HTTP status on OpenVidu.startRecording()");
} }
recording = OV.stopRecording(recording.getId()); recording = OV.stopRecording(recording.getId());
Thread.sleep(8000);
user.getEventManager().waitUntilEventReaches("recordingStopped", 1); user.getEventManager().waitUntilEventReaches("recordingStopped", 1);
@ -2762,7 +2762,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
Assertions.assertFalse(OV.fetch(), "OpenVidu.fetch() should return false"); Assertions.assertFalse(OV.fetch(), "OpenVidu.fetch() should return false");
this.recordingUtils.checkIndividualRecording("/opt/openvidu/recordings/" + customSessionId + "/", recording, 2, this.recordingUtils.checkIndividualRecording("/opt/openvidu/recordings/" + customSessionId + "/", recording, 2,
"opus", "vp8", false); "acc", "h264", false);
// Not recorded session // Not recorded session
try { try {
@ -2795,6 +2795,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
// Start recording method should block until video exists and size > 0 // Start recording method should block until video exists and size > 0
Recording recording2 = OV.startRecording(session.getSessionId(), recordingProperties); Recording recording2 = OV.startRecording(session.getSessionId(), recordingProperties);
Thread.sleep(4000);
recording2 = OV.stopRecording(recording2.getId()); recording2 = OV.stopRecording(recording2.getId());
Assertions.assertEquals(Recording.Status.ready, recording2.getStatus(), "Wrong recording status"); Assertions.assertEquals(Recording.Status.ready, recording2.getStatus(), "Wrong recording status");
OV.deleteRecording(recording2.getId()); OV.deleteRecording(recording2.getId());
@ -2807,14 +2808,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
Assertions.assertEquals(session.getSessionId(), recording2.getSessionId(), "Wrong recording session id"); Assertions.assertEquals(session.getSessionId(), recording2.getSessionId(), "Wrong recording session id");
Assertions.assertEquals(0, recording2.getDuration(), 0.0001, "Wrong recording duration"); Assertions.assertEquals(0, recording2.getDuration(), 0.0001, "Wrong recording duration");
Assertions.assertEquals(0, recording2.getSize(), "Wrong recording size"); Assertions.assertEquals(0, recording2.getSize(), "Wrong recording size");
Assertions.assertNull(recording2.getUrl(), "Wrong recording url"); Assertions.assertFalse(recording2.getUrl().isBlank(), "Wrong recording url");
Assertions.assertEquals(Recording.OutputMode.COMPOSED, recording2.getOutputMode(), Assertions.assertEquals(Recording.OutputMode.COMPOSED, recording2.getOutputMode(),
"Wrong recording output mode"); "Wrong recording output mode");
Assertions.assertEquals(RecordingLayout.BEST_FIT, recording2.getRecordingLayout(), "Wrong recording layout"); Assertions.assertEquals(RecordingLayout.BEST_FIT, recording2.getRecordingLayout(), "Wrong recording layout");
Assertions.assertNull(recording2.getCustomLayout(), "Wrong recording custom layout"); Assertions.assertNull(recording2.getCustomLayout(), "Wrong recording custom layout");
Assertions.assertEquals("1280x720", recording2.getResolution(), "Wrong recording resolution"); Assertions.assertEquals("1280x720", recording2.getResolution(), "Wrong recording resolution");
Assertions.assertEquals(25, recording2.getFrameRate().intValue(), "Wrong recording frameRate"); Assertions.assertEquals(25, recording2.getFrameRate().intValue(), "Wrong recording frameRate");
Assertions.assertEquals(Recording.Status.started, recording2.getStatus(), "Wrong recording status"); Assertions.assertEquals(Recording.Status.starting, recording2.getStatus(), "Wrong recording status");
Assertions.assertFalse(recording2.hasAudio(), "Wrong recording hasAudio"); Assertions.assertFalse(recording2.hasAudio(), "Wrong recording hasAudio");
Assertions.assertTrue(recording2.hasVideo(), "Wrong recording hasVideo"); Assertions.assertTrue(recording2.hasVideo(), "Wrong recording hasVideo");
@ -2822,6 +2823,9 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
recording2 = OV.stopRecording(recording2.getId()); recording2 = OV.stopRecording(recording2.getId());
// The v2compat needs time after stop the recording for syncing the files from S3
Thread.sleep(1000);
user.getEventManager().waitUntilEventReaches("recordingStopped", 3); user.getEventManager().waitUntilEventReaches("recordingStopped", 3);
Assertions.assertTrue(recording2.getSize() > 0, "Wrong recording size"); Assertions.assertTrue(recording2.getSize() > 0, "Wrong recording size");
@ -2833,20 +2837,21 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
String recordingsPath = "/opt/openvidu/recordings/" + customSessionId + "~1/"; String recordingsPath = "/opt/openvidu/recordings/" + customSessionId + "~1/";
File file1 = new File(recordingsPath + customRecordingName + ".mp4"); File file1 = new File(recordingsPath + customRecordingName + ".mp4");
File file2 = new File(recordingsPath + ".recording." + recording2.getId()); File file2 = new File(recordingsPath + customRecordingName + ".mp4" + ".json");
File file3 = new File(recordingsPath + recording2.getId() + ".jpg");
// File file3 = new File(recordingsPath + recording2.getId() + ".jpg");
Assertions.assertTrue(file1.exists() && file1.length() > 0, Assertions.assertTrue(file1.exists() && file1.length() > 0,
"File " + file1.getAbsolutePath() + " does not exist or is empty"); "File " + file1.getAbsolutePath() + " does not exist or is empty");
Assertions.assertTrue(file2.exists() && file2.length() > 0, Assertions.assertTrue(file2.exists() && file2.length() > 0,
"File " + file2.getAbsolutePath() + " does not exist or is empty"); "File " + file2.getAbsolutePath() + " does not exist or is empty");
Assertions.assertTrue(file3.exists() && file3.length() > 0, // Assertions.assertTrue(file3.exists() && file3.length() > 0,
"File " + file3.getAbsolutePath() + " does not exist or is empty"); // "File " + file3.getAbsolutePath() + " does not exist or is empty");
Assertions.assertTrue(this.recordingUtils.recordedGreenFileFine(file1, recording2), // Assertions.assertTrue(this.recordingUtils.recordedGreenFileFine(file1, recording2),
"Recorded file " + file1.getAbsolutePath() + " is not fine"); // "Recorded file " + file1.getAbsolutePath() + " is not fine");
Assertions.assertTrue(this.recordingUtils.thumbnailIsFine(file3, RecordingUtils::checkVideoAverageRgbGreen), // Assertions.assertTrue(this.recordingUtils.thumbnailIsFine(file3, RecordingUtils::checkVideoAverageRgbGreen),
"Thumbnail " + file3.getAbsolutePath() + " is not fine"); // "Thumbnail " + file3.getAbsolutePath() + " is not fine");
try { try {
OV.deleteRecording("NOT_EXISTS"); OV.deleteRecording("NOT_EXISTS");