Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
This commit is contained in:
commit
5a2df2349e
|
@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.is;
|
||||||
public class RewritePatternRuleTest extends AbstractRuleTestCase
|
public class RewritePatternRuleTest extends AbstractRuleTestCase
|
||||||
{
|
{
|
||||||
// TODO: Parameterize
|
// TODO: Parameterize
|
||||||
private String[][] _tests =
|
private final String[][] _tests =
|
||||||
{
|
{
|
||||||
{"/foo/bar", "/", "/replace"},
|
{"/foo/bar", "/", "/replace"},
|
||||||
{"/foo/bar", "/*", "/replace/foo/bar"},
|
{"/foo/bar", "/*", "/replace/foo/bar"},
|
||||||
|
@ -93,8 +93,8 @@ public class RewritePatternRuleTest extends AbstractRuleTestCase
|
||||||
assertThat("result matches expected", result, is(replacement));
|
assertThat("result matches expected", result, is(replacement));
|
||||||
|
|
||||||
rewritePatternRule.applyURI(_request, null, result);
|
rewritePatternRule.applyURI(_request, null, result);
|
||||||
assertThat("queryString matches expected", _request.getQueryString(), is(queryString));
|
|
||||||
assertThat("request URI matches expected", _request.getRequestURI(), is(replacement));
|
assertThat("request URI matches expected", _request.getRequestURI(), is(replacement));
|
||||||
|
assertThat("queryString matches expected", _request.getQueryString(), is(queryString));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue