diff --git a/document/Klein-Namjoshi2011_Chapter_FormalizationAndAutomatedVerif.pdf b/document/Klein-Namjoshi2011_Chapter_FormalizationAndAutomatedVerif.pdf new file mode 100644 index 0000000..ad7293b --- /dev/null +++ b/document/Klein-Namjoshi2011_Chapter_FormalizationAndAutomatedVerif.pdf Binary files differ diff --git a/src/main/Main.java b/src/main/Main.java index d684056..7ce7ee9 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -12,19 +12,19 @@ ArrayList formParam = new ArrayList<>(); ArrayList pathParam = new ArrayList<>(); api.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts/"); - formParam.add(new RestParam("userID", "dee")); + formParam.add(new RestParam("userID", "yyy")); formParam.add(new RestParam("userName", "abc")); formParam.add(new RestParam("userPass", "abc")); - api.setupRestTest(Method.GET, queryParam, formParam, pathParam); + api.setupRestTest(Method.POST, queryParam, formParam, pathParam); api.doRestTest(); for (String result : api.getResults()) { System.out.println(result); } System.out.println(api.getJudgeResult()); } - + private void init() { - + } } diff --git a/src/main/RestApi.java b/src/main/RestApi.java index 22282bf..6b66b0a 100644 --- a/src/main/RestApi.java +++ b/src/main/RestApi.java @@ -1,7 +1,7 @@ package main; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Iterator; public class RestApi { private ArrayList accounts = new ArrayList<>(); @@ -62,10 +62,10 @@ responses.add(account.getResponseCode()); results.add(account.doReceive()); } - if(listAllEquals(results)) { + if (listAllEquals(results, responses)) { judgeResult = "GET"; - }else { - + } else { + } } @@ -83,12 +83,17 @@ account.addPathParam(param); } } - - private boolean listAllEquals(ArrayList list) { - Object first = list.get(0); - for (Object s : list) { - if(!s.equals(first)) - return false; + + private boolean listAllEquals(ArrayList results, ArrayList respounses) { + String first = results.get(0); + int firstres = respounses.get(0); + Iterator res = respounses.iterator(); + for (String s : results) { + if(firstres != 200) + return false; + if (!s.equals(first)) + return false; + firstres = (int)res.next(); } return true; }