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

openvidu-test-e2e: admit +0/+1 value difference in port view height

pull/760/head
pabloFuente 2022-11-10 14:34:40 +01:00
parent c8b445b7d2
commit 8846c14157
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -941,13 +941,18 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
user.getEventManager().on("streamPropertyChanged", (event) -> { user.getEventManager().on("streamPropertyChanged", (event) -> {
try { try {
if (latchViewport.await(4000, TimeUnit.MILLISECONDS)) { if (latchViewport.await(4000, TimeUnit.MILLISECONDS)) {
String expectedDimensions = "{\"width\":" + expectedWidthHeight[0] + ",\"height\":" // Using a local or dockerized browser may vary the height value in 1 unit
String expectedDimensions1 = "{\"width\":" + expectedWidthHeight[0] + ",\"height\":"
+ expectedWidthHeight[1] + "}"; + expectedWidthHeight[1] + "}";
String expectedDimensions2 = "{\"width\":" + expectedWidthHeight[0] + ",\"height\":"
+ (expectedWidthHeight[1] + 1) + "}";
System.out.println("Publisher dimensions: " + event.get("newValue").getAsJsonObject().toString()); System.out.println("Publisher dimensions: " + event.get("newValue").getAsJsonObject().toString());
System.out.println("Real dimensions of viewport: " + expectedDimensions); System.out.println("Real dimensions of viewport (+0/+1 in height): " + expectedDimensions1);
if ("videoDimensions".equals(event.get("changedProperty").getAsString()) if ("videoDimensions".equals(event.get("changedProperty").getAsString())
&& "screenResized".equals(event.get("reason").getAsString()) && "screenResized".equals(event.get("reason").getAsString())
&& expectedDimensions.equals(event.get("newValue").getAsJsonObject().toString())) { && (expectedDimensions1.equals(event.get("newValue").getAsJsonObject().toString())
|| expectedDimensions2
.equals(event.get("newValue").getAsJsonObject().toString()))) {
latch3.countDown(); latch3.countDown();
} }
} }
@ -2614,9 +2619,18 @@ 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(
"{\"width\":" + obj.get("width").getAsLong() + ",\"height\":" + obj.get("height").getAsLong() + "}", // Using a local or dockerized browser may vary the height value in 1 unit
pub.getVideoDimensions()); long validHeight1 = obj.get("height").getAsLong();
long validHeight2 = validHeight1 + 1;
String validDimensions1 = "{\"width\":" + obj.get("width").getAsLong() + ",\"height\":" + validHeight1 + "}";
String validDimensions2 = "{\"width\":" + obj.get("width").getAsLong() + ",\"height\":" + validHeight2 + "}";
Assert.assertTrue(
"Wrong video dimenstions. Expected: " + validDimensions1 + "(+0/+1 in height) but actual: "
+ pub.getVideoDimensions(),
validDimensions1.equals(pub.getVideoDimensions()) || validDimensions2.equals(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());