Skip to content

Commit 31475a7

Browse files
committed
Jersey test fix and first stub of list test
1 parent 83ecea5 commit 31475a7

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/EchoJerseyResource.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
import javax.ws.rs.ext.Providers;
3232

3333
import java.util.Enumeration;
34+
import java.util.List;
3435
import java.util.Random;
36+
import java.util.Set;
37+
3538

3639
/**
3740
* Jersey application class for aws-serverless-java-container unit proxy
@@ -52,6 +55,15 @@ public SingleValueModel echoDecodedParam(@QueryParam("param") String param) {
5255
return model;
5356
}
5457

58+
@Path("/list-query-string") @GET
59+
@Produces(MediaType.APPLICATION_JSON)
60+
public SingleValueModel echoQueryStringLength(@QueryParam("list") List<String> param) {
61+
System.out.println("param: " + param + " = " + param.size());
62+
SingleValueModel model = new SingleValueModel();
63+
model.setValue(param.size() + "");
64+
return model;
65+
}
66+
5567
@Path("/encoded-param") @GET
5668
@Produces(MediaType.APPLICATION_JSON)
5769
public SingleValueModel echoEncodedParam(@QueryParam("param") @Encoded String param) {

aws-serverless-java-container-jersey/src/test/java/com/amazonaws/serverless/proxy/jersey/JerseyParamEncodingTest.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,20 @@ public void queryParam_encoding_expectFullyEncodedUrl() {
135135
String paramValue = "/+=";
136136
AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/encoded-param", "GET").queryString("param", paramValue).build();
137137
AwsProxyResponse resp = handler.proxy(request, lambdaContext);
138+
assertNotNull(resp);
139+
assertEquals(resp.getStatusCode(), 200);
140+
validateSingleValueModel(resp, "%2F%2B%3D");
138141
System.out.println("body:" + resp.getBody());
139-
/*try {
140-
String encodedParam = URLEncoder.encode(paramValue, "UTF-8");
141-
validateSingleValueModel(resp, encodedParam);
142-
} catch (UnsupportedEncodingException e) {
143-
e.printStackTrace();
144-
fail();
145-
}*/
142+
}
143+
144+
@Test
145+
@Ignore
146+
public void queryParam_listOfString_expectCorrectLength() {
147+
AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/list-query-string", "GET").queryString("list", "v1,v2,v3").build();
148+
AwsProxyResponse resp = handler.proxy(request, lambdaContext);
149+
assertNotNull(resp);
150+
assertEquals(resp.getStatusCode(), 200);
151+
validateSingleValueModel(resp, "3");
146152
}
147153

148154
private void validateSingleValueModel(AwsProxyResponse output, String value) {

0 commit comments

Comments
 (0)