diff --git a/src/main/Main.java b/src/main/Main.java index 8173834..1808ae6 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -14,6 +14,7 @@ static NecessaryParam nes = new NecessaryParam(); static TestGETCactus get = new TestGETCactus(); static TestCreatePOSTCactus post = new TestCreatePOSTCactus("f", "f", "f"); + static TestLogoutPOSTCactus logout = new TestLogoutPOSTCactus(""); static TestPUTCactus put = new TestPUTCactus("f", "f"); static TestDELETECactus delete = new TestDELETECactus("qF9bgKYZmw8P"); diff --git a/src/testcase/TestCactus.java b/src/testcase/TestCactus.java new file mode 100644 index 0000000..c4a1b46 --- /dev/null +++ b/src/testcase/TestCactus.java @@ -0,0 +1,21 @@ +package testcase; + +import java.util.ArrayList; + +import restfulchecker.RestChecker; +import restfulchecker.RestParam; + +public class TestCactus { + protected RestChecker check = new RestChecker(); + protected ArrayList query = new ArrayList<>(); + protected ArrayList form = new ArrayList<>(); + protected ArrayList path = new ArrayList<>(); + + protected TestCactus() { + check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + } + + public void start() { + check.doRestTest(); + } +} diff --git a/src/testcase/TestCreatePOSTCactus.java b/src/testcase/TestCreatePOSTCactus.java index ae129b7..d3021cd 100644 --- a/src/testcase/TestCreatePOSTCactus.java +++ b/src/testcase/TestCreatePOSTCactus.java @@ -1,25 +1,16 @@ package testcase; -import java.util.ArrayList; - import restfulchecker.*; import restfulchecker.RestChecker.Method; -public class TestCreatePOSTCactus { - private RestChecker check = new RestChecker(); - private ArrayList query = new ArrayList<>(); - private ArrayList form = new ArrayList<>(); - private ArrayList path = new ArrayList<>(); +public class TestCreatePOSTCactus extends TestCactus { public TestCreatePOSTCactus(String userID, String userName, String userPass) { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + super(); 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/TestDELETECactus.java b/src/testcase/TestDELETECactus.java index c985909..2803702 100644 --- a/src/testcase/TestDELETECactus.java +++ b/src/testcase/TestDELETECactus.java @@ -1,23 +1,13 @@ package testcase; -import java.util.ArrayList; - -import restfulchecker.*; import restfulchecker.RestChecker.Method; -public class TestDELETECactus { - private RestChecker check = new RestChecker(); - private ArrayList query = new ArrayList<>(); - private ArrayList form = new ArrayList<>(); - private ArrayList path = new ArrayList<>(); +public class TestDELETECactus extends TestCactus { public TestDELETECactus(String uniqueID) { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + super(); path.add(uniqueID); check.setupRestTest(Method.DELETE, query, form, path); } - public void start() { - check.doRestTest(); - } } diff --git a/src/testcase/TestGETCactus.java b/src/testcase/TestGETCactus.java index 7627dd6..1ac5aee 100644 --- a/src/testcase/TestGETCactus.java +++ b/src/testcase/TestGETCactus.java @@ -1,19 +1,12 @@ package testcase; -import java.util.ArrayList; - -import restfulchecker.*; import restfulchecker.RestChecker.Method; -public class TestGETCactus { - private RestChecker check = new RestChecker(); - private ArrayList query = new ArrayList<>(); - private ArrayList form = new ArrayList<>(); - private ArrayList path = new ArrayList<>(); +public class TestGETCactus extends TestCactus { - public void start() { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + public TestGETCactus() { + super(); check.setupRestTest(Method.GET, query, form, path); - check.doRestTest(); } + } diff --git a/src/testcase/TestLogoutPOSTCactus.java b/src/testcase/TestLogoutPOSTCactus.java index 53e3621..873b805 100644 --- a/src/testcase/TestLogoutPOSTCactus.java +++ b/src/testcase/TestLogoutPOSTCactus.java @@ -1,24 +1,14 @@ package testcase; -import java.util.ArrayList; - import restfulchecker.*; import restfulchecker.RestChecker.Method; -public class TestLogoutPOSTCactus { - private RestChecker check = new RestChecker(); - private ArrayList query = new ArrayList<>(); - private ArrayList form = new ArrayList<>(); - private ArrayList path = new ArrayList<>(); +public class TestLogoutPOSTCactus extends TestCactus { public TestLogoutPOSTCactus(String token) { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + super(); form.add(new RestParam("token", token)); path.add("logout"); check.setupRestTest(Method.POST, query, form, path); } - - public void start() { - check.doRestTest(); - } } \ No newline at end of file diff --git a/src/testcase/TestPUTCactus.java b/src/testcase/TestPUTCactus.java index 90d1556..bb6ad23 100644 --- a/src/testcase/TestPUTCactus.java +++ b/src/testcase/TestPUTCactus.java @@ -1,26 +1,15 @@ package testcase; -import java.util.ArrayList; - import restfulchecker.*; import restfulchecker.RestChecker.Method; -public class TestPUTCactus { - private RestChecker check = new RestChecker(); - private ArrayList query = new ArrayList<>(); - private ArrayList form = new ArrayList<>(); - private ArrayList path = new ArrayList<>(); +public class TestPUTCactus extends TestCactus { public TestPUTCactus(String userID, String userPass) { - check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); + super(); form.add(new RestParam("userID", userID)); form.add(new RestParam("userPass", userPass)); check.setupRestTest(Method.PUT, query, form, path); check.setRemoveParam("token"); } - - public void start() { - check.doRestTest(); - System.out.println(check.getResults()); - } }