From d1d71b62ffe439c5274705548b57b21f5fadf181 Mon Sep 17 00:00:00 2001
From: egmp777 <egmp777@gmail.com>
Date: Thu, 22 May 2014 18:59:09 -0500
Subject: [PATCH] HttpClient Multi Part Form Upload Tests

---
 httpclient/image.jpg                          | Bin 0 -> 4329 bytes
 .../httpclient/HttpClientMultipartTest.java   | 163 +++++++++++-------
 httpclient/temp.txt                           |   1 +
 httpclient/zipFile.zip                        | Bin 0 -> 282 bytes
 4 files changed, 101 insertions(+), 63 deletions(-)
 create mode 100644 httpclient/image.jpg
 create mode 100644 httpclient/temp.txt
 create mode 100644 httpclient/zipFile.zip

diff --git a/httpclient/image.jpg b/httpclient/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..715665678595c9c72fd7eefac1808ca879bd0acf
GIT binary patch
literal 4329
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
R4KZm=H;s}lNLymC@*g~VdFTKD

literal 0
HcmV?d00001

diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientMultipartTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientMultipartTest.java
index ef11c76187..106051d729 100644
--- a/httpclient/src/test/java/org/baeldung/httpclient/HttpClientMultipartTest.java
+++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpClientMultipartTest.java
@@ -1,5 +1,8 @@
 package org.baeldung.httpclient;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,62 +12,89 @@ import java.io.InputStreamReader;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.fluent.Request;
