diff --git a/src/main/Main.java b/src/main/Main.java index c9e0d45..04f4f6c 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -11,6 +11,7 @@ static ArrayList queryParam = new ArrayList<>(); static ArrayList formParam = new ArrayList<>(); static ArrayList pathParam = new ArrayList<>(); + static NecessaryParam nes = new NecessaryParam(); static TestGETCactus get = new TestGETCactus(); static TestPOSTCactus post = new TestPOSTCactus("f", "f", "f"); static TestPUTCactus put = new TestPUTCactus("f", "f"); @@ -19,19 +20,24 @@ public static void main(String[] args) { // post.start(); init(); - api.jsonAcquisition("src/main/you.json"); + //api.jsonAcquisition("src/main/you.json"); api.doRestTest(); System.out.println(api.getResults()); } static private void init() { api.setAccount("https://www.googleapis.com/youtube/v3"); - queryParam.add(new RestParam("id", "PLZcOpFipzeuFmuPLYyijcN0l4S0skwuiR")); + queryParam.add(new RestParam("mine", "true")); queryParam.add(new RestParam("part", "id")); - api.setToken("access_token", - "ya29.GltqBnBr5rboUfJ8ODUnj3vtdV54kjLRXbbntDt1M_4f_HGfXj-NL5ODfDkS7tn4nzP93L3w26KvtB27EZAg3Z7Q_NJZGNDy4KtKTTla1TNOA8URDNsKDEqHEV4D"); + queryParam.add(new RestParam("access_token", + "ya29.GltqBpitzI890HzAA79CwcOrRQmaBlyI2xmTs6iYKeipPLhtrhndUqQ188oQBDYi62KTeJm828EOzyz_cA61qL-78qpxtYi59kAzYrW2FnysoSAkgQO5_oEiYVfT")); pathParam.add("playlists"); - api.setProperty("Content-type", "application/json"); + api.getGetnesParam().setQueryParams(new RestParam("mine", "true")); + api.getGetnesParam().setQueryParams(new RestParam("part", "id")); + api.getGetnesParam().setQueryParams(new RestParam("access_token", + "ya29.GltqBpitzI890HzAA79CwcOrRQmaBlyI2xmTs6iYKeipPLhtrhndUqQ188oQBDYi62KTeJm828EOzyz_cA61qL-78qpxtYi59kAzYrW2FnysoSAkgQO5_oEiYVfT")); + api.getGetnesParam().setPathParams("playlists"); +// api.setProperty("Content-type", "application/json"); api.setupRestTest(Method.GET, queryParam, formParam, pathParam); } diff --git a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index 3604fc7..5db3005 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 (Json.length() > 0) { + if (method != "GET" && Json.length() > 0) { conn.setDoOutput(true); if (clientSessionID != null) { conn.setRequestProperty("Cookie", clientSessionID); diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index ba18394..4b39cf0 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -23,18 +23,13 @@ private ArrayList pathParam; private String judgeResult; private String method; - private String token, token_name; private String jstr; private ArrayList keys = new ArrayList<>(); private ArrayList values = new ArrayList<>(); + private NecessaryParam getnesParam = new NecessaryParam(); public static final int ACCOUNT_NUM = 5; - public void setToken(String token_name, String token) { - this.token_name = token_name; - this.token = token; - } - public void setProperty(String key, String value) { keys.add(key); values.add(value); @@ -74,7 +69,6 @@ System.out.println("not Selected Method"); return; } - queryParam.add(new RestParam(token_name, token)); ReadResource(beforeResults); for (RestAccount account : accounts) { switch (type) { @@ -155,10 +149,14 @@ private void ReadResource(ArrayList results) { RestAccount account = new RestAccount(accounts.get(0).getUrl()); account.doGet(); - for(String path : pathParam) { - account.addPathParam(path); - } - account.addQueryParam(token_name, token); + if (getnesParam.getQueryParams() != null) + for (RestParam param : getnesParam.getQueryParams()) { + account.addQueryParam(param.key, param.value); + } + if (getnesParam.getPathParams() != null) + for (String param : getnesParam.getPathParams()) { + account.addPathParam(param); + } account.doAnything(); results.add(account.doReceive()); } @@ -180,7 +178,10 @@ // TODO Auto-generated catch block e.printStackTrace(); } + } + public NecessaryParam getGetnesParam() { + return getnesParam; } public enum Method {