diff --git a/src/main/Main.java b/src/main/Main.java index 30e781e..566c487 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -12,25 +12,28 @@ static ArrayList formParam = new ArrayList<>(); static ArrayList pathParam = new ArrayList<>(); static TestGETCactus get = new TestGETCactus(); - static TestPOSTCactus post = new TestPOSTCactus("f","f","f"); - static TestPUTCactus put = new TestPUTCactus("f","f"); + static TestPOSTCactus post = new TestPOSTCactus("f", "f", "f"); + static TestPUTCactus put = new TestPUTCactus("f", "f"); static TestDELETECactus delete = new TestDELETECactus("qF9bgKYZmw8P"); public static void main(String[] args) { -// post.start(); + // post.start(); init(); + api.jsonAcquisition("src/main/you.json"); api.doRestTest(); System.out.println(api.getResults()); -// System.out.println(api.getBeforeResults()); -// System.out.println(api.getJudgeResult()); + // System.out.println(api.getBeforeResults()); + // System.out.println(api.getJudgeResult()); } static private void init() { api.setAccount("https://www.googleapis.com/youtube/v3"); -// queryParam.add(new RestParam("key", "AIzaSyD5EI71SqPZhgdpwzlV0XTisGuKKtH5p6I")); -// queryParam.add(new RestParam("id", "7lCDEYXw3mM")); + // queryParam.add(new RestParam("key", + // "AIzaSyD5EI71SqPZhgdpwzlV0XTisGuKKtH5p6I")); + // queryParam.add(new RestParam("id", "7lCDEYXw3mM")); queryParam.add(new RestParam("part", "snippet")); - queryParam.add(new RestParam("access_token", "ya29.GltoBgshDGc5-hOiCBnKcrpu5vZvEOy-wSBhul7wyzcg8XpFWMWhymWADANBsx0FoG643I8DD855hYVUCMw8beOgGc4WyA0HQwfPcNQZR0nuYREsXOIj6O2UymPi")); + queryParam.add(new RestParam("access_token", + "ya29.GltqBt15-zkpMQ_Moqbt1ccsFh-KFFKcWHNB9LiDYlAOBdOW-gqHCexRJUfJN-G2j_2W2GfNT1HrRC5b0N9sl7RYcmXb28-lHjbtu0mWP7PHU0FhzJ-MnymdbnVJ")); pathParam.add("playlists"); api.setupRestTest(Method.POST, queryParam, formParam, pathParam); } diff --git a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index 2faeae2..dfc6898 100644 --- a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -59,6 +59,10 @@ values.add(value); } + public void setJson(String Json) { + this.Json = Json; + } + // request public void doAnything() { try { diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index f6ab998..d6d8fad 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.io.PrintStream; import java.util.ArrayList; import com.fasterxml.jackson.core.JsonProcessingException; @@ -23,6 +24,7 @@ private String judgeResult; private String method; private String token, token_name; + private String jstr; public static final int ACCOUNT_NUM = 5; @@ -76,11 +78,7 @@ System.out.println("not Selected Method"); return; } - RestAccount first = new RestAccount(accounts.get(0).getUrl()); - first.doGet(); - addParam(first); - first.doAnything(); - beforeResults.add(first.doReceive()); + ReadResource(beforeResults); for (RestAccount account : accounts) { switch (type) { case GET: @@ -101,19 +99,12 @@ break; } addParam(account); + account.setJson(jstr); account.doAnything(); responses.add(account.getResponseCode()); receives.add(account.doReceive()); - RestAccount second = new RestAccount(accounts.get(0).getUrl()); - second.doGet(); - addParam(second); - second.doAnything(); - results.add(second.doReceive()); - first = new RestAccount(accounts.get(0).getUrl()); - first.doGet(); - addParam(first); - first.doAnything(); - beforeResults.add(first.doReceive()); + ReadResource(results); + ReadResource(beforeResults); } judgeMethod(); } @@ -161,6 +152,13 @@ } } + private void ReadResource(ArrayList results) { + RestAccount account = new RestAccount(accounts.get(0).getUrl()); + account.doGet(); + account.doAnything(); + results.add(account.doReceive()); + } + public void jsonAcquisition(String path) { ObjectMapper mapper = new ObjectMapper(); try { @@ -170,7 +168,7 @@ while ((line = reader.readLine()) != null) { builder.append(line); } - builder.toString(); + jstr = builder.toString(); } catch (JsonProcessingException e) { // TODO Auto-generated catch block e.printStackTrace();