diff --git a/src/main/Main.java b/src/main/Main.java index e492905..ce074f9 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -14,7 +14,7 @@ public static void main(String[] args) { init(); - api.setupRestTest(Method.POST, queryParam, formParam, pathParam); + api.setupRestTest(Method.GET, queryParam, formParam, pathParam); api.doRestTest(); System.out.println(api.getResults()); System.out.println(api.getBeforeResults()); @@ -23,14 +23,14 @@ static private void init() { api.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); -// formParam.add(new RestParam("userID", "test")); -// formParam.add(new RestParam("userPass", "test")); +// formParam.add(new RestParam("userID", "test2")); +// formParam.add(new RestParam("userPass", "test2")); // 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","c4qSX1aJRitZ3x2z1OHmZ0k2I9YXaQMIluDgDgdlkeeqt3bIskbEYBLeUC5xAtZw")); +// pathParam.add("kQtn2GksuPFb"); +// formParam.add(new RestParam("token","c4qSX1aJRitZ3x2z1OHmZ0k2I9YXaQMIluDgDgdlkeeqt3bIskbEYBLeUC5xAtZw")); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index a6c199e..335eb6b 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -72,8 +72,11 @@ addParam(account); account.doAnything(); responses.add(account.getResponseCode()); - String receive = account.doReceive(); - results.add(receive); + account.doReceive(); + RestAccount second = new RestAccount(accounts.get(0).getUrl()); + second.doGet(); + second.doAnything(); + results.add(second.doReceive()); first = new RestAccount(accounts.get(0).getUrl()); first.doGet(); first.doAnything(); @@ -101,9 +104,9 @@ ArrayList identically = new ArrayList<>(); for (int i = 0; i < results.size(); i++) { boolean isResponse = false; - if (responses.get(i) == HttpURLConnection.HTTP_OK) { - isResponse = results.get(i).equals(beforeResults.get(i)); - } +// if (responses.get(i) == HttpURLConnection.HTTP_OK) { + isResponse = results.get(i).equals(beforeResults.get(i)); +// } identically.add(isResponse); } boolean isSafety = identically.get(0);