diff --git a/src/main/Main.java b/src/main/Main.java index f9239a7..c25d191 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -5,18 +5,19 @@ import testcase.youtube.*; public class Main { - static final String token = "ya29.GltyBjRFhtNUq8yk7VF_7IMz2RUmzyW3opMZi4h7oncteCGn4CXSCtnUqZu5wG8jXaV2g9WBmDmtj-3ORqAr-cclO_k4-QMpAfs5NCN9cC_tBJDHsN-uQDKN9WxX"; + static final String token = "ya29.GluNBnp3HTt5I_GC1L8f9RByhfxJzBnbn5HPMzaGIvzyCux9tbE94vPxMEQx5dTBP-VAaUuTYUmFYysOlhAmQYWYLULjRBCkJlPWe_86wp2D6_ltheWbjG3gFx8f"; @SuppressWarnings("unused") public static void main(String[] args) { TestCactus[] cactus = { new TestGETCactus(), new TestCreatePOSTCactus("f", "f", "f"), - new TestLogoutPOSTCactus("8gAymYyC9XS6VcU1OEIdhMVHJnCqql5Qx9EBaCPezsEsvCoqLeq88wYhjtKA7uBH"), - new TestPUTCactus("f", "f"), new TestDELETECactus("qF9bgKYZmw8P") }; + new TestLogoutPOSTCactus("9FeLF6LC8lwAWRD2zMoSxOpTE5vbuJdpuGVcx8NpW0VGbg4cDkDCDshFW5Zl9LQ0"), + new TestPUTCactus("f", "f"), new TestDELETECactus("IxbvugVYRW9e") }; TestYouTube[] youtube = { new TestGETYouTube(token), new TestPOSTYouTube(token), new TestPUTYouTube(token), - new TestDELETEYouTube(token, "PLCwNa5MZdBSrIn-8nc9gDckf2kzXejtL_") }; + new TestDELETEYouTube(token, "PLCwNa5MZdBSq9ty9AidV-b3lt3FGn1h6Q") }; TestTwitter[] twitter = { new TestGETListsTwitter(), new TestPOSTcreateTwitter(), - new TestPOSTdestroyTwitter("1082884549791514624"), new TestPOSTupdateTwitter("1082884549791514624", "updated") }; - cactus[1].start(); + new TestPOSTdestroyTwitter("1082884549791514624"), + new TestPOSTupdateTwitter("1082884549791514624", "updated") }; + youtube[3].start(); } } diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 14bb7b2..692a325 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -111,12 +111,15 @@ responses.add(account.getResponseCode()); String receive = account.doReceive(); for (RemoveJsonParam remove : removeParam) { - jsonRemove(receive, remove); - isRemove = true; + if (receive != null) { + jsonRemove(receive, remove); + isRemove = true; + } } receives.add(receive); ReadResource(results); - ReadResource(beforeResults); + if (accounts.iterator().hasNext()) + ReadResource(beforeResults); } judgeMethod(); } @@ -186,7 +189,7 @@ for (String param : resourceParam.getPathParams()) { account.addPathParam(param); } - for (int i = 0; i < keys.size(); i++) { + for (int i = 0; i < resourceParam.getKeys().size(); i++) { account.setRequestPropertie(resourceParam.getKeys().get(i), resourceParam.getValues().get(i)); } account.doAnything(); diff --git a/src/testcase/twitter/TestGETListsTwitter.java b/src/testcase/twitter/TestGETListsTwitter.java index 2826f4e..cad6cf4 100644 --- a/src/testcase/twitter/TestGETListsTwitter.java +++ b/src/testcase/twitter/TestGETListsTwitter.java @@ -7,6 +7,7 @@ super(); path.add("lists"); path.add("list.json"); + check.setProperty("Authorization", getvalue); check.setupRestTest(Method.GET, query, form, path); check.getResourceParam().setPathParams("lists"); check.getResourceParam().setPathParams("list.json"); diff --git a/src/testcase/twitter/TestPOSTdestroyTwitter.java b/src/testcase/twitter/TestPOSTdestroyTwitter.java index da0707c..574eeb8 100644 --- a/src/testcase/twitter/TestPOSTdestroyTwitter.java +++ b/src/testcase/twitter/TestPOSTdestroyTwitter.java @@ -4,7 +4,7 @@ import restfulchecker.RestChecker.Method; public class TestPOSTdestroyTwitter extends TestTwitter { - private String destroyvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547014985\",oauth_nonce=\"9dzWu6\",oauth_version=\"1.0\",oauth_signature=\"ogWla6J3RZfXeQUDsNVgP2eFaUo%3D\""; + private String destroyvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547105207\",oauth_nonce=\"ptwXcz\",oauth_version=\"1.0\",oauth_signature=\"t%2Bho4TlwMi23jJpTYtGQbjNrci4%3D\""; public TestPOSTdestroyTwitter(String ListID) { super(); diff --git a/src/testcase/twitter/TestPOSTupdateTwitter.java b/src/testcase/twitter/TestPOSTupdateTwitter.java index bc6c0c4..a24e7c4 100644 --- a/src/testcase/twitter/TestPOSTupdateTwitter.java +++ b/src/testcase/twitter/TestPOSTupdateTwitter.java @@ -4,7 +4,7 @@ import restfulchecker.RestChecker.Method; public class TestPOSTupdateTwitter extends TestTwitter { - private String updatevalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547015150\",oauth_nonce=\"MT2uux\",oauth_version=\"1.0\",oauth_signature=\"lloPry59IyifWpmwNqDK1uIxqgo%3D\""; + private String updatevalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547105119\",oauth_nonce=\"iw80A2\",oauth_version=\"1.0\",oauth_signature=\"TIWghvskihhXyxD1ZtEW7YoHz4Y%3D\""; public TestPOSTupdateTwitter(String ListID, String name) { super(); diff --git a/src/testcase/twitter/TestTwitter.java b/src/testcase/twitter/TestTwitter.java index 01df135..d6c90b5 100644 --- a/src/testcase/twitter/TestTwitter.java +++ b/src/testcase/twitter/TestTwitter.java @@ -3,7 +3,7 @@ import testcase.TestCase; abstract public class TestTwitter extends TestCase { - private String getvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547014274\",oauth_nonce=\"JnnOc6\",oauth_version=\"1.0\",oauth_signature=\"NRS2l9B%2BHrscrL16yxYjabecD8A%3D\""; + protected String getvalue = "OAuth oauth_consumer_key=\"xPk6o11catewYwxGcXvvvqo2I\",oauth_token=\"3279293718-bTcjYBEU1dqTdD2mm40J8IV7UrGcPHneHFLzomD\",oauth_signature_method=\"HMAC-SHA1\",oauth_timestamp=\"1547099004\",oauth_nonce=\"uWX2h3\",oauth_version=\"1.0\",oauth_signature=\"ualM5X7VCfnQPl9r13%2FXl9%2Bu0N0%3D\""; protected TestTwitter() { super("https://api.twitter.com/1.1"); diff --git a/src/testcase/youtube/TestPUTYouTube.java b/src/testcase/youtube/TestPUTYouTube.java index 371294e..a721f06 100644 --- a/src/testcase/youtube/TestPUTYouTube.java +++ b/src/testcase/youtube/TestPUTYouTube.java @@ -14,7 +14,7 @@ check.setProperty("Content-type", "application/json"); check.getResourceParam().setPathParams("playlists"); check.getResourceParam().setQueryParams(new RestParam("mine", "true")); - check.getResourceParam().setQueryParams(new RestParam("part", "id")); + check.getResourceParam().setQueryParams(new RestParam("part", "snippet")); check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>())); path.add("playlists"); query.add(new RestParam("part", "snippet")); diff --git a/src/testcase/youtube/put.json b/src/testcase/youtube/put.json index 5623e45..3983dad 100644 --- a/src/testcase/youtube/put.json +++ b/src/testcase/youtube/put.json @@ -1,5 +1,5 @@ { - "id": "PLCwNa5MZdBSrrBniob6HbbxFx85AcUJh8", + "id": "PLCwNa5MZdBSq9ty9AidV-b3lt3FGn1h6Q", "snippet": { "title": "eee" }