diff --git a/src/main/Main.java b/src/main/Main.java index b4b7531..2f4157d 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -18,14 +18,13 @@ static TestDELETECactus delete = new TestDELETECactus("qF9bgKYZmw8P"); public static void main(String[] args) { - // post.start(); - init(); - api.jsonAcquisition("src/main/you.json"); - System.out.println(api.getReadJson()); - api.jsonRemove(api.getReadJson().get("snippet"), "title"); - System.out.println(api.getReadJson()); - //api.doRestTest(); - System.out.println(api.getResults()); + put.start(); +// init(); +// api.jsonAcquisition("src/main/you.json"); +// System.out.println(api.getReadJson()); +// System.out.println(api.jsonRemove(api.getReadJson(), "snippet")); +// api.doRestTest(); +// System.out.println(api.getResults()); } static private void init() { diff --git a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index 5db3005..971b727 100644 --- a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -78,7 +78,7 @@ addRequestProperties(keys, values); // POST or GET or PUT or DELETE conn.setRequestMethod(method); - if (method != "GET" && Json.length() > 0) { + if (method != "GET" && Json != null) { conn.setDoOutput(true); if (clientSessionID != null) { conn.setRequestProperty("Cookie", clientSessionID); diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 905674d..02a876c 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; public class RestChecker { private ArrayList accounts = new ArrayList<>(); @@ -26,7 +27,7 @@ private ArrayList values = new ArrayList<>(); private NecessaryParam getnesParam = new NecessaryParam(); private ArrayList removeParam = new ArrayList<>(); - private JsonNode readJson; + private String readJson; private boolean isRemove = false; public static final int ACCOUNT_NUM = 5; @@ -65,7 +66,7 @@ return getnesParam; } - public JsonNode getReadJson() { + public String getReadJson() { return readJson; } @@ -180,7 +181,7 @@ account.doAnything(); String receive = account.doReceive(); for (String remove : removeParam) { - jsonRemove(receive, remove); + receive = jsonRemove(receive, remove); isRemove = true; } results.add(receive); @@ -189,7 +190,7 @@ public void jsonAcquisition(String path) { ObjectMapper json = new ObjectMapper(); try { - readJson = json.readTree(new File(path)); + readJson = json.readTree(new File(path)).toString(); } catch (JsonProcessingException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -200,12 +201,17 @@ } public String jsonRemove(String JsonString, String fieldName) { - ObjectMapper jsonstr = new ObjectMapper(); try { - JsonNode json = jsonstr.readTree(JsonString); - ObjectNode obj = (ObjectNode) json; - obj.remove(fieldName); - return obj.toString(); + JsonNode json = new ObjectMapper().readTree(JsonString); + for(JsonNode js : json) { + if(js.getClass() != TextNode.class) { + ObjectNode obj = (ObjectNode) js; + obj.remove(fieldName); + }else { + + } + } + return json.toString(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/testcase/TestPUTCactus.java b/src/testcase/TestPUTCactus.java index 8c325f1..90d1556 100644 --- a/src/testcase/TestPUTCactus.java +++ b/src/testcase/TestPUTCactus.java @@ -16,9 +16,11 @@ form.add(new RestParam("userID", userID)); form.add(new RestParam("userPass", userPass)); check.setupRestTest(Method.PUT, query, form, path); + check.setRemoveParam("token"); } public void start() { check.doRestTest(); + System.out.println(check.getResults()); } }