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

openvidu-test-e2e: update to test openvidu-node-client

pull/550/head
pabloFuente 2020-10-08 17:39:14 +02:00
parent 3c80cbfede
commit 52d4ba3f7e
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,13 +222,34 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/" + tokenConnectionId, restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/" + tokenConnectionId,
"{'record':123}", HttpStatus.SC_BAD_REQUEST); "{'record':123}", HttpStatus.SC_BAD_REQUEST);
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',record:'WRONG'}", HttpStatus.SC_BAD_REQUEST); "{'role':'PUBLISHER','record':'WRONG'}", HttpStatus.SC_BAD_REQUEST);
restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/WRONG/connection/" + tokenConnectionId,
"{'role':'PUBLISHER','record':'WRONG'}", HttpStatus.SC_NOT_FOUND);
restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/WRONG",
"{'role':'PUBLISHER','record':true}", HttpStatus.SC_NOT_FOUND);
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':'SUBSCRIBER','record':true,'data':'OTHER DATA'}", HttpStatus.SC_NO_CONTENT); "{'role':'SUBSCRIBER','record':true,'data':'OTHER DATA'}", HttpStatus.SC_OK);
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);
restClient.rest(HttpMethod.PATCH, "/openvidu/api/sessions/CUSTOM_SESSION_ID/connection/" + tokenConnectionId,
"{'role':'PUBLISHER'}", HttpStatus.SC_NO_CONTENT); // Test with openvidu-node-client
user.getDriver().findElement(By.id("session-api-btn-0")).click();
Thread.sleep(1000);
user.getDriver().findElement(By.id("connection-id-field")).clear();
user.getDriver().findElement(By.id("connection-id-field")).sendKeys(tokenConnectionId);
user.getDriver().findElement(By.id("update-connection-api-btn")).click();
user.getWaiter().until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value",
"Connection updated: {\"role\":\"PUBLISHER\",\"record\":true}"));
user.getDriver().findElement(By.id("record-checkbox")).click();
user.getDriver().findElement(By.id("token-role-select")).click();
Thread.sleep(500);
user.getDriver().findElement(By.id("option-SUBSCRIBER")).click();
Thread.sleep(500);
user.getDriver().findElement(By.id("update-connection-api-btn")).click();
user.getWaiter().until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value",
"Connection updated: {\"role\":\"SUBSCRIBER\",\"record\":false}"));
user.getDriver().findElement(By.id("close-dialog-btn")).click();
Thread.sleep(1000);
// Test with openvidu-java-client // Test with openvidu-java-client
OpenVidu OV = new OpenVidu(OpenViduTestAppE2eTest.OPENVIDU_URL, OpenViduTestAppE2eTest.OPENVIDU_SECRET); OpenVidu OV = new OpenVidu(OpenViduTestAppE2eTest.OPENVIDU_URL, OpenViduTestAppE2eTest.OPENVIDU_SECRET);
@ -240,16 +261,20 @@ public class OpenViduProTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
} catch (OpenViduHttpException exception) { } catch (OpenViduHttpException exception) {
Assert.assertEquals("Wrong HTTP status", HttpStatus.SC_NOT_FOUND, exception.getStatus()); Assert.assertEquals("Wrong HTTP status", HttpStatus.SC_NOT_FOUND, exception.getStatus());
} }
Assert.assertFalse("Session object should not have changed", session.fetch());
Connection connection = session.updateConnection(tokenConnectionId, Connection connection = session.updateConnection(tokenConnectionId,
new TokenOptions.Builder().role(OpenViduRole.PUBLISHER).build()); new TokenOptions.Builder().role(OpenViduRole.PUBLISHER).build());
Assert.assertFalse("Session object should not have changed", session.fetch());
Assert.assertEquals("Wrong connectionId in Connection object", tokenConnectionId, connection.getConnectionId()); Assert.assertEquals("Wrong connectionId in Connection object", tokenConnectionId, connection.getConnectionId());
Assert.assertEquals("Wrong role in Connection object", OpenViduRole.PUBLISHER, connection.getRole()); Assert.assertEquals("Wrong role in Connection object", OpenViduRole.PUBLISHER, connection.getRole());
Assert.assertTrue("Wrong record in Connection object", connection.record()); Assert.assertTrue("Wrong record in Connection object", connection.record());
connection = session.updateConnection(tokenConnectionId, connection = session.updateConnection(tokenConnectionId,
new TokenOptions.Builder().role(OpenViduRole.SUBSCRIBER).build()); new TokenOptions.Builder().role(OpenViduRole.SUBSCRIBER).build());
Assert.assertEquals("Wrong role in Connection object", OpenViduRole.SUBSCRIBER, connection.getRole()); Assert.assertEquals("Wrong role in Connection object", OpenViduRole.SUBSCRIBER, connection.getRole());
Assert.assertFalse("Session object should not have changed", session.fetch());
connection = session.updateConnection(tokenConnectionId, connection = session.updateConnection(tokenConnectionId,
new TokenOptions.Builder().role(OpenViduRole.MODERATOR).record(false).data("NO CHANGE").build()); new TokenOptions.Builder().role(OpenViduRole.MODERATOR).record(false).data("NO CHANGE").build());
Assert.assertFalse("Session object should not have changed", session.fetch());
Assert.assertEquals("Wrong role in Connection object", OpenViduRole.MODERATOR, connection.getRole()); Assert.assertEquals("Wrong role in Connection object", OpenViduRole.MODERATOR, connection.getRole());
Assert.assertFalse("Wrong record in Connection object", connection.record()); Assert.assertFalse("Wrong record in Connection object", connection.record());
Assert.assertTrue("Wrong data in Connection object", connection.getServerData().isEmpty()); Assert.assertTrue("Wrong data in Connection object", connection.getServerData().isEmpty());

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

