diff --git a/src/main/Main.java b/src/main/Main.java index e9fa0b4..04088fb 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -14,9 +14,9 @@ new TestPUTCactus("f", "f"), new TestDELETECactus("qF9bgKYZmw8P") }; TestYouTube[] youtube = { new TestGETYouTube(token), new TestPOSTYouTube(token), new TestPUTYouTube(token), new TestDELETEYouTube(token, "PLCwNa5MZdBSrIn-8nc9gDckf2kzXejtL_") }; - TestTwitter[] twitter = { new TestGETListsTwitter("masterlink3535"), - new TestPOSTcreateTwitter("masterlink3535") }; - cactus[3].start(); + TestTwitter[] twitter = { new TestGETListsTwitter(), new TestPOSTcreateTwitter(), + new TestPOSTdestroyTwitter(""), new TestPOSTupdateTwitter("", "") }; + cactus[3].start(); } } diff --git a/src/testcase/twitter/TestGETListsTwitter.java b/src/testcase/twitter/TestGETListsTwitter.java index 62bfec7..2826f4e 100644 --- a/src/testcase/twitter/TestGETListsTwitter.java +++ b/src/testcase/twitter/TestGETListsTwitter.java @@ -1,17 +1,14 @@ package testcase.twitter; -import restfulchecker.RestParam; import restfulchecker.RestChecker.Method; public class TestGETListsTwitter extends TestTwitter { - public TestGETListsTwitter(String userID) { + public TestGETListsTwitter() { super(); path.add("lists"); path.add("list.json"); - query.add(new RestParam("screen_name", userID)); check.setupRestTest(Method.GET, query, form, path); check.getResourceParam().setPathParams("lists"); check.getResourceParam().setPathParams("list.json"); - check.getResourceParam().setQueryParams(new RestParam("screen_name", userID)); } } diff --git a/src/testcase/twitter/TestPOSTcreateTwitter.java b/src/testcase/twitter/TestPOSTcreateTwitter.java index b5587fb..59b4c55 100644 --- a/src/testcase/twitter/TestPOSTcreateTwitter.java +++ b/src/testcase/twitter/TestPOSTcreateTwitter.java @@ -5,7 +5,7 @@ public class TestPOSTcreateTwitter extends TestTwitter { - public TestPOSTcreateTwitter(String userID) { + public TestPOSTcreateTwitter() { super(); query.add(new RestParam("name","test")); query.add(new RestParam("mode","private")); @@ -14,7 +14,6 @@ check.setupRestTest(Method.POST, query, form, path); check.getResourceParam().setPathParams("lists"); check.getResourceParam().setPathParams("list.json"); - check.getResourceParam().setQueryParams(new RestParam("screen_name", userID)); } } diff --git a/src/testcase/twitter/TestPOSTdestroyTwitter.java b/src/testcase/twitter/TestPOSTdestroyTwitter.java index d93a08e..cb2a574 100644 --- a/src/testcase/twitter/TestPOSTdestroyTwitter.java +++ b/src/testcase/twitter/TestPOSTdestroyTwitter.java @@ -5,7 +5,7 @@ public class TestPOSTdestroyTwitter extends TestTwitter { - public TestPOSTdestroyTwitter(String userID, String ListID) { + public TestPOSTdestroyTwitter(String ListID) { super(); query.add(new RestParam("list_id", ListID)); path.add("lists"); @@ -13,7 +13,6 @@ check.setupRestTest(Method.POST, query, form, path); check.getResourceParam().setPathParams("lists"); check.getResourceParam().setPathParams("list.json"); - check.getResourceParam().setQueryParams(new RestParam("screen_name", userID)); } } diff --git a/src/testcase/twitter/TestPOSTupdateTwitter.java b/src/testcase/twitter/TestPOSTupdateTwitter.java index 41a396e..65d86d5 100644 --- a/src/testcase/twitter/TestPOSTupdateTwitter.java +++ b/src/testcase/twitter/TestPOSTupdateTwitter.java @@ -5,7 +5,7 @@ public class TestPOSTupdateTwitter extends TestTwitter { - public TestPOSTupdateTwitter(String userID, String ListID, String name) { + public TestPOSTupdateTwitter(String ListID, String name) { super(); query.add(new RestParam("list_id", ListID)); query.add(new RestParam("name", name)); @@ -14,7 +14,6 @@ check.setupRestTest(Method.POST, query, form, path); check.getResourceParam().setPathParams("lists"); check.getResourceParam().setPathParams("list.json"); - check.getResourceParam().setQueryParams(new RestParam("screen_name", userID)); } } diff --git a/src/testcase/twitter/TestTwitter.java b/src/testcase/twitter/TestTwitter.java index a03fdcc..78d2e7d 100644 --- a/src/testcase/twitter/TestTwitter.java +++ b/src/testcase/twitter/TestTwitter.java @@ -7,10 +7,6 @@ protected TestTwitter() { super("https://api.twitter.com/1.1"); - // oauth.setConsumer_key("xPk6o11catewYwxGcXvvvqo2I"); - // oauth.setConsumer_secret("P9oXQstrFURXcbV8qT4OJzLjNfgYkpo1AvJzUnbywsEiDpuytb"); - // oauth.generateSignature(); - //query.add(new RestParam("oauth_callback","http://localhost")); } public OAuthHeader getOauth() { @@ -22,7 +18,7 @@ } public void start() { - check.setProperty("Authorization", "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1545367805\",oauth_nonce=\"rUUpDS\",oauth_version=\"1.0\",oauth_signature=\"9sb6QH5pVBarQsk%2FN%2Fn3HrPgiXE%3D\""); + check.setProperty("Authorization", "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1546913535\",oauth_nonce=\"m4f2czd1NIQ\",oauth_version=\"1.0\",oauth_signature=\"H0vVKGlrT%2FBbfSOD0RI5pOBT7ss%3D\""); check.doRestTest(); } }