From c8ca6b38056bc3851ca86cc3cca3f1b0718341dc Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Sat, 1 Feb 2020 13:41:43 +0100
Subject: [PATCH] Remove JSONObject/JSONArray from E2ETest

---
 openvidu-test-e2e/pom.xml                         |  6 ++++++
 .../openvidu/test/e2e/OpenViduTestAppE2eTest.java | 15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml
index fde8b1fb..f2eabf8c 100644
--- a/openvidu-test-e2e/pom.xml
+++ b/openvidu-test-e2e/pom.xml
@@ -72,6 +72,12 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<version>${version.spring-boot}</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.skyscreamer</groupId>
+					<artifactId>jsonassert</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
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 87731263..06f9ebd1 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
@@ -2383,7 +2383,7 @@ public class OpenViduTestAppE2eTest {
 		/** GET /api/sessions (before session created) **/
 		restClient.rest(HttpMethod.GET, "/api/sessions/NOT_EXISTS", HttpStatus.SC_NOT_FOUND);
 		restClient.rest(HttpMethod.GET, "/api/sessions", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("numberOfElements", new Integer(0), "content", new org.json.JSONArray()));
+				ImmutableMap.of("numberOfElements", new Integer(0), "content", new JsonArray()));
 
 		/** POST /api/sessions **/
 		// 400
@@ -2417,7 +2417,7 @@ public class OpenViduTestAppE2eTest {
 		restClient.rest(HttpMethod.GET, "/api/sessions/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true,
 				"{'sessionId':'STR','createdAt':0,'mediaMode':'STR','recordingMode':'STR','defaultOutputMode':'STR','defaultRecordingLayout':'STR','customSessionId':'STR','connections':{'numberOfElements':0,'content':[]},'recording':true}");
 		restClient.rest(HttpMethod.GET, "/api/sessions", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("numberOfElements", new Integer(1), "content", new org.json.JSONArray()));
+				ImmutableMap.of("numberOfElements", new Integer(1), "content", new JsonArray()));
 
 		/** POST /api/tokens **/
 		// 400
@@ -2537,7 +2537,7 @@ public class OpenViduTestAppE2eTest {
 		/** GET /api/recordings (before recording started) **/
 		restClient.rest(HttpMethod.GET, "/api/recordings/NOT_EXISTS", HttpStatus.SC_NOT_FOUND);
 		restClient.rest(HttpMethod.GET, "/api/recordings", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("count", new Integer(0), "items", new org.json.JSONArray()));
+				ImmutableMap.of("count", new Integer(0), "items", new JsonArray()));
 
 		/** POST /api/recordings/start (ACTIVE SESSION) **/
 		// 200
@@ -2567,7 +2567,7 @@ public class OpenViduTestAppE2eTest {
 		restClient.rest(HttpMethod.GET, "/api/recordings/CUSTOM_SESSION_ID", null, HttpStatus.SC_OK, true,
 				"{'id':'STR','sessionId':'STR','name':'STR','outputMode':'STR','recordingLayout':'STR','hasAudio':false,'hasVideo':false,'resolution':'STR','createdAt':0,'size':0,'duration':0,'url':'STR','status':'STR'}");
 		restClient.rest(HttpMethod.GET, "/api/recordings", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("count", new Integer(1), "items", new org.json.JSONArray()));
+				ImmutableMap.of("count", new Integer(1), "items", new JsonArray()));
 
 		user.getEventManager().waitUntilEventReaches("recordingStopped", 2);
 
@@ -2578,7 +2578,7 @@ public class OpenViduTestAppE2eTest {
 
 		// GET /api/recordings should return empty again
 		restClient.rest(HttpMethod.GET, "/api/recordings", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("count", new Integer(0), "items", new org.json.JSONArray()));
+				ImmutableMap.of("count", new Integer(0), "items", new JsonArray()));
 
 		/** DELETE /api/sessions/<SESSION_ID>/stream/<STREAM_ID> **/
 		restClient.rest(HttpMethod.DELETE, "/api/sessions/NOT_EXISTS/stream/NOT_EXISTS", HttpStatus.SC_BAD_REQUEST);
@@ -2631,7 +2631,7 @@ public class OpenViduTestAppE2eTest {
 
 		// GET /api/sessions should return empty again
 		restClient.rest(HttpMethod.GET, "/api/sessions", null, HttpStatus.SC_OK, true,
-				ImmutableMap.of("numberOfElements", new Integer(0), "content", new org.json.JSONArray()));
+				ImmutableMap.of("numberOfElements", new Integer(0), "content", new JsonArray()));
 
 		/** GET /config **/
 		restClient.rest(HttpMethod.GET, "/config", null, HttpStatus.SC_OK, true,
@@ -2998,7 +2998,8 @@ public class OpenViduTestAppE2eTest {
 					response.get("publishers").getAsJsonArray().size());
 			JsonObject ipCamPublisher = response.get("publishers").getAsJsonArray().get(0).getAsJsonObject();
 			Assert.assertEquals("Wrong number of properties in IPCAM publisher", 4, ipCamPublisher.size());
-			Assert.assertEquals("Wrong rtspUri property", "rtsp://dummyurl.com", ipCamPublisher.get("rtspUri").getAsString());
+			Assert.assertEquals("Wrong rtspUri property", "rtsp://dummyurl.com",
+					ipCamPublisher.get("rtspUri").getAsString());
 			JsonObject mediaOptions = ipCamPublisher.get("mediaOptions").getAsJsonObject();
 			Assert.assertEquals("Wrong number of properties in MediaOptions", 10, mediaOptions.size());
 			Assert.assertTrue("Wrong adaptativeBitrate property", mediaOptions.get("adaptativeBitrate").getAsBoolean());