http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bea31abd/juneau-server-test/src/test/java/org/apache/juneau/server/TestParamsTest.java ---------------------------------------------------------------------- diff --git a/juneau-server-test/src/test/java/org/apache/juneau/server/TestParamsTest.java b/juneau-server-test/src/test/java/org/apache/juneau/server/TestParamsTest.java deleted file mode 100755 index 309e85f..0000000 --- a/juneau-server-test/src/test/java/org/apache/juneau/server/TestParamsTest.java +++ /dev/null @@ -1,716 +0,0 @@ -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ -package org.apache.juneau.server; - -import static javax.servlet.http.HttpServletResponse.*; -import static org.apache.juneau.server.TestUtils.*; -import static org.junit.Assert.*; - -import java.util.*; - -import org.apache.http.*; -import org.apache.http.client.entity.*; -import org.apache.http.entity.*; -import org.apache.http.message.*; -import org.apache.juneau.*; -import org.apache.juneau.client.*; -import org.apache.juneau.json.*; -import org.junit.*; - -public class TestParamsTest { - - private static String URL = "/testParams"; - private static boolean debug = false; - - //==================================================================================================== - // Basic tests - //==================================================================================================== - @Test - public void testBasic() throws Exception { - RestClient client = new TestRestClient(JsonSerializer.DEFAULT, JsonParser.DEFAULT); - RestCall r; - - // @Override - // @RestMethod(name="GET",pattern="/") - // public void doGet(RestRequest req, RestResponse res) { - // res.setOutput("No args"); - // } - r = client.doGet(URL); - assertEquals("GET", r.getResponse(String.class)); - - r = client.doGet(URL + "/getx?noTrace=true"); - try { - r.connect(); - fail("Connection should have failed."); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/getx'"); - } - - // @RestMethod(name="GET",pattern="/get1") - // public void doGet1(RestRequest req, RestResponse res) { - // res.setOutput("/get1"); - // } - r = client.doGet(URL + "/get1"); - assertEquals("GET /get1", r.getResponse(String.class)); - - r = client.doGet(URL + "/get1a?noTrace=true"); - try { - r.connect(); - fail("Connection should have failed."); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/get1a'"); - } - - // @RestMethod(name="GET",pattern="/get1/{foo}") - // public void doGet(RestRequest req, RestResponse res, String foo) { - // res.setOutput("/get1/" + foo); - // } - r = client.doGet(URL + "/get1/foo"); - assertEquals("GET /get1a foo", r.getResponse(String.class)); - - // URL-encoded part should not get decoded before finding method to invoke. - // This should match /get1/{foo} and not /get1/{foo}/{bar} - // NOTE: When testing on Tomcat, must specify the following system property: - // -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true - String x = "x%2Fy+z"; // [x/y z] - r = client.doGet(URL + "/get1/"+x); - assertEquals("GET /get1a x/y z", r.getResponse(String.class)); - - r = client.doGet(URL + "/get1/"+x+"/"+x); - assertEquals("GET /get1b x/y z,x/y z", r.getResponse(String.class)); - - r = client.doGet(URL + "/get1/foo"); - assertEquals("GET /get1a foo", r.getResponse(String.class)); - - r = client.doGet(URL + "/get1/foo/bar/baz?noTrace=true"); - try { - r.connect(); - fail("Connection should have failed."); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_NOT_FOUND, "Method 'GET' not found on resource with matching pattern on path '/get1/foo/bar/baz'"); - } - - // @RestMethod(name="GET",pattern="/get3/{foo}/{bar}/*") - // public void doGet3(RestRequest req, RestResponse res, String foo, int bar) { - // res.setOutput("/get3/"+foo+"/"+bar+", remainder="+req.getRemainder()); - // } - r = client.doGet(URL + "/get3/foo/123"); - assertEquals("GET /get3/foo/123 remainder=null", r.getResponse(String.class)); - - r = client.doGet(URL + "/get3/foo/123/xxx"); - assertEquals("GET /get3/foo/123 remainder=xxx", r.getResponse(String.class)); - - // // Test method name with overlapping name, remainder allowed. - // @RestMethod(name="GET2") - // public void get2(RestRequest req, RestResponse res) { - // res.setOutput("GET2, remainder="+req.getRemainder()); - // } - r = client.doGet(URL + "?method=get2"); - assertEquals("GET2 remainder=null", r.getResponse(String.class)); - r = client.doGet(URL + "/foo/bar?method=get2"); - assertEquals("GET2 remainder=foo/bar", r.getResponse(String.class)); - r = client.doGet(URL + "/foo/bar?method=GET2"); - assertEquals("GET2 remainder=foo/bar", r.getResponse(String.class)); - - // // Default POST - // @Override - // public void doPost(RestRequest req, RestResponse res) { - // res.setOutput("POST, remainder="+req.getRemainder()); - // } - r = client.doPost(URL, ""); - assertEquals("POST remainder=null", r.getResponse(String.class)); - r = client.doPost(URL + "/foo", ""); - assertEquals("POST remainder=foo", r.getResponse(String.class)); - - // // Bunch of different argument types - // @RestMethod(name="POST",pattern="/person/{person}") - // public void doPost(RestRequest req, RestResponse res, Person p) { - // res.setOutput("POST, /person, name="+p.name+", age="+p.age+" remainder="+req.getRemainder()); - // } - r = client.doPost(URL + "/person/(name=John+Smith,birthDate=Jan+12~,+1952)", ""); - assertEquals("POST /person/{name=John Smith,birthDate.year=1952} remainder=null", r.getResponse(String.class)); - - // Fall through to top-level POST - r = client.doPost(URL + "/person/(name:'John+Smith',age:123)/foo", ""); - assertEquals("POST remainder=person/(name:'John Smith',age:123)/foo", r.getResponse(String.class)); - - // // Various primitive types - // @RestMethod(name="PUT",pattern="/primitives/{xInt}.{xShort},{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") - // public void doPut1(RestRequest req, RestResponse res, int xInt, short xShort, long xLong, char xChar, float xFloat, double xDouble, byte xByte, boolean xBoolean) { - // res.setOutput("PUT, /primitives/"+xInt+"."+xShort+","+xLong+"/"+xChar+"/"+xFloat+"/"+xDouble+"/"+xByte+"/"+xBoolean); - // } - r = client.doPut(URL + "/primitives/1/2/3/x/4/5/6/true", ""); - assertEquals("PUT /primitives/1/2/3/x/4.0/5.0/6/true", r.getResponse(String.class)); - - // // Various primitive objects - // @RestMethod(name="PUT",pattern="/primitiveObjects/{xInt}/{xShort}/{xLong}/{xChar}/{xFloat}/{xDouble}/{xByte}/{xBoolean}") - // public void doPut1(RestRequest req, RestResponse res, Integer xInt, Short xShort, Long xLong, Character xChar, Float xFloat, Double xDouble, Byte xByte, Boolean xBoolean) { - // res.setOutput("PUT /primitives/"+xInt+"/"+xShort+"/"+xLong+"/"+xChar+"/"+xFloat+"/"+xDouble+"/"+xByte+"/"+xBoolean); - // } - r = client.doPut(URL + "/primitiveObjects/1/2/3/x/4/5/6/true", ""); - assertEquals("PUT /primitiveObjects/1/2/3/x/4.0/5.0/6/true", r.getResponse(String.class)); - - // // Object with forString(String) method - // @RestMethod(name="PUT",pattern="/uuid/{uuid}") - // public void doPut1(RestRequest req, RestResponse res, UUID uuid) { - // res.setOutput("PUT /uuid/"+uuid); - // } - UUID uuid = UUID.randomUUID(); - r = client.doPut(URL + "/uuid/"+uuid, ""); - assertEquals("PUT /uuid/"+uuid, r.getResponse(String.class)); - - client.closeQuietly(); - } - - //==================================================================================================== - // @Param annotation - GET - //==================================================================================================== - @Test - public void testParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testParamGet"; - - r = client.doGet(url + "?p1=p1&p2=2").getResponseAsString(); - assertEquals("p1=[p1,p1,p1],p2=[2,2,2]", r); - - r = client.doGet(url + "?p1&p2").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p2").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1=foo&p2").getResponseAsString(); - assertEquals("p1=[foo,foo,foo],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1&p2=1").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[1,1,1]", r); - - String x = "a%2Fb%25c%3Dd+e"; // [x/y%z=a+b] - r = client.doGet(url + "?p1="+x+"&p2=1").getResponseAsString(); - assertEquals("p1=[a/b%c=d e,a/b%c=d e,a/b%c=d e],p2=[1,1,1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @Param(format=PLAIN) annotation - GET - //==================================================================================================== - @Test - public void testPlainParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testPlainParamGet"; - - r = client.doGet(url + "?p1=(p1)").getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); - - r = client.doGet(url + "?p1=$s(p1)").getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @Param annotation - POST - //==================================================================================================== - @Test - public void testParamPost() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testParamPost"; - - r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("p1=[p1,p1,p1],p2=[2,$n(2),2]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:0}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[0,$n(0),0]", r); - - r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p2:0}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,$n(0),0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'foo',p2:0}")).getResponseAsString(); - assertEquals("p1=[foo,foo,foo],p2=[0,$n(0),0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:1}")).getResponseAsString(); - assertEquals("p1=[null,\u0000,null],p2=[1,$n(1),1]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'a/b%c=d e,f/g%h=i j',p2:1}")).getResponseAsString(); - assertEquals("p1=[a/b%c=d e,f/g%h=i j,a/b%c=d e,f/g%h=i j,a/b%c=d e,f/g%h=i j],p2=[1,$n(1),1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @Param(format=PLAIN) annotation - POST - //==================================================================================================== - @Test - public void testPlainParamPost() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testPlainParamPost"; - - List<NameValuePair> nvps = new ArrayList<NameValuePair>(); - nvps.add(new BasicNameValuePair("p1", "(p1)")); - HttpEntity he = new UrlEncodedFormEntity(nvps); - - r = client.doPost(url, he).getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); - - nvps = new ArrayList<NameValuePair>(); - nvps.add(new BasicNameValuePair("p1", "$s(p1)")); - he = new UrlEncodedFormEntity(nvps); - - r = client.doFormPost(url, he).getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @QParam annotation - GET - //==================================================================================================== - @Test - public void testQParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testQParamGet"; - - r = client.doGet(url + "?p1=p1&p2=2").getResponseAsString(); - assertEquals("p1=[p1,p1,p1],p2=[2,2,2]", r); - - r = client.doGet(url + "?p1&p2").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p2").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1=foo&p2").getResponseAsString(); - assertEquals("p1=[foo,foo,foo],p2=[0,null,0]", r); - - r = client.doGet(url + "?p1&p2=1").getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[1,1,1]", r); - - String x = "a%2Fb%25c%3Dd+e"; // [x/y%z=a+b] - r = client.doGet(url + "?p1="+x+"&p2=1").getResponseAsString(); - assertEquals("p1=[a/b%c=d e,a/b%c=d e,a/b%c=d e],p2=[1,1,1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @QParam(format=PLAIN) annotation - GET - //==================================================================================================== - @Test - public void testPlainQParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testPlainQParamGet"; - - r = client.doGet(url + "?p1=(p1)").getResponseAsString(); - assertEquals("p1=[(p1),(p1),p1]", r); - - r = client.doGet(url + "?p1=$s(p1)").getResponseAsString(); - assertEquals("p1=[$s(p1),$s(p1),p1]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @QParam annotation - POST - //==================================================================================================== - @Test - public void testQParamPost() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testQParamPost"; - - r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:0}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p2:0}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'foo',p2:0}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:1}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'a/b%c=d e,f/g%h=i j',p2:1}")).getResponseAsString(); - assertEquals("p1=[null,null,null],p2=[0,null,0]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @HasParam annotation - GET - //==================================================================================================== - @Test - public void testHasParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testHasParamGet"; - - r = client.doGet(url + "?p1=p1&p2=2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url + "?p1&p2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doGet(url + "?p1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[false,false]", r); - - r = client.doGet(url + "?p2").getResponseAsString(); - assertEquals("p1=[false,false],p2=[true,true]", r); - - r = client.doGet(url + "?p1=foo&p2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url + "?p1&p2=1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - String x = "x%2Fy%25z%3Da+b"; // [x/y%z=a+b] - r = client.doGet(url + "?p1="+x+"&p2=1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @HasParam annotation - POST - //==================================================================================================== - @Test - public void testHasParamPost() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testHasParamPost"; - - r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:0}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p2:0}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[true,true]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'foo',p2:0}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:1}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'a/b%c=d e,f/g%h=i j',p2:1}")).getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @HasQParam annotation - GET - //==================================================================================================== - @Test - public void testHasQParamGet() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testHasQParamGet"; - - r = client.doGet(url + "?p1=p1&p2=2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url + "?p1&p2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doGet(url + "?p1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[false,false]", r); - - r = client.doGet(url + "?p2").getResponseAsString(); - assertEquals("p1=[false,false],p2=[true,true]", r); - - r = client.doGet(url + "?p1=foo&p2").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - r = client.doGet(url + "?p1&p2=1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - String x = "x%2Fy%25z%3Da+b"; // [x/y%z=a+b] - r = client.doGet(url + "?p1="+x+"&p2=1").getResponseAsString(); - assertEquals("p1=[true,true],p2=[true,true]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // @HasQParam annotation - POST - //==================================================================================================== - @Test - public void testHasQParamPost() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testHasQParamPost"; - - r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:0}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p2:0}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'foo',p2:0}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:null,p2:1}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - r = client.doFormPost(url, new ObjectMap("{p1:'a/b%c=d e,f/g%h=i j',p2:1}")).getResponseAsString(); - assertEquals("p1=[false,false],p2=[false,false]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Form POSTS with @Content parameter - //==================================================================================================== - @Test - public void testFormPostAsContent() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testFormPostAsContent"; - - r = client.doFormPost(url, new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("bean=[{p1:'p1',p2:2}],qp1=[null],qp2=[0],hqp1=[false],hqp2=[false]", r); - - r = client.doFormPost(url, new ObjectMap("{}")).getResponseAsString(); - assertEquals("bean=[{p2:0}],qp1=[null],qp2=[0],hqp1=[false],hqp2=[false]", r); - - r = client.doFormPost(url+"?p1=p3&p2=4", new ObjectMap("{p1:'p1',p2:2}")).getResponseAsString(); - assertEquals("bean=[{p1:'p1',p2:2}],qp1=[p3],qp2=[4],hqp1=[true],hqp2=[true]", r); - - r = client.doFormPost(url+"?p1=p3&p2=4", new ObjectMap("{}")).getResponseAsString(); - assertEquals("bean=[{p2:0}],qp1=[p3],qp2=[4],hqp1=[true],hqp2=[true]", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Test @Param and @QParam annotations when using multi-part parameters (e.g. &key=val1,&key=val2). - //==================================================================================================== - @Test - public void testMultiPartParams() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testMultiPartParams"; - - String in = "" - + "?p1=a&p1=b" - + "&p2=1&p2=2" - + "&p3=a&p3=b" - + "&p4=1&p4=2" - + "&p5=a&p5=b" - + "&p6=1&p6=2" - + "&p7=a&p7=b" - + "&p8=1&p8=2" - + "&p9=(a=1,b=2,c=false)&p9=(a=3,b=4,c=true)" - + "&p10=(a=1,b=2,c=false)&p10=(a=3,b=4,c=true)" - + "&p11=(a=1,b=2,c=false)&p11=(a=3,b=4,c=true)" - + "&p12=(a=1,b=2,c=false)&p12=(a=3,b=4,c=true)"; - r = client.doGet(url + in).getResponseAsString(); - String e = "{" - + "p1:['a','b']," - + "p2:[1,2]," - + "p3:['a','b']," - + "p4:[1,2]," - + "p5:['a','b']," - + "p6:[1,2]," - + "p7:['a','b']," - + "p8:[1,2]," - + "p9:[{a:'1',b:2,c:false},{a:'3',b:4,c:true}]," - + "p10:[{a:'1',b:2,c:false},{a:'3',b:4,c:true}]," - + "p11:[{a:'1',b:2,c:false},{a:'3',b:4,c:true}]," - + "p12:[{a:'1',b:2,c:false},{a:'3',b:4,c:true}]" - +"}"; - assertEquals(e, r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Same as testMultiPartParams(), except make sure single values are still interpreted as collections. - //==================================================================================================== - @Test - public void testMultiPartParamsSingleValues() throws Exception { - RestClient client = new TestRestClient().setHeader("Accept", "text/plain"); - String r; - String url = URL + "/testMultiPartParams"; - - String in = "" - + "?p1=a" - + "&p2=1" - + "&p3=a" - + "&p4=1" - + "&p5=a" - + "&p6=1" - + "&p7=a" - + "&p8=1" - + "&p9=(a=1,b=2,c=false)" - + "&p10=(a=1,b=2,c=false)" - + "&p11=(a=1,b=2,c=false)" - + "&p12=(a=1,b=2,c=false)"; - r = client.doGet(url + in).getResponseAsString(); - String e = "{" - + "p1:['a']," - + "p2:[1]," - + "p3:['a']," - + "p4:[1]," - + "p5:['a']," - + "p6:[1]," - + "p7:['a']," - + "p8:[1]," - + "p9:[{a:'1',b:2,c:false}]," - + "p10:[{a:'1',b:2,c:false}]," - + "p11:[{a:'1',b:2,c:false}]," - + "p12:[{a:'1',b:2,c:false}]" - +"}"; - assertEquals(e, r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Test multi-part parameter keys on bean properties of type array/Collection (i.e. &key=val1,&key=val2) - // using URLENC_expandedParams property. - // A simple round-trip test to verify that both serializing and parsing works. - //==================================================================================================== - @Test - public void testFormPostsWithMultiParamsUsingProperty() throws Exception { - RestClient client = new TestRestClient() - .setHeader("Content-Type", "application/x-www-form-urlencoded") - .setHeader("Accept", "application/x-www-form-urlencoded"); - String r; - String url = URL + "/testFormPostsWithMultiParamsUsingProperty"; - - String in = "" - + "f1=a&f1=b" - + "&f2=c&f2=d" - + "&f3=1&f3=2" - + "&f4=3&f4=4" - + "&f5=(e,f)&f5=(g,h)" - + "&f6=(i,j)&f6=(k,l)" - + "&f7=(a=a,b=1,c=true)&f7=(a=b,b=2,c=false)" - + "&f8=(a=a,b=1,c=true)&f8=(a=b,b=2,c=false)" - + "&f9=((a=a,b=1,c=true))&f9=((a=b,b=2,c=false))" - + "&f10=((a=a,b=1,c=true))&f10=((a=b,b=2,c=false))" - + "&f11=a&f11=b" - + "&f12=c&f12=d" - + "&f13=1&f13=2" - + "&f14=3&f14=4" - + "&f15=(e,f)&f15=(g,h)" - + "&f16=(i,j)&f16=(k,l)" - + "&f17=(a=a,b=1,c=true)&f17=(a=b,b=2,c=false)" - + "&f18=(a=a,b=1,c=true)&f18=(a=b,b=2,c=false)" - + "&f19=((a=a,b=1,c=true))&f19=((a=b,b=2,c=false))" - + "&f20=((a=a,b=1,c=true))&f20=((a=b,b=2,c=false))"; - r = client.doPost(url, new StringEntity(in)).getResponseAsString(); - assertEquals(in, r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Test multi-part parameter keys on bean properties of type array/Collection (i.e. &key=val1,&key=val2) - // using @UrlEncoding(expandedParams=true) annotation. - // A simple round-trip test to verify that both serializing and parsing works. - //==================================================================================================== - @Test - public void testFormPostsWithMultiParamsUsingAnnotation() throws Exception { - RestClient client = new TestRestClient() - .setHeader("Content-Type", "application/x-www-form-urlencoded") - .setHeader("Accept", "application/x-www-form-urlencoded"); - String r; - String url = URL + "/testFormPostsWithMultiParamsUsingAnnotation"; - - String in = "" - + "f1=a&f1=b" - + "&f2=c&f2=d" - + "&f3=1&f3=2" - + "&f4=3&f4=4" - + "&f5=(e,f)&f5=(g,h)" - + "&f6=(i,j)&f6=(k,l)" - + "&f7=(a=a,b=1,c=true)&f7=(a=b,b=2,c=false)" - + "&f8=(a=a,b=1,c=true)&f8=(a=b,b=2,c=false)" - + "&f9=((a=a,b=1,c=true))&f9=((a=b,b=2,c=false))" - + "&f10=((a=a,b=1,c=true))&f10=((a=b,b=2,c=false))" - + "&f11=a&f11=b" - + "&f12=c&f12=d" - + "&f13=1&f13=2" - + "&f14=3&f14=4" - + "&f15=(e,f)&f15=(g,h)" - + "&f16=(i,j)&f16=(k,l)" - + "&f17=(a=a,b=1,c=true)&f17=(a=b,b=2,c=false)" - + "&f18=(a=a,b=1,c=true)&f18=(a=b,b=2,c=false)" - + "&f19=((a=a,b=1,c=true))&f19=((a=b,b=2,c=false))" - + "&f20=((a=a,b=1,c=true))&f20=((a=b,b=2,c=false))"; - r = client.doPost(url, new StringEntity(in)).getResponseAsString(); - assertEquals(in, r); - - client.closeQuietly(); - } -}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bea31abd/juneau-server-test/src/test/java/org/apache/juneau/server/TestParsersTest.java ---------------------------------------------------------------------- diff --git a/juneau-server-test/src/test/java/org/apache/juneau/server/TestParsersTest.java b/juneau-server-test/src/test/java/org/apache/juneau/server/TestParsersTest.java deleted file mode 100755 index a3e4f76..0000000 --- a/juneau-server-test/src/test/java/org/apache/juneau/server/TestParsersTest.java +++ /dev/null @@ -1,162 +0,0 @@ -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ -package org.apache.juneau.server; - -import static javax.servlet.http.HttpServletResponse.*; -import static org.apache.juneau.server.TestUtils.*; -import static org.junit.Assert.*; - -import org.apache.juneau.client.*; -import org.apache.juneau.plaintext.*; -import org.junit.*; - -public class TestParsersTest { - - private static String URL = "/testParsers"; - private static boolean debug = false; - - //==================================================================================================== - // Parser defined on class. - //==================================================================================================== - @Test - public void testParserOnClass() throws Exception { - RestClient client = new TestRestClient(PlainTextSerializer.class, PlainTextParser.class); - String url = URL + "/testParserOnClass"; - - client.setContentType("text/a"); - String r = client.doPut(url, "test1").getResponseAsString(); - assertEquals("text/a - test1", r); - - try { - client.setContentType("text/b"); - client.doPut(url + "?noTrace=true", "test1").getResponseAsString(); - fail("Exception expected"); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_UNSUPPORTED_MEDIA_TYPE, - "Unsupported media-type in request header 'Content-Type': 'text/b'", - "Supported media-types: [text/a" - ); - } - - client.setContentType("text/json").setAccept("text/json"); - r = client.doPut(url, "'test1'").getResponseAsString(); - assertEquals("\"test1\"", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Parser defined on method. - //==================================================================================================== - @Test - public void testParserOnMethod() throws Exception { - RestClient client = new TestRestClient(PlainTextSerializer.class, PlainTextParser.class); - String url = URL + "/testParserOnMethod"; - - client.setContentType("text/b"); - String r = client.doPut(url, "test2").getResponseAsString(); - assertEquals("text/b - test2", r); - - try { - client.setContentType("text/a"); - client.doPut(url + "?noTrace=true", "test2").getResponseAsString(); - fail("Exception expected"); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_UNSUPPORTED_MEDIA_TYPE, - "Unsupported media-type in request header 'Content-Type': 'text/a'", - "Supported media-types: [text/b]" - ); - } - - try { - client.setContentType("text/json"); - r = client.doPut(url + "?noTrace=true", "'test2'").getResponseAsString(); - fail("Exception expected"); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_UNSUPPORTED_MEDIA_TYPE, - "Unsupported media-type in request header 'Content-Type': 'text/json'", - "Supported media-types: [text/b]" - ); - } - - client.closeQuietly(); - } - - //==================================================================================================== - // Parser overridden on method. - //==================================================================================================== - @Test - public void testParserOverriddenOnMethod() throws Exception { - RestClient client = new TestRestClient(PlainTextSerializer.class, PlainTextParser.class); - String url = URL + "/testParserOverriddenOnMethod"; - - client.setContentType("text/a"); - String r = client.doPut(url, "test3").getResponseAsString(); - assertEquals("text/a - test3", r); - - client.setContentType("text/b"); - r = client.doPut(url, "test3").getResponseAsString(); - assertEquals("text/b - test3", r); - - client.setContentType("text/json"); - r = client.doPut(url, "'test3'").getResponseAsString(); - assertEquals("test3", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Parser with different Accept than Content-Type. - //==================================================================================================== - @Test - public void testParserWithDifferentMediaTypes() throws Exception { - RestClient client = new TestRestClient(PlainTextSerializer.class, PlainTextParser.class); - String url = URL + "/testParserWithDifferentMediaTypes"; - - client.setContentType("text/a"); - String r = client.doPut(url, "test4").getResponseAsString(); - assertEquals("text/d - test4", r); - - client.setContentType("text/d"); - r = client.doPut(url, "test4").getResponseAsString(); - assertEquals("text/d - test4", r); - - client.setContentType("text/json"); - r = client.doPut(url, "'test4'").getResponseAsString(); - assertEquals("test4", r); - - client.closeQuietly(); - } - - //==================================================================================================== - // Check for valid error response. - //==================================================================================================== - @Test - public void testValidErrorResponse() throws Exception { - RestClient client = new TestRestClient(PlainTextSerializer.class, PlainTextParser.class); - String url = URL + "/testValidErrorResponse"; - - try { - client.setContentType("text/bad"); - client.doPut(url + "?noTrace=true", "test1").getResponseAsString(); - fail("Exception expected"); - } catch (RestCallException e) { - checkErrorResponse(debug, e, SC_UNSUPPORTED_MEDIA_TYPE, - "Unsupported media-type in request header 'Content-Type': 'text/bad'", - "Supported media-types: [text/a" - ); - } - - client.closeQuietly(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bea31abd/juneau-server-test/src/test/java/org/apache/juneau/server/TestPathTest.java ---------------------------------------------------------------------- diff --git a/juneau-server-test/src/test/java/org/apache/juneau/server/TestPathTest.java b/juneau-server-test/src/test/java/org/apache/juneau/server/TestPathTest.java deleted file mode 100755 index 5ffd5b2..0000000 --- a/juneau-server-test/src/test/java/org/apache/juneau/server/TestPathTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - ***************************************************************************************************************************/ -package org.apache.juneau.server; - -import static org.junit.Assert.*; - -import org.apache.juneau.client.*; -import org.apache.juneau.json.*; -import org.junit.*; - -public class TestPathTest { - - private static String URL = "/testPath"; - - //==================================================================================================== - // Basic tests - //==================================================================================================== - @Test - public void testBasic() throws Exception { - RestClient client = new TestRestClient(JsonSerializer.DEFAULT, JsonParser.DEFAULT); - String r = null; - - r = client.doGet(URL).getResponse(String.class); - assertEquals("/testPath", r); - - r = client.doGet(URL + "/testPath2").getResponse(String.class); - assertEquals("/testPath/testPath2", r); - - r = client.doGet(URL + "/testPath2/testPath3").getResponse(String.class); - assertEquals("/testPath/testPath2/testPath3", r); - - client.closeQuietly(); - } -}
