Added unit test for static files (#254) and fixed typo in unit test name

sapessi · sapessi · commit f25293917725 · 2019-06-26T13:40:40.000-07:00
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringAwsProxyTest.java
@@ -382,7 +382,7 @@ public void contextPath_generateLink_returnsCorrectPath() {
     }
 
     @Test
-    public void multipart_getFileName_rerutrnsCorrectFileName()
+    public void multipart_getFileName_returnsCorrectFileName()
             throws IOException {
         AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/attachment", "POST")
                                           .formFilePart("testFile", "myFile.txt", "hello".getBytes())
diff --git a/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringBootAppTest.java b/aws-serverless-java-container-spring/src/test/java/com/amazonaws/serverless/proxy/spring/SpringBootAppTest.java
@@ -1,6 +1,7 @@
 package com.amazonaws.serverless.proxy.spring;
 
 
+import com.amazonaws.serverless.proxy.internal.LambdaContainerHandler;
 import com.amazonaws.serverless.proxy.internal.testutils.AwsProxyRequestBuilder;
 import com.amazonaws.serverless.proxy.internal.testutils.MockLambdaContext;
 import com.amazonaws.serverless.proxy.model.AwsProxyRequest;
@@ -13,6 +14,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 
+import javax.ws.rs.core.HttpHeaders;
 import java.io.IOException;
 
 import static org.junit.Assert.*;
@@ -74,6 +76,20 @@ public void queryString_commaSeparatedList_expectUnmarshalAsList() {
         validateSingleValueModel(resp, "3");
     }
 
+    @Test
+    public void staticContent_getHtmlFile_returnsHtmlContent() {
+        LambdaContainerHandler.getContainerConfig().addValidFilePath("/Users/bulianis/workspace/aws-serverless-java-container/aws-serverless-java-container-spring");
+        AwsProxyRequest request = new AwsProxyRequestBuilder("/static.html", "GET")
+                .header(HttpHeaders.ACCEPT, "text/html")
+                .header(HttpHeaders.CONTENT_TYPE, "text/plain")
+                .build();
+        AwsProxyResponse output = handler.handleRequest(request, context);
+        System.out.println("Response: " + output.getBody());
+        assertEquals(200, output.getStatusCode());
+        assertTrue(output.getBody().contains("<h1>Static</h1>"));
+    }
+
+
     private void validateSingleValueModel(AwsProxyResponse output, String value) {
         try {
             SingleValueModel response = mapper.readValue(output.getBody(), SingleValueModel.class);
diff --git a/aws-serverless-java-container-spring/src/test/resources/static/static.html b/aws-serverless-java-container-spring/src/test/resources/static/static.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h1>Static</h1>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ public void contextPath_generateLink_returnsCorrectPath() {`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`@Test`
`385`		`- public void multipart_getFileName_rerutrnsCorrectFileName()`
	`385`	`+ public void multipart_getFileName_returnsCorrectFileName()`
`386`	`386`	`throws IOException {`
`387`	`387`	`AwsProxyRequest request = new AwsProxyRequestBuilder("/echo/attachment", "POST")`
`388`	`388`	`.formFilePart("testFile", "myFile.txt", "hello".getBytes())`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<html>
 +<body>
 +<h1>Static</h1>
 +</body>
 +</html>