diff --git a/src/main/Main.java b/src/main/Main.java index 47e80be..9991ac2 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -17,9 +17,9 @@ init(); api.setupRestTest(Method.PUT, queryParam, formParam, pathParam); api.doRestTest(); - System.out.println(api.getResults()); - System.out.println(api.getBeforeResults()); - System.out.println(api.getJudgeResult()); +// System.out.println(api.getResults()); +// System.out.println(api.getBeforeResults()); +// System.out.println(api.getJudgeResult()); } static private void init() { @@ -29,7 +29,7 @@ formParam.add(new RestParam("userPass", "test")); // formParam.add(new RestParam("userName", "g")); // pathParam.add("logout"); -// formParam.add(new RestParam("token", "B34hYLKovzjF5v36wb684Mf6ij23m0Q0uynJ41BrzFDHBRvJiblTW326NITEXEfK")); +// formParam.add(new RestParam("token", "E12xg9f1MCDr8P7aqDQdx4l7nIM3CdvpzXz2vbmzl832LGe8DjwAPWR6wZzP5hn4")); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index b9005fb..03ff129 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -13,6 +13,7 @@ private ArrayList formParam; private ArrayList pathParam; private String judgeResult; + private String method; public static final int ACCOUNT_NUM = 5; @@ -58,15 +59,19 @@ switch (type) { case GET: account.doGet(); + method = "GET"; break; case POST: account.doPost(); + method = "POST"; break; case PUT: account.doPut(); + method = "PUT"; break; case DELETE: account.doDelete(); + method = "DELETE"; break; } addParam(account); @@ -117,14 +122,20 @@ if (isSafety && isIdempotency) { judgeResult = "GET"; } else if (!isSafety && isIdempotency) { - if (results.get(0).indexOf(receives.get(0)) == -1) { - judgeResult = "DELETE"; - } else { - judgeResult = "PUT"; - } + judgeResult = "PUT or DELETE"; +// if (results.get(0).indexOf(receives.get(0)) == -1) { +// judgeResult = "DELETE"; +// } else { +// judgeResult = "PUT"; +// } } else { judgeResult = "POST"; } + if (judgeResult.indexOf(method) != -1) { + System.out.println("OK"); + } else { + System.out.println("WARNING!! Perhaps:" + judgeResult); + } } public enum Method {