OLINGO-573: merging with master
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f262563f Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f262563f Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f262563f Branch: refs/heads/OLINGO-573 Commit: f262563fa60175b947212213c289b4a791dcdaec Parents: 3ac433b 26ec32a Author: Ramesh Reddy <[email protected]> Authored: Mon Apr 20 09:04:45 2015 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Mon Apr 20 09:27:17 2015 -0500 ---------------------------------------------------------------------- lib/server-core-ext/pom.xml | 26 ++++++++++++++++++++ .../server/core/ServiceDispatcherTest.java | 2 ++ .../server/example/TripPinServiceTest.java | 4 +-- 3 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f262563f/lib/server-core-ext/pom.xml ---------------------------------------------------------------------- diff --cc lib/server-core-ext/pom.xml index 6070052,5249ed4..2c411fb --- a/lib/server-core-ext/pom.xml +++ b/lib/server-core-ext/pom.xml @@@ -81,33 -81,34 +81,59 @@@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-logging-log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f262563f/lib/server-core-ext/src/test/java/org/apache/olingo/server/core/ServiceDispatcherTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f262563f/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java ---------------------------------------------------------------------- diff --cc lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java index 1766f1a,3547b50..7eb73ef --- a/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java +++ b/lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinServiceTest.java @@@ -405,11 -404,11 +405,11 @@@ public class TripPinServiceTest postRequest.addHeader("Prefer", "return=minimal"); HttpResponse response = httpSend(postRequest, 204); -- // the below woud be 204, if minimal was not supplied - assertEquals("http://localhost:9900/trippin/People('olingodude')", getHeader(response, "Location")); - assertEquals("/People('olingodude')", getHeader(response, "Location")); ++ // the below would be 204, if minimal was not supplied ++ assertEquals(baseURL +"/People('olingodude')", getHeader(response, "Location")); assertEquals("return=minimal", getHeader(response, "Preference-Applied")); - String location = baseURL+getHeader(response, "Location"); + String location = getHeader(response, "Location"); response = httpGET(location, 200); EntityUtils.consumeQuietly(response.getEntity());
