From 0508971563d6969fb7bb24e8806ed11152461c86 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 27 Jun 2019 15:15:03 +0200 Subject: [PATCH] openvidu-test-e2e: restApiTest fix --- .../io/openvidu/test/e2e/OpenViduTestAppE2eTest.java | 3 ++- .../io/openvidu/test/e2e/utils/CustomHttpClient.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) 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 c97fe072..34cfb820 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 @@ -2581,7 +2581,8 @@ public class OpenViduTestAppE2eTest { /** GET /config **/ restClient.rest(HttpMethod.GET, "/config", null, HttpStatus.SC_OK, true, "{'version':'STR','openviduPublicurl':'STR','openviduCdr':false,'maxRecvBandwidth':0,'minRecvBandwidth':0,'maxSendBandwidth':0,'minSendBandwidth':0,'openviduRecording':false," - + "'openviduRecordingVersion':'STR','openviduRecordingPath':'STR','openviduRecordingPublicAccess':false,'openviduRecordingNotification':'STR','openviduRecordingCustomLayout':'STR','openviduRecordingAutostopTimeout':0}"); + + "'openviduRecordingVersion':'STR','openviduRecordingPath':'STR','openviduRecordingPublicAccess':false,'openviduRecordingNotification':'STR'," + + "'openviduRecordingCustomLayout':'STR','openviduRecordingAutostopTimeout':0,'openviduWebhook':false,'openviduWebhookEndpoint':'STR','openviduWebhookHeaders':'STR','openviduWebhookEvents':'STR',}"); } @Test diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java index e5aa7448..7c094725 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java @@ -100,17 +100,18 @@ public class CustomHttpClient { JSONObject jsonObjExpected = null; jsonReturnedValue.replaceAll("'", "\""); try { - jsonObjExpected = new JSONObject((String) jsonReturnedValue); + jsonObjExpected = new JSONObject(jsonReturnedValue); } catch (JSONException e1) { Assert.fail("Expected json element is a string without a JSON format: " + jsonReturnedValue); } if (exactReturnedFields) { - Assert.assertEquals("Error in number of keys in JSON response to POST (" + json.toString() + ")" + path, jsonObjExpected.length(), - json.length()); + Assert.assertEquals("Error in number of keys in JSON response to POST (" + json.toString() + ")" + path, + jsonObjExpected.length(), json.length()); } for (String key : jsonObjExpected.keySet()) { - json.get(key); + Assert.assertTrue("Wrong class of property " + key, + jsonObjExpected.get(key).getClass().equals(json.get(key).getClass())); } return json; }