fixes 52North#197

ridoo · Sep 23, 2015 · 7a81e49 · 7a81e49
1 parent bd7049b
commit 7a81e49
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/52n-wps-webapp/src/test/java/org/n52/wps/test/PostClient.java b/52n-wps-webapp/src/test/java/org/n52/wps/test/PostClient.java
@@ -62,7 +62,7 @@ public static String sendRequest(String targetURL, String payload) throws IOExce
         payloadP = "request=" + payloadP;
 
         InputStream in = sendRequestForInputStream(targetURL, payloadP);
-        
+
         // Get the response
         BufferedReader rd = new BufferedReader(new InputStreamReader(in));
         List<String> lines= new LinkedList<String>();
@@ -78,7 +78,7 @@ public static InputStream sendRequestForInputStream(String targetURL, String pay
         // Send data
         URL url = new URL(targetURL);
 
-        URLConnection conn = url.openConnection();
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
 
         conn.setDoOutput(true);
 
@@ -87,10 +87,13 @@ public static InputStream sendRequestForInputStream(String targetURL, String pay
         wr.write(payload);
         wr.close();
 
-        return conn.getInputStream();
-
+        if (conn.getResponseCode() >= 400) {
+            return conn.getErrorStream();
+        } else {
+             return conn.getInputStream();
+        }
     }
-    
+
     public static void checkForExceptionReport(String targetURL, String payload, int expectedHTTPStatusCode, String... expectedExceptionParameters) throws IOException{
         // Send data
         URL url = new URL(targetURL);
@@ -104,30 +107,30 @@ public static void checkForExceptionReport(String targetURL, String payload, int
         wr.write(payload);
         wr.close();
 
-        try {            
-            conn.getInputStream();			
+        try {
+            conn.getInputStream();
 		} catch (IOException e) {
 			/*
 			 * expected, ignore
-			 */			
+			 */
 		}
-    	
+
         InputStream error = ((HttpURLConnection) conn).getErrorStream();
-        
+
         String exceptionReport = "";
-        
+
         int data = error.read();
         while (data != -1) {
         	exceptionReport = exceptionReport + (char)data;
             data = error.read();
         }
         error.close();
-        assertTrue(((HttpURLConnection) conn).getResponseCode() == expectedHTTPStatusCode);    
-        
+        assertTrue(((HttpURLConnection) conn).getResponseCode() == expectedHTTPStatusCode);
+
         for (String expectedExceptionParameter : expectedExceptionParameters) {
-            
-            assertTrue(exceptionReport.contains(expectedExceptionParameter)); 
-			
-		}   
+
+            assertTrue(exceptionReport.contains(expectedExceptionParameter));
+
+		}
     }
 }