From 7dac3e8378615febbe52838e9966ba739b9267e8 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 3 Jul 2018 21:19:28 +0200
Subject: [PATCH] openvidu-test-e2e: flex videoDimension result on
 StreamPropertyChangedEvent

---
 .../openvidu/test/e2e/OpenViduEventManager.java  |  6 ++++++
 .../test/e2e/OpenViduTestAppE2eTest.java         | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduEventManager.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduEventManager.java
index 4d40dd7d..00b5e928 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduEventManager.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduEventManager.java
@@ -214,6 +214,12 @@ public class OpenViduEventManager {
 		return hasMediaStream;
 	}
 
+	public String getDimensionOfViewport() {
+		String dimension = (String) ((JavascriptExecutor) driver)
+				.executeScript("return (JSON.stringify({width: window.innerWidth, height: window.innerHeight}))");
+		return dimension;
+	}
+
 	private boolean hasAudioTracks(WebElement videoElement) {
 		boolean audioTracks = (boolean) ((JavascriptExecutor) driver)
 				.executeScript("return ((document.getElementById('" + videoElement.getAttribute("id")
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
index 1f44dd6b..083f5bde 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
@@ -34,6 +34,8 @@ import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.RunWith;
 import org.junit.platform.runner.JUnitPlatform;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.junit.Assert;
 
 import org.openqa.selenium.By;
@@ -817,12 +819,20 @@ public class OpenViduTestAppE2eTest {
 		final CountDownLatch latch3 = new CountDownLatch(2);
 		int newWidth = 1500;
 		int newHeight = 500;
+
+		user.getDriver().manage().window().setSize(new Dimension(newWidth, newHeight));
+
+		String widthAndHeight = user.getEventManager().getDimensionOfViewport();
+		JSONObject obj = (JSONObject) new JSONParser().parse(widthAndHeight);
+
+		System.out.println("New viewport dimension: " + obj.toJSONString());
+
 		user.getEventManager().on("streamPropertyChanged", (event) -> {
-			threadAssertions.add(((String) event.get("eventContent"))
-					.contains("videoDimensions [{\"width\":" + (newWidth - 10) + ",\"height\":" + (newHeight - 130)  + "}]"));
+			threadAssertions.add(((String) event.get("eventContent")).contains(
+					"videoDimensions [{\"width\":" + obj.get("width") + ",\"height\":" + obj.get("height") + "}]"));
 			latch3.countDown();
 		});
-		user.getDriver().manage().window().setSize(new Dimension(newWidth, newHeight));
+
 		user.getEventManager().waitUntilEventReaches("streamPropertyChanged", 6);
 
 		latch3.await();