fixing tests

subnetmarco · subnetmarco · commit 24fdf525e8e4 · 2015-01-20T11:46:27.000-08:00
diff --git a/src/main/java/com/mashape/unirest/http/HttpClientHelper.java b/src/main/java/com/mashape/unirest/http/HttpClientHelper.java
@@ -225,8 +225,7 @@ private static HttpRequestBase prepareRequest(HttpRequest request, boolean async
 			if (request.getBody() != null) {
 				HttpEntity entity = request.getBody().getEntity();
 				if (async) {
-					
-					if (reqObj.getHeaders(CONTENT_TYPE) == null) {
+					if (reqObj.getHeaders(CONTENT_TYPE) == null || reqObj.getHeaders(CONTENT_TYPE).length == 0) {
 						reqObj.setHeader(entity.getContentType());
 					}
 					try {
diff --git a/src/test/java/com/mashape/unirest/test/http/UnirestTest.java b/src/test/java/com/mashape/unirest/test/http/UnirestTest.java
@@ -499,7 +499,40 @@ public void cancelled() {
 			}
 		});
 		
-		lock.await(100000, TimeUnit.SECONDS);
+		lock.await(10, TimeUnit.SECONDS);
+		assertTrue(status);
+	}
+	
+	@Test
+	public void testAsyncCustomContentTypeAndFormParams() throws InterruptedException {
+		Unirest.post("http://httpbin.org/post")
+		 .header("accept", "application/json")
+		 .header("Content-Type", "application/x-www-form-urlencoded")
+		 .field("name", "Mark")
+		 .field("hello", "world")
+		 .asJsonAsync(new Callback<JsonNode>() {
+			
+			public void failed(UnirestException e) {
+				fail();
+			}
+			
+			public void completed(HttpResponse<JsonNode> jsonResponse) {
+				JsonNode json = jsonResponse.getBody();
+				assertEquals("Mark", json.getObject().getJSONObject("form").getString("name"));
+				assertEquals("world", json.getObject().getJSONObject("form").getString("hello"));
+				
+				assertEquals("application/x-www-form-urlencoded", json.getObject().getJSONObject("headers").getString("Content-Type"));
+				
+				status = true;
+				lock.countDown();
+			}
+			
+			public void cancelled() {
+				fail();
+			}
+		});
+		
+		lock.await(10, TimeUnit.SECONDS);
 		assertTrue(status);
 	}
 }
