diff --git a/src/restfulchecker/NecessaryParam.java b/src/restfulchecker/NecessaryParam.java index de58e1d..dcebae4 100644 --- a/src/restfulchecker/NecessaryParam.java +++ b/src/restfulchecker/NecessaryParam.java @@ -6,6 +6,8 @@ private ArrayList queryParams = new ArrayList<>(); private ArrayList formParams = new ArrayList<>(); private ArrayList pathParams = new ArrayList<>(); + private ArrayList keys = new ArrayList<>(); + private ArrayList values = new ArrayList<>(); public ArrayList getQueryParams() { return queryParams; @@ -31,4 +33,17 @@ pathParams.add(pathParam); } + public void setProperty(String key, String value) { + keys.add(key); + values.add(value); + } + + public ArrayList getKeys() { + return keys; + } + + public ArrayList getValues() { + return values; + } + } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 7b2a1e3..e901db7 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -187,7 +187,7 @@ account.addPathParam(param); } for (int i = 0; i < keys.size(); i++) { - account.setRequestPropertie(keys.get(i), values.get(i)); + account.setRequestPropertie(resourceParam.getKeys().get(i), resourceParam.getValues().get(i)); } account.doAnything(); String receive = account.doReceive(); diff --git a/src/testcase/twitter/TestTwitter.java b/src/testcase/twitter/TestTwitter.java index afa49a0..ac237fd 100644 --- a/src/testcase/twitter/TestTwitter.java +++ b/src/testcase/twitter/TestTwitter.java @@ -3,14 +3,16 @@ import testcase.TestCase; abstract public class TestTwitter extends TestCase { - private String value = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547012412\",oauth_nonce=\"kv64T7\",oauth_version=\"1.0\",oauth_signature=\"2xcicANqvUKcshB0ahoz48LX234%3D\""; - + private String getvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547013260\",oauth_nonce=\"FH58v1\",oauth_version=\"1.0\",oauth_signature=\"sbnqpQrsx9wFv65GEi5gDbJBhBU%3D\""; + private String postvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547013283\",oauth_nonce=\"HtB3Gl\",oauth_version=\"1.0\",oauth_signature=\"xpYKAcSDgLYzvZf%2FGVa%2BTMqnJq0%3D\""; + protected TestTwitter() { super("https://api.twitter.com/1.1"); } public void start() { - check.setProperty("Authorization",value); + check.setProperty("Authorization",postvalue); + check.getResourceParam().setProperty("Authorization", getvalue); check.doRestTest(); } }