This closes #1016
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/015b5cdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/015b5cdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/015b5cdf Branch: refs/heads/master Commit: 015b5cdf5597205989c72d541e9157d779bfbf9f Parents: 6a8e89f 036ba79 Author: Alex Heneveld <[email protected]> Authored: Tue Nov 10 17:03:27 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Nov 10 17:03:27 2015 +0000 ---------------------------------------------------------------------- .../ApplicationResourceIntegrationTest.java | 15 +-- .../rest/client/BrooklynApiRestClientTest.java | 37 +++--- .../rest/resources/LocationResource.java | 7 +- .../rest/BrooklynRestApiLauncherTest.java | 15 ++- .../rest/resources/ApplicationResourceTest.java | 10 +- .../rest/resources/EntityResourceTest.java | 8 +- .../rest/resources/SensorResourceTest.java | 4 +- .../rest/resources/ServerShutdownTest.java | 4 +- .../org/apache/brooklyn/test/HttpTestUtils.java | 7 +- .../java/org/apache/brooklyn/test/Asserts.java | 133 +++++++++++++++++++ .../apache/brooklyn/util/http/HttpAsserts.java | 46 +++++-- .../org/apache/brooklyn/test/AssertsTest.java | 74 +++++++++++ 12 files changed, 293 insertions(+), 67 deletions(-) ----------------------------------------------------------------------
