diff --git a/document/transelete.docx b/document/transelete.docx index a73512d..fbfefdb 100644 --- a/document/transelete.docx +++ b/document/transelete.docx Binary files differ diff --git a/src/main/Main.java b/src/main/Main.java index 43855e2..2b1cd5f 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -14,16 +14,16 @@ public static void main(String[] args) { init(); - api.setupRestTest(Method.GET, queryParam, formParam, pathParam); + api.setupRestTest(Method.POST, queryParam, formParam, pathParam); api.doRestTest(); System.out.println(api.getJudgeResult()); } static private void init() { api.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); -// formParam.add(new RestParam("userID", "yyy")); -// formParam.add(new RestParam("userName", "abc")); -// formParam.add(new RestParam("userPass", "abc")); + formParam.add(new RestParam("userID", "yyy")); + formParam.add(new RestParam("userName", "abc")); + formParam.add(new RestParam("userPass", "abc")); // pathParam.add("logout"); // formParam.add(new RestParam("token","d4pEuHxDUbzRJswWImVjWlbFJZDsUI8QItMVfjoRQt8lj2J7Y7XWR4QlyMlx77ya")); } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 684e5c7..eac6493 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -1,7 +1,6 @@ package restfulchecker; import java.util.ArrayList; -import java.util.Iterator; public class RestChecker { private ArrayList accounts = new ArrayList<>(); @@ -74,7 +73,10 @@ responses.add(account.getResponseCode()); String receive = account.doReceive(); results.add(receive); - beforeResults.add(receive); + first = new RestAccount(accounts.get(0).getUrl()); + first.doGet(); + first.doAnything(); + beforeResults.add(first.doReceive()); } judgeMethod(); } @@ -96,27 +98,25 @@ private void judgeMethod() { ArrayList identically = new ArrayList<>(); - Iterator current = beforeResults.iterator(); - Boolean first = null; - boolean judge = false; - for (String result : results) { - String beforeResult = current.next(); - identically.add(result.equals(beforeResult)); + Boolean isSafety = null; + boolean isIdempotency = false; + for (int i = 0; i < results.size(); i++) { + identically.add(results.get(i).equals(beforeResults.get(i))); } for (boolean idente : identically) { - if (first == null) { - first = idente; + if (isSafety == null) { + isSafety = idente; } else { if (!idente) { - judge = false; + isIdempotency = false; } else { - judge = true; + isIdempotency = true; } } } - if (first && judge) { + if (isSafety && isIdempotency) { judgeResult = "GET"; - } else if (!first && judge) { + } else if (!isSafety && isIdempotency) { judgeResult = "PUT or DELETE"; } else { judgeResult = "POST";