Repository: incubator-ignite Updated Branches: refs/heads/ignite-961 d2f41c93a -> d815e51b4
#ignite-961: add test for incorrect parameters. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d815e51b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d815e51b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d815e51b Branch: refs/heads/ignite-961 Commit: d815e51b42c17d8ccc4d7a4f024ed6843d163520 Parents: d2f41c9 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 20 10:32:29 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 20 10:32:29 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 55 +++++++++----------- 1 file changed, 25 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d815e51b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index 9aab6f5..9509500 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -199,6 +199,18 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS } /** + * @param err Error. + * @return Regex pattern for JSON. + */ + private String errorPattern(String err) { + return "\\{" + + "\\\"error\\\":\\\"" + err + "\\\"\\," + + "\\\"response\\\":null\\," + + "\\\"sessionToken\\\":\\\"\\\"," + + "\\\"successStatus\\\":" + 1 + "\\}"; + } + + /** * @param res Response. * @param success Success flag. * @return Regex pattern for JSON. @@ -486,7 +498,19 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS /** * @throws Exception If failed. */ - public void testContainesKey() throws Exception { + public void testIncorrectPutPost() throws Exception { + String val = "{\"key\":\"key0\"}"; + String ret = makePostRequest(F.asMap("cmd", "put"), val); + + assertNotNull(ret); + assertTrue(!ret.isEmpty()); + jsonEquals(ret, errorPattern("Failed to find mandatory parameter in request: val")); + } + + /** + * @throws Exception If failed. + */ + public void testContainsKey() throws Exception { grid(0).cache(null).put("key0", "val0"); String ret = content(F.asMap("cmd", "containskey", "key", "key0")); @@ -1593,13 +1617,6 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS } /** - * @param firstName First name. - */ - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - /** * @return First name. */ public String getFirstName() { @@ -1607,33 +1624,11 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS } /** - * @param lastName Last name. - */ - public void setLastName(String lastName) { - this.lastName = lastName; - } - - /** * @return Last name. */ public String getLastName() { return lastName; } - - /** - * @param id Id. - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * @param salary Salary. - */ - public void setSalary(double salary) { - this.salary = salary; - } - /** * @return Salary. */
