diff --git a/src/restfulchecker/RestChecker.java b/src/restfulchecker/RestChecker.java index 63179bd..3645b47 100644 --- a/src/restfulchecker/RestChecker.java +++ b/src/restfulchecker/RestChecker.java @@ -24,7 +24,7 @@ private String method; private ArrayList keys = new ArrayList<>(); private ArrayList values = new ArrayList<>(); - private NecessaryParam getnesParam = new NecessaryParam(); + private NecessaryParam resourceParam = new NecessaryParam(); private ArrayList removeParam = new ArrayList<>(); private String readJson; private boolean isRemove = false; @@ -61,8 +61,8 @@ return judgeResult; } - public NecessaryParam getGetnesParam() { - return getnesParam; + public NecessaryParam getResourceParam() { + return resourceParam; } public String getReadJson() { @@ -169,12 +169,12 @@ private void ReadResource(ArrayList results) { RestAccount account = new RestAccount(accounts.get(0).getUrl()); account.doGet(); - if (getnesParam.getQueryParams() != null) - for (RestParam param : getnesParam.getQueryParams()) { + if (resourceParam.getQueryParams() != null) + for (RestParam param : resourceParam.getQueryParams()) { account.addQueryParam(param.key, param.value); } - if (getnesParam.getPathParams() != null) - for (String param : getnesParam.getPathParams()) { + if (resourceParam.getPathParams() != null) + for (String param : resourceParam.getPathParams()) { account.addPathParam(param); } account.doAnything(); diff --git a/src/testcase/TestDELETEYouTube.java b/src/testcase/TestDELETEYouTube.java index 1d58614..795c40a 100644 --- a/src/testcase/TestDELETEYouTube.java +++ b/src/testcase/TestDELETEYouTube.java @@ -10,9 +10,9 @@ public TestDELETEYouTube(String token, String id) { super(token); - check.getGetnesParam().setPathParams("playlists"); - check.getGetnesParam().setQueryParams(new RestParam("mine", "true")); - check.getGetnesParam().setQueryParams(new RestParam("part", "id")); + check.getResourceParam().setPathParams("playlists"); + check.getResourceParam().setQueryParams(new RestParam("mine", "true")); + check.getResourceParam().setQueryParams(new RestParam("part", "id")); check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>())); path.add("playlists"); query.add(new RestParam("id", id)); diff --git a/src/testcase/TestGETYouTube.java b/src/testcase/TestGETYouTube.java index fe02393..9448fb9 100644 --- a/src/testcase/TestGETYouTube.java +++ b/src/testcase/TestGETYouTube.java @@ -12,9 +12,9 @@ query.add(new RestParam("mine", "true")); query.add(new RestParam("part", "id")); path.add("playlists"); - check.getGetnesParam().setQueryParams(new RestParam("mine", "true")); - check.getGetnesParam().setQueryParams(new RestParam("part", "id")); - check.getGetnesParam().setPathParams("playlists"); + check.getResourceParam().setQueryParams(new RestParam("mine", "true")); + check.getResourceParam().setQueryParams(new RestParam("part", "id")); + check.getResourceParam().setPathParams("playlists"); check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>())); check.setupRestTest(Method.GET, query, form, path); } diff --git a/src/testcase/TestPOSTYouTube.java b/src/testcase/TestPOSTYouTube.java index 70ea4f0..2cf3dc3 100644 --- a/src/testcase/TestPOSTYouTube.java +++ b/src/testcase/TestPOSTYouTube.java @@ -12,9 +12,9 @@ super(token); check.jsonAcquisition("src/testcase/post.json"); check.setProperty("Content-type", "application/json"); - check.getGetnesParam().setPathParams("playlists"); - check.getGetnesParam().setQueryParams(new RestParam("mine", "true")); - check.getGetnesParam().setQueryParams(new RestParam("part", "id")); + check.getResourceParam().setPathParams("playlists"); + check.getResourceParam().setQueryParams(new RestParam("mine", "true")); + check.getResourceParam().setQueryParams(new RestParam("part", "id")); check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>())); path.add("playlists"); query.add(new RestParam("part", "snippet")); diff --git a/src/testcase/TestPUTYouTube.java b/src/testcase/TestPUTYouTube.java index c0a4189..f214d3c 100644 --- a/src/testcase/TestPUTYouTube.java +++ b/src/testcase/TestPUTYouTube.java @@ -12,9 +12,9 @@ super(token); check.jsonAcquisition("src/testcase/put.json"); check.setProperty("Content-type", "application/json"); - check.getGetnesParam().setPathParams("playlists"); - check.getGetnesParam().setQueryParams(new RestParam("mine", "true")); - check.getGetnesParam().setQueryParams(new RestParam("part", "id")); + check.getResourceParam().setPathParams("playlists"); + check.getResourceParam().setQueryParams(new RestParam("mine", "true")); + check.getResourceParam().setQueryParams(new RestParam("part", "id")); check.setRemoveParam(new RemoveJsonParam("etag", new ArrayList<>())); path.add("playlists"); query.add(new RestParam("part", "snippet")); diff --git a/src/testcase/TestYouTube.java b/src/testcase/TestYouTube.java index 34cece4..a13fe20 100644 --- a/src/testcase/TestYouTube.java +++ b/src/testcase/TestYouTube.java @@ -14,7 +14,7 @@ protected TestYouTube(String token) { check.setAccount("https://www.googleapis.com/youtube/v3"); query.add(new RestParam("access_token", token)); - check.getGetnesParam().setQueryParams(new RestParam("access_token", token)); + check.getResourceParam().setQueryParams(new RestParam("access_token", token)); } public void start() {