diff --git a/src/main/Main.java b/src/main/Main.java index b5caecf..6197072 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -17,12 +17,12 @@ static TestDELETECactus delete = new TestDELETECactus(""); public static void main(String[] args) { - init(); - api.setupRestTest(Method.POST, queryParam, formParam, pathParam); - api.doRestTest(); - System.out.println(api.getResults()); - System.out.println(api.getBeforeResults()); - System.out.println(api.getJudgeResult()); + get.start(); +// init(); +// api.doRestTest(); +// System.out.println(api.getResults()); +// System.out.println(api.getBeforeResults()); +// System.out.println(api.getJudgeResult()); } static private void init() { @@ -34,6 +34,7 @@ "4/qAArj0H6c6w-brTnYiy1aGXn_PW97ks_KJdS03-tYEdXyT_W1OAyWh3OdMTuOctD1zEdjLpAHR2Ez-vgar6WqYQ")); pathParam.add("playlists"); formParam.add(new RestParam("snippet.title", "test")); + api.setupRestTest(Method.POST, queryParam, formParam, pathParam); } } diff --git a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index 19cd47b..bf37fef 100644 --- a/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/src/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -67,7 +67,6 @@ int length = baseUrl.length() + pathParams.length() + 1 + queryParams.length() * 8; conn.setReadTimeout(10000 /* milliseconds */); conn.setConnectTimeout(15000 /* milliseconds */); - conn.addRequestProperty("Authorization", code); conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); conn.addRequestProperty("Content-Length",Integer.toString(length)); // POST or GET or PUT or DELETE diff --git a/src/testcase/TestDELETECactus.java b/src/testcase/TestDELETECactus.java index c7cc019..90f2bf9 100644 --- a/src/testcase/TestDELETECactus.java +++ b/src/testcase/TestDELETECactus.java @@ -7,11 +7,13 @@ public class TestDELETECactus { private RestChecker check = new RestChecker(); + private ArrayList query = new ArrayList<>(); + private ArrayList form = new ArrayList<>(); + private ArrayList path = new ArrayList<>(); public TestDELETECactus(String uniqueID) { - ArrayList path = new ArrayList<>(); path.add(uniqueID); - check.setupRestTest(Method.DELETE, null, null, path); + check.setupRestTest(Method.DELETE, query, form, path); } public void start() { diff --git a/src/testcase/TestGETCactus.java b/src/testcase/TestGETCactus.java index e402d96..7627dd6 100644 --- a/src/testcase/TestGETCactus.java +++ b/src/testcase/TestGETCactus.java @@ -1,14 +1,19 @@ 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<>(); - void start() { + public void start() { check.setAccount("http://nitta-lab-www.is.konan-u.ac.jp/CactusServer/rest/accounts"); - check.setupRestTest(Method.GET, null, null, null); + check.setupRestTest(Method.GET, query, form, path); check.doRestTest(); } } diff --git a/src/testcase/TestPUTCactus.java b/src/testcase/TestPUTCactus.java index 2204745..935fbf8 100644 --- a/src/testcase/TestPUTCactus.java +++ b/src/testcase/TestPUTCactus.java @@ -7,12 +7,14 @@ public class TestPUTCactus { private RestChecker check = new RestChecker(); + private ArrayList query = new ArrayList<>(); + private ArrayList form = new ArrayList<>(); + private ArrayList path = new ArrayList<>(); 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); + check.setupRestTest(Method.PUT, query, form, path); } public void start() {