diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index a2cb794..7b2a1e3 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -154,9 +154,9 @@ if (isSafety && isIdempotency) { judgeResult = "GET"; } else if (!isSafety && isIdempotency) { - if(!isResponse && type == Method.POST){ + if (!isResponse && type == Method.POST) { judgeResult = "POST"; - }else { + } else { judgeResult = "PUT or DELETE"; } } else { @@ -167,10 +167,10 @@ if (isRemove) { System.out.println("It`s Quasi " + judgeResult); } - if(!isResponse && type == Method.POST){ + if (!isResponse && type == Method.POST) { System.out.println("It`s POST Once Exactry"); } - }else { + } else { System.out.println("WARNING!! Possibly:" + judgeResult); } } @@ -186,6 +186,9 @@ for (String param : resourceParam.getPathParams()) { account.addPathParam(param); } + for (int i = 0; i < keys.size(); i++) { + account.setRequestPropertie(keys.get(i), values.get(i)); + } account.doAnything(); String receive = account.doReceive(); for (RemoveJsonParam remove : removeParam) { diff --git a/src/testcase/twitter/OAuthHeader.java b/src/testcase/twitter/OAuthHeader.java index 3ad945d..85f20e0 100644 --- a/src/testcase/twitter/OAuthHeader.java +++ b/src/testcase/twitter/OAuthHeader.java @@ -4,9 +4,8 @@ import java.net.URLEncoder; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.util.HashMap; import java.util.Map.Entry; -import java.util.SortedMap; -import java.util.TreeMap; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -16,11 +15,11 @@ public class OAuthHeader { private String consumer_key; private String consumer_secret; - private String oauth_token; - private String oauth_secret; + private String oauth_token = ""; + private String oauth_secret = ""; private String method = "POST"; private String url = "https://api.twitter.com/oauth/request_token"; - private SortedMap params = new TreeMap(); + private HashMap params = new HashMap(); public String getConsumer_key() { return consumer_key; diff --git a/src/testcase/twitter/TestGETListsTwitter.java b/src/testcase/twitter/TestGETListsTwitter.java index 0b9b69a..62bfec7 100644 --- a/src/testcase/twitter/TestGETListsTwitter.java +++ b/src/testcase/twitter/TestGETListsTwitter.java @@ -8,10 +8,10 @@ super(); path.add("lists"); path.add("list.json"); - query.add(new RestParam("user_id", userID)); + 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("user_id", userID)); + check.getResourceParam().setQueryParams(new RestParam("screen_name", userID)); } } diff --git a/src/testcase/twitter/TestTwitter.java b/src/testcase/twitter/TestTwitter.java index b8d31e2..edf4d68 100644 --- a/src/testcase/twitter/TestTwitter.java +++ b/src/testcase/twitter/TestTwitter.java @@ -7,6 +7,9 @@ protected TestTwitter() { super("https://api.twitter.com/1.1"); + oauth.setConsumer_key("xPk6o11catewYwxGcXvvvqo2I"); + oauth.setConsumer_secret("P9oXQstrFURXcbV8qT4OJzLjNfgYkpo1AvJzUnbywsEiDpuytb"); + oauth.generateSignature(); } public OAuthHeader getOauth() {