diff --git a/src/main/Main.java b/src/main/Main.java index c096e53..b5caecf 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -4,14 +4,17 @@ import restfulchecker.*; import restfulchecker.RestChecker.Method; - +import testcase.*; public class Main { static RestChecker api = new RestChecker(); static ArrayList queryParam = new ArrayList<>(); static ArrayList formParam = new ArrayList<>(); static ArrayList pathParam = new ArrayList<>(); - static String code; + static TestGETCactus get = new TestGETCactus(); + static TestPOSTCactus post = new TestPOSTCactus("q","q","q"); + static TestPUTCactus put = new TestPUTCactus("q","q"); + static TestDELETECactus delete = new TestDELETECactus(""); public static void main(String[] args) { init(); @@ -24,10 +27,6 @@ static private void init() { api.setAccount("https://www.googleapis.com/youtube/v3"); - 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("userName", "g")); queryParam.add(new RestParam("key", "AIzaSyD5EI71SqPZhgdpwzlV0XTisGuKKtH5p6I")); queryParam.add(new RestParam("id", "7lCDEYXw3mM")); queryParam.add(new RestParam("part", "status")); @@ -35,12 +34,6 @@ "4/qAArj0H6c6w-brTnYiy1aGXn_PW97ks_KJdS03-tYEdXyT_W1OAyWh3OdMTuOctD1zEdjLpAHR2Ez-vgar6WqYQ")); pathParam.add("playlists"); formParam.add(new RestParam("snippet.title", "test")); - code = "4/qAArj0H6c6w-brTnYiy1aGXn_PW97ks_KJdS03-tYEdXyT_W1OAyWh3OdMTuOctD1zEdjLpAHR2Ez-vgar6WqYQ"; - formParam.add(new RestParam("Authorization", - "4/pADWrNNy90AsgAfPqcxB_S4Js8ClNi_gRuvzb--4XvK_lCFfEBfP5t5mPODPASxUX1vjvrISNfKvgu1vR3Ev7do")); - pathParam.add("logout"); - formParam.add(new RestParam("token", "E12xg9f1MCDr8P7aqDQdx4l7nIM3CdvpzXz2vbmzl832LGe8DjwAPWR6wZzP5hn4")); - pathParam.add("G90zOL9UTeTx"); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index c260d53..ec25ae7 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -53,7 +53,7 @@ this.queryParam = queryParam; this.formParam = formParam; this.pathParam = pathParam; - //this.code = code; + // this.code = code; } public void doRestTest() { @@ -137,11 +137,11 @@ judgeResult = "GET"; } else if (!isSafety && isIdempotency) { judgeResult = "PUT or DELETE"; -// if (results.get(0).indexOf(receives.get(0)) == -1) { -// judgeResult = "DELETE"; -// } else { -// judgeResult = "PUT"; -// } + // if (results.get(0).indexOf(receives.get(0)) == -1) { + // judgeResult = "DELETE"; + // } else { + // judgeResult = "PUT"; + // } } else { judgeResult = "POST"; }