-import org.apache.http.client.fluent.Response;
+import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 public class HttpClientMultipartTest {
 
-    private static final String SERVER = "http://cgi-lib.berkeley.edu/ex/fup.cgi";
-    private static final String SERVER2 = "http://posttestserver.com/post.php";
-    private static final String SERVER3 = "http://postcatcher.in/catchers/53765b0349c306020000077b";
-    private static final String SERVER4 = "http://echo.200please.com";
-    private static final String SERVER5 = "http://greensuisse.zzl.org/product/dump/dump.php";
-    private static final String SERVER6 = "http://www.newburghschools.org/testfolder/dump.php";
-    private static HttpClient client;
-    private static HttpPost post;
-    private static String textFileName;
-    private static String imageFileName;
-    private static String zipFileName;
+    private static final String SERVER = "http://echo.200please.com";
+    private CloseableHttpClient client;
+    private HttpPost post;
+    private String textFileName;
+    private String imageFileName;
+    private String zipFileName;
+    private BufferedReader rd;
+    private CloseableHttpResponse response;
 
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
+    @Before
+    public final void Before() {
         client = HttpClientBuilder.create().build();
-        post = new HttpPost(SERVER2 /*"fup.cgi"*/);
-        textFileName = ".\temp.txt";
+        post = new HttpPost(SERVER);
+        textFileName = "temp.txt";
         imageFileName = "image.jpg";
         zipFileName = "zipFile.zip";
     }
 
+    @After
+    public final void after() throws IllegalStateException, IOException {
+        post.completed();
+        try {
+            client.close();
+        } catch (final IOException e1) {
+
+            e1.printStackTrace();
+        }
+        try {
+            rd.close();
+        } catch (final IOException e) {
+
+            e.printStackTrace();
+        }
+        try {
+            final HttpEntity entity = response.getEntity();
+            if (entity != null) {
+                final InputStream instream = entity.getContent();
+                instream.close();
+            }
+        } finally {
+            response.close();
+        }
+    }
+
     @Test
-    @Ignore
     public final void whenUploadWithAddPart_thenNoExceptions() throws IOException {
+
         final File file = new File(textFileName);
         final FileBody fileBody = new FileBody(file, ContentType.DEFAULT_BINARY);
         final StringBody stringBody1 = new StringBody("This is message 1", ContentType.MULTIPART_FORM_DATA);
         final StringBody stringBody2 = new StringBody("This is message 2", ContentType.MULTIPART_FORM_DATA);
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-        builder.addPart("submitted", fileBody);
-        builder.addPart("note", stringBody1);
-        builder.addPart("note2", stringBody2);
+        builder.addPart("upfile", fileBody);
+        builder.addPart("text1", stringBody1);
+        builder.addPart("text2", stringBody2);
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
-        final HttpResponse response = client.execute(post);
-        System.out.println(getContent(response));
+        response = client.execute(post);
+        final int statusCode = response.getStatusLine().getStatusCode();
+        assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+
+        System.out.println(getContent());
+
         final Header[] headers = response.getAllHeaders();
+        assertThat(headers.length, equalTo(5));
 
         for (final Header thisHeader : headers) {
             System.out.println(thisHeader.getName() + ":" + thisHeader.getValue());
@@ -72,92 +102,99 @@ public class HttpClientMultipartTest {
     }
 
     @Test
-    @Ignore
     public final void whenUploadWithAddBinaryBodyandAddTextBody_ThenNoExeption() throws ClientProtocolException, IOException {
+
         final File file = new File(textFileName);
         final String message = "This is a multipart post";
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-        builder.addBinaryBody("submitted", file, ContentType.DEFAULT_BINARY, textFileName);
-        builder.addTextBody("note", message, ContentType.TEXT_PLAIN);
+        builder.addBinaryBody("upfile", file, ContentType.DEFAULT_BINARY, textFileName);
+        builder.addTextBody("text", message, ContentType.DEFAULT_BINARY);
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
-        final HttpResponse response = client.execute(post);
-        System.out.println(getContent(response));
+        response = client.execute(post);
+        final int statusCode = response.getStatusLine().getStatusCode();
+        assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+
+        System.out.println(getContent());
+
         final Header[] headers = response.getAllHeaders();
+        assertThat(headers.length, equalTo(5));
 
         for (final Header thisHeader : headers) {
             System.out.println(thisHeader.getName() + ":" + thisHeader.getValue());
         }
+
     }
 
     @Test
-    @Ignore
-    public final void whenUploadWithAddBinaryBody_NoType_andAddTextBody_ThenNoExeption() throws ClientProtocolException, IOException {
+    public final void whenUploadWithAddBinaryBody_withInputStreamAndFile_andTextBody_ThenNoException() throws ClientProtocolException, IOException {
+
+        final InputStream inputStream = new FileInputStream(zipFileName);
         final File file = new File(imageFileName);
         final String message = "This is a multipart post";
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-        builder.addBinaryBody("submitted", file, ContentType.DEFAULT_BINARY, textFileName);
-        // builder.addBinaryBody("upfile", fileBin);
-        builder.addTextBody("note", message, ContentType.TEXT_PLAIN);
+        builder.addBinaryBody("upfile", file, ContentType.DEFAULT_BINARY, imageFileName);
+        builder.addBinaryBody("upstream", inputStream, ContentType.create("application/zip"), zipFileName);
+        builder.addTextBody("text", message, ContentType.TEXT_PLAIN);
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
-        final HttpResponse response = client.execute(post);
-        System.out.println(getContent(response));
+        response = client.execute(post);
+        final int statusCode = response.getStatusLine().getStatusCode();
+        assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+
+        System.out.println(getContent());
+
         final Header[] headers = response.getAllHeaders();
+        assertThat(headers.length, equalTo(5));
 
         for (final Header thisHeader : headers) {
             System.out.println(thisHeader.getName() + ":" + thisHeader.getValue());
         }
+
+        inputStream.close();
+
     }
 
     @Test
-    @Ignore
-    public final void whenUploadWithAddBinaryBody_InputStream_andTextBody_ThenNoException() throws ClientProtocolException, IOException {
-        final InputStream inputStream = new FileInputStream(zipFileName);
+    public final void whenUploadWithAddBinaryBody_withCharArray_andTextBody_ThenNoException() throws ClientProtocolException, IOException {
+
         final String message = "This is a multipart post";
+        final byte[] bytes = "binary code".getBytes();
         final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-        // builder.addBinaryBody("submitted", inputStream, ContentType.create("application/zip"), "zipFileName");
-        builder.addBinaryBody("upfile", inputStream, ContentType.create("application/zip"), "zipFileName");
-        builder.addTextBody("note", message, ContentType.TEXT_PLAIN);
+        builder.addBinaryBody("upfile", bytes, ContentType.DEFAULT_BINARY, textFileName);
+        builder.addTextBody("text", message, ContentType.TEXT_PLAIN);
         final HttpEntity entity = builder.build();
         post.setEntity(entity);
-        final HttpResponse response = client.execute(post);
+        response = client.execute(post);
+        final int statusCode = response.getStatusLine().getStatusCode();
+        assertThat(statusCode, equalTo(HttpStatus.SC_OK));
+
+        System.out.println(getContent());
 
-        System.out.println(getContent(response));
         final Header[] headers = response.getAllHeaders();
+        assertThat(headers.length, equalTo(5));
 
         for (final Header thisHeader : headers) {
             System.out.println(thisHeader.getName() + ":" + thisHeader.getValue());
         }
+
     }
 
-    // BUG
+    public String getContent() throws IOException {
 
-    @Test
-    public final void whenFluentRequestWithBody_ThenNoException() throws IOException {
-        final String fileName = ".\temp.txt";
-        final File fileBin = new File(fileName);
-        final String message = "This is a multipart post";
-        final MultipartEntityBuilder builder = MultipartEntityBuilder.create();
-        builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
-        builder.addBinaryBody("upfile", fileBin, ContentType.DEFAULT_BINARY, fileName);
-        builder.addTextBody("note", message, ContentType.TEXT_PLAIN);
-        final HttpEntity entity = builder.build();
-        final Response response = Request.Post(SERVER).body(entity).execute();
-    }
-
-    public static String getContent(final HttpResponse response) throws IOException {
-        final BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+        rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
         String body = "";
         String content = "";
 
         while ((body = rd.readLine()) != null) {
             content += body + "\n";
         }
+
         return content.trim();
+
     }
 
 }
diff --git a/httpclient/temp.txt b/httpclient/temp.txt
new file mode 100644
index 0000000000..ba0798301f
--- /dev/null
+++ b/httpclient/temp.txt
@@ -0,0 +1 @@
+Hello theren
\ No newline at end of file
diff --git a/httpclient/zipFile.zip b/httpclient/zipFile.zip
new file mode 100644
index 0000000000000000000000000000000000000000..270cccb3ff71e61eb319978b1397ef95ef47388b
GIT binary patch
literal 282
zcmWIWW@Zs#U|`^2m=a-UdHUH~?HVBO2oUo!h%%&QR+N+$rJCqv73b%LhHx@4OZYwV
zF!z7t5n92*@Rd=7q5D}7LsOOkCzBWJO|LL6uQV?!E{=_N{!F<dGoc_V&DAqAFl%F6
zQlMvAk)KxAsx4=(%$bt3z^ElN;bYI0BU9#_*%LB>Q7^Ky^5su1)|IM9xo*x>Rb5$m
z!p%V@V3x@INfAt8c_|4A%eY<I(zx2v!r0gxmav4!o@P}{W(@FVWD;k_<$7MA9~c-I
ifp|$Hh=t}CR)}9hD;O98yjj^mDj0##14!=yaToxi*HvBs

literal 0
HcmV?d00001