@ -1779,15 +1779,15 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
"Number: 1. Changes: false")); "Number: 1. Changes: false"));
// Force unpublish wrong // Force unpublish wrong
user.getDriver().findElement(By.id("resource-id-field")).clear(); user.getDriver().findElement(By.id("stream-id-field")).clear();
user.getDriver().findElement(By.id("resource-id-field")).sendKeys("FAIL"); user.getDriver().findElement(By.id("stream-id-field")).sendKeys("FAIL");
user.getDriver().findElement(By.id("force-unpublish-api-btn")).click(); user.getDriver().findElement(By.id("force-unpublish-api-btn")).click();
user.getWaiter() user.getWaiter()
.until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Error [404]")); .until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Error [404]"));
// Force unpublish right // Force unpublish right
user.getDriver().findElement(By.id("resource-id-field")).clear(); user.getDriver().findElement(By.id("stream-id-field")).clear();
user.getDriver().findElement(By.id("resource-id-field")).sendKeys(streamId); user.getDriver().findElement(By.id("stream-id-field")).sendKeys(streamId);
user.getDriver().findElement(By.id("force-unpublish-api-btn")).click(); user.getDriver().findElement(By.id("force-unpublish-api-btn")).click();
user.getWaiter().until( user.getWaiter().until(
ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Stream unpublished")); ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Stream unpublished"));
@ -1797,15 +1797,15 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
Assert.assertEquals("Expected 3 videos but found " + numberOfVideos, 3, numberOfVideos); Assert.assertEquals("Expected 3 videos but found " + numberOfVideos, 3, numberOfVideos);
// Force disconnect wrong // Force disconnect wrong
user.getDriver().findElement(By.id("resource-id-field")).clear(); user.getDriver().findElement(By.id("connection-id-field")).clear();
user.getDriver().findElement(By.id("resource-id-field")).sendKeys("FAIL"); user.getDriver().findElement(By.id("connection-id-field")).sendKeys("FAIL");
user.getDriver().findElement(By.id("force-disconnect-api-btn")).click(); user.getDriver().findElement(By.id("force-disconnect-api-btn")).click();
user.getWaiter() user.getWaiter()
.until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Error [404]")); .until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "Error [404]"));
// Force disconnect right // Force disconnect right
user.getDriver().findElement(By.id("resource-id-field")).clear(); user.getDriver().findElement(By.id("connection-id-field")).clear();
user.getDriver().findElement(By.id("resource-id-field")).sendKeys(connectionId); user.getDriver().findElement(By.id("connection-id-field")).sendKeys(connectionId);
user.getDriver().findElement(By.id("force-disconnect-api-btn")).click(); user.getDriver().findElement(By.id("force-disconnect-api-btn")).click();
user.getWaiter() user.getWaiter()
.until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "User disconnected")); .until(ExpectedConditions.attributeToBe(By.id("api-response-text-area"), "value", "User disconnected"));