You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/07/21 08:23:51 UTC
olingo-odata2 git commit: [OLINGO-733] Added test assert
Repository: olingo-odata2
Updated Branches:
refs/heads/master bc506e2a8 -> e0e6a773b
[OLINGO-733] Added test assert
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/e0e6a773
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/e0e6a773
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/e0e6a773
Branch: refs/heads/master
Commit: e0e6a773bbf5d4373ba898f8b94573c6fcac9510
Parents: bc506e2
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Jul 21 08:17:06 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Jul 21 08:17:06 2015 +0200
----------------------------------------------------------------------
.../odata2/core/batch/BatchRequestWriterITTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/e0e6a773/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 @@ public class BatchRequestWriterITTest {
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 @@ public class BatchRequestWriterITTest {
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 @@ public class BatchRequestWriterITTest {
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);
+ }
}