commit e0e6a773bbf5d4373ba898f8b94573c6fcac9510
author Michael Bolz <michael.bolz@sap.com> Tue Jul 21 08:17:06 2015 +0200
committer Michael Bolz <michael.bolz@sap.com> Tue Jul 21 08:17:06 2015 +0200
tree afe1293eecb0b56d061904744938377788f0bc19
parent bc506e2a8fca964fdb3888cd61b91d0d4f719a2b

[OLINGO-733] Added test assert

odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterITTest.java

diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterITTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterITTest.java
index 49ea7ce..deb5972 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterITTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterITTest.java
@@ -140,6 +140,7 @@
     List<BatchPart> batch = new ArrayList<BatchPart>();
     Map<String, String> headers = new HashMap<String, String>();
     headers.put("Accept", "application/json");
+    headers.put("CustomHeader", "HeäderVälüe");
     BatchPart request = BatchQueryPart.method(GET).uri("Employees").headers(headers).contentId("000").build();
     batch.add(request);
 
@@ -168,7 +169,8 @@
     assertEquals(1, partGet.getRequests().size());
     final ODataRequest oDataRequestGet = partGet.getRequests().get(0);
     assertEquals("Employees", oDataRequestGet.getPathInfo().getODataSegments().get(0).getPath());
-    assertEquals("application/json", oDataRequestGet.getAcceptHeaders().get(0));
+    validateHeader(oDataRequestGet, "Accept", "application/json");
+    validateHeader(oDataRequestGet, "CustomHeader", "HeäderVälüe");
 
     // Change set
     final BatchRequestPart partChangeSet = parsedRequestParts.get(1);
@@ -287,4 +289,11 @@
   private String streamToString(final InputStream in) throws IOException {
     return StringHelper.toStream(in).asString();
   }
+
+  private void validateHeader(ODataRequest request, String headerName, String expectedValue) {
+    String actualValue = request.getRequestHeaderValue(headerName);
+    assertNotNull("Expected header '" + headerName + "' is not available.", actualValue);
+    assertEquals("Header '" + headerName + "' has value '" + actualValue
+        + "' instead of expected '" + expectedValue + "'.", expectedValue, actualValue);
+  }
 }