Skip to content

First tests for arun-gupta/javaee7-samples#84 #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arun-gupta merged 2 commits into from
Nov 23, 2013
Merged

First tests for arun-gupta/javaee7-samples#84 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1c3551
Resource packaging arun-gupta/javaee7-samples#84 test
kubamarchwicki Nov 16, 2013
420e958
File upload test for arun-gupta/javaee7-samples#84
kubamarchwicki Nov 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions servlet/file-upload/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
<artifactId>file-upload</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>

</project>
4 changes: 2 additions & 2 deletions servlet/file-upload/src/main/java/org/javaee7/servlet/file/upload/TestServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
*/
package org.javaee7.servlet.file.upload;

import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import java.io.IOException;
import java.io.PrintWriter;

/**
* @author Arun Gupta
Expand Down
59 changes: 0 additions & 59 deletions servlet/file-upload/src/main/webapp/index.jsp
View file
Open in desktop

This file was deleted.

62 changes: 62 additions & 0 deletions servlet/file-upload/src/test/java/org/javaee7/servlet/file/upload/FileUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package org.javaee7.servlet.file.upload;

import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;

import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;

/**
* @author Jakub Marchwicki
*/
@RunWith(Arquillian.class)
public class FileUploadTest {

@ArquillianResource
private URL base;

@Deployment(testable = false)
public static WebArchive deploy() throws URISyntaxException {
return ShrinkWrap.create(WebArchive.class)
.addClasses(TestServlet.class);
}

@Test
public void uploadFile() throws IOException, URISyntaxException {

HttpClient client = new DefaultHttpClient();
HttpPost postRequest = new HttpPost(new URL(base, "TestServlet").toURI());

MultipartEntity multiPartEntity = new MultipartEntity();
FileBody fileBody = new FileBody(new File("pom.xml"));
multiPartEntity.addPart("attachment", fileBody);

postRequest.setEntity(multiPartEntity);
HttpResponse response = client.execute(postRequest);

String servletOutput = EntityUtils.toString(response.getEntity());

assertThat(response.getStatusLine().getStatusCode(), is(equalTo(200)));
assertThat(servletOutput, containsString("Received 1 parts"));
assertThat(servletOutput, containsString("writing pom.xml part"));
assertThat(servletOutput, containsString("uploaded to: /tmp/pom.xml"));
}

}
15 changes: 15 additions & 0 deletions servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,19 @@
<module>web-fragment</module>
</modules>

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
129 changes: 0 additions & 129 deletions .../resource-packaging/src/main/java/org/javaee7/servlet/resource/packaging/TestServlet.java
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions servlet/resource-packaging/src/main/webapp/index.jsp
View file
Open in desktop

This file was deleted.

Loading