diff --git a/src/main/Main.java b/src/main/Main.java index 2b1798b..7ac2177 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -12,8 +12,8 @@ new TestLogoutPOSTCactus("h41ZoL44toLq3Kg7B1aXreHjcjluAsoyz8DezqiXJ28s1atiGR5UHFOqi7Or3xOD"), new TestPUTCactus("f", "f"), new TestDELETECactus("qF9bgKYZmw8P") }; TestYouTube[] youtube = { new TestGETYouTube(token), new TestPOSTYouTube(token), new TestPUTYouTube(token), - new TestDELETEYouTube(token, "PLCwNa5MZdBSq_3K5-MV0x6luKXskvqrKk") }; - cactus[0].start(); + new TestDELETEYouTube(token, "PLCwNa5MZdBSrIn-8nc9gDckf2kzXejtL_") }; + youtube[3].start(); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 3645b47..b63ea79 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -200,11 +200,11 @@ } public String jsonRemove(String JsonString, RemoveJsonParam param) { - if (JsonString == null) { - return ""; - } try { JsonNode json = new ObjectMapper().readTree(JsonString); + if(json == null) { + return ""; + } if (json.getClass() != ArrayNode.class) { jsonRemove(json, param); } else { diff --git a/src/testcase/youtube/TestPOSTYouTube.java b/src/testcase/youtube/TestPOSTYouTube.java index 53963bd..746749d 100644 --- a/src/testcase/youtube/TestPOSTYouTube.java +++ b/src/testcase/youtube/TestPOSTYouTube.java @@ -10,7 +10,7 @@ public TestPOSTYouTube(String token) { super(token); - check.jsonAcquisition("src/testcase/post.json"); + check.jsonAcquisition("src/testcase/youtube/post.json"); check.setProperty("Content-type", "application/json"); check.getResourceParam().setPathParams("playlists"); check.getResourceParam().setQueryParams(new RestParam("mine", "true")); diff --git a/src/testcase/youtube/TestPUTYouTube.java b/src/testcase/youtube/TestPUTYouTube.java index 414781d..371294e 100644 --- a/src/testcase/youtube/TestPUTYouTube.java +++ b/src/testcase/youtube/TestPUTYouTube.java @@ -10,7 +10,7 @@ public TestPUTYouTube(String token) { super(token); - check.jsonAcquisition("src/testcase/put.json"); + check.jsonAcquisition("src/testcase/youtube/put.json"); check.setProperty("Content-type", "application/json"); check.getResourceParam().setPathParams("playlists"); check.getResourceParam().setQueryParams(new RestParam("mine", "true")); diff --git a/src/testcase/youtube/put.json b/src/testcase/youtube/put.json index 9e493f1..5623e45 100644 --- a/src/testcase/youtube/put.json +++ b/src/testcase/youtube/put.json @@ -1,5 +1,5 @@ { - "id": "PLCwNa5MZdBSq_3K5-MV0x6luKXskvqrKk", + "id": "PLCwNa5MZdBSrrBniob6HbbxFx85AcUJh8", "snippet": { "title": "eee" }