diff --git a/src/main/Main.java b/src/main/Main.java index 2b1cd5f..5bf6945 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -14,18 +14,24 @@ public static void main(String[] args) { init(); - api.setupRestTest(Method.POST, queryParam, formParam, pathParam); + api.setupRestTest(Method.DELETE, queryParam, formParam, pathParam); api.doRestTest(); + System.out.println(api.getResults()); + System.out.println(api.getBeforeResults()); 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")); + pathParam.add("OyA7y0Lhikej"); +// formParam.add(new RestParam("userID", "test")); +// formParam.add(new RestParam("userPass", "test")); +// formParam.add(new RestParam("userName", "test")); +// formParam.add(new RestParam("userID", "g")); +// formParam.add(new RestParam("userPass", "g")); +// formParam.add(new RestParam("userName", "g")); // pathParam.add("logout"); -// formParam.add(new RestParam("token","d4pEuHxDUbzRJswWImVjWlbFJZDsUI8QItMVfjoRQt8lj2J7Y7XWR4QlyMlx77ya")); +// formParam.add(new RestParam("token","c4qSX1aJRitZ3x2z1OHmZ0k2I9YXaQMIluDgDgdlkeeqt3bIskbEYBLeUC5xAtZw")); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 2eca36f..a6c199e 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -99,8 +99,6 @@ private void judgeMethod() { ArrayList identically = new ArrayList<>(); - Boolean isSafety = null; - boolean isIdempotency = false; for (int i = 0; i < results.size(); i++) { boolean isResponse = false; if (responses.get(i) == HttpURLConnection.HTTP_OK) { @@ -108,16 +106,10 @@ } identically.add(isResponse); } - for (boolean idente : identically) { - if (isSafety == null) { - isSafety = idente; - } else { - if (!idente) { - isIdempotency = false; - } else { - isIdempotency = true; - } - } + boolean isSafety = identically.get(0); + boolean isIdempotency = false; + for (int i = 1; i < identically.size(); i++) { + isIdempotency = identically.get(i); } if (isSafety && isIdempotency) { judgeResult = "GET";