diff --git a/src/main/Main.java b/src/main/Main.java index 3c74293..c096e53 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -2,10 +2,9 @@ import java.util.ArrayList; -import restfulchecker.RestAccount; -import restfulchecker.RestChecker; +import restfulchecker.*; import restfulchecker.RestChecker.Method; -import restfulchecker.RestParam; + public class Main { static RestChecker api = new RestChecker(); @@ -16,29 +15,32 @@ public static void main(String[] args) { init(); - api.setupRestTest(Method.POST, queryParam, formParam, pathParam,code); + api.setupRestTest(Method.POST, queryParam, formParam, pathParam); api.doRestTest(); System.out.println(api.getResults()); -// System.out.println(api.getBeforeResults()); -// System.out.println(api.getJudgeResult()); + System.out.println(api.getBeforeResults()); + System.out.println(api.getJudgeResult()); } 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")); + 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")); + queryParam.add(new RestParam("access_token", + "4/qAArj0H6c6w-brTnYiy1aGXn_PW97ks_KJdS03-tYEdXyT_W1OAyWh3OdMTuOctD1zEdjLpAHR2Ez-vgar6WqYQ")); pathParam.add("playlists"); formParam.add(new RestParam("snippet.title", "test")); - code = "4/pABHtrI_rbcKvJIlj1h6rPknzRtn-GonoVRa3Gk41pA68jO-nIa3Y5mbR5EiNWFWnK0x0pOKVkDkQbRy9VhvnLs"; -// formParam.add(new RestParam("Authorization", "4/pADWrNNy90AsgAfPqcxB_S4Js8ClNi_gRuvzb--4XvK_lCFfEBfP5t5mPODPASxUX1vjvrISNfKvgu1vR3Ev7do")); -// pathParam.add("logout"); -// formParam.add(new RestParam("token", "E12xg9f1MCDr8P7aqDQdx4l7nIM3CdvpzXz2vbmzl832LGe8DjwAPWR6wZzP5hn4")); -// pathParam.add("G90zOL9UTeTx"); + 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 2214fe3..c260d53 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -48,12 +48,12 @@ } public void setupRestTest(Method method, ArrayList queryParam, ArrayList formParam, - ArrayList pathParam, String code) { + ArrayList pathParam) { this.type = method; this.queryParam = queryParam; this.formParam = formParam; this.pathParam = pathParam; - this.code = code; + //this.code = code; } public void doRestTest() { diff --git a/src/testcase/TestDELETECactus.java b/src/testcase/TestDELETECactus.java new file mode 100644 index 0000000..c7cc019 --- /dev/null +++ b/src/testcase/TestDELETECactus.java @@ -0,0 +1,20 @@ +package testcase; + +import java.util.ArrayList; + +import restfulchecker.*; +import restfulchecker.RestChecker.Method; + +public class TestDELETECactus { + private RestChecker check = new RestChecker(); + + public TestDELETECactus(String uniqueID) { + ArrayList path = new ArrayList<>(); + path.add(uniqueID); + check.setupRestTest(Method.DELETE, null, null, path); + } + + public void start() { + check.doRestTest(); + } +} diff --git a/src/testcase/TestGETCactus.java b/src/testcase/TestGETCactus.java new file mode 100644 index 0000000..e402d96 --- /dev/null +++ b/src/testcase/TestGETCactus.java @@ -0,0 +1,14 @@ +package testcase; + +import restfulchecker.*; +import restfulchecker.RestChecker.Method; + +public class TestGETCactus { + private RestChecker check = new RestChecker(); + + void start() { + check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + check.setupRestTest(Method.GET, null, null, null); + check.doRestTest(); + } +} diff --git a/src/testcase/TestPOSTCactus.java b/src/testcase/TestPOSTCactus.java new file mode 100644 index 0000000..518807a --- /dev/null +++ b/src/testcase/TestPOSTCactus.java @@ -0,0 +1,25 @@ +package testcase; + +import java.util.ArrayList; + +import restfulchecker.*; +import restfulchecker.RestChecker.Method; + +public class TestPOSTCactus { + private RestChecker check = new RestChecker(); + private ArrayList query = new ArrayList<>(); + private ArrayList form = new ArrayList<>(); + private ArrayList path = new ArrayList<>(); + + public TestPOSTCactus(String userID, String userName, String userPass) { + check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + form.add(new RestParam("userID", userID)); + form.add(new RestParam("userName", userName)); + form.add(new RestParam("userPass", userPass)); + check.setupRestTest(Method.POST, query, form, path); + } + + public void start() { + check.doRestTest(); + } +} diff --git a/src/testcase/TestPUTCactus.java b/src/testcase/TestPUTCactus.java new file mode 100644 index 0000000..2204745 --- /dev/null +++ b/src/testcase/TestPUTCactus.java @@ -0,0 +1,21 @@ +package testcase; + +import java.util.ArrayList; + +import restfulchecker.*; +import restfulchecker.RestChecker.Method; + +public class TestPUTCactus { + private RestChecker check = new RestChecker(); + + public TestPUTCactus(String userID, String userPass) { + ArrayList form = new ArrayList<>(); + form.add(new RestParam("userID", userID)); + form.add(new RestParam("userPass", userPass)); + check.setupRestTest(Method.PUT, null, form, null); + } + + public void start() { + check.doRestTest(); + } +}