From edb075b611c8f0699956b4646bc10d6c0c8b2235 Mon Sep 17 00:00:00 2001 From: Adriano Ferreira Date: Thu, 6 Jan 2011 18:53:24 -0200 Subject: [PATCH] Minor changes to RestUtils.decodeQueryString() tests Testing RestUtils.decodeQueryString("something", "something".indexOf('?') + 1, params); is not really checking decoding of an empty query. Instead, it is testing decoding of "something" as a query (because "something.index('?')+1" evaluates to 0). The parameter map is left empty because "malformed" pairs like "something" are currently skipped. Instead, this change modify this test to check the edge cases: + fromIndex >= queryString.length() + fromIndex < 0 --- .../java/org/elasticsearch/rest/util/RestUtilsTests.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java b/modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java index d02bc24c3d5..7acf3006d3a 100644 --- a/modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java +++ b/modules/elasticsearch/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java @@ -52,7 +52,12 @@ public class RestUtilsTests { params.clear(); uri = "something"; - RestUtils.decodeQueryString(uri, uri.indexOf('?') + 1, params); + RestUtils.decodeQueryString(uri, uri.length(), params); + assertThat(params.size(), equalTo(0)); + + params.clear(); + uri = "something"; + RestUtils.decodeQueryString(uri, -1, params); assertThat(params.size(), equalTo(0)); } }