Repository: incubator-brooklyn Updated Branches: refs/heads/master 9bb0d71a4 -> f52d9e052
Make the HttpAssertsTest an integration test for now. Later task will be to restructure to avoid sleeps where possible, see conversation at https://github.com/apache/incubator-brooklyn/pull/994#issuecomment-154074295. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1433113f Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1433113f Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1433113f Branch: refs/heads/master Commit: 1433113f27e8046761f29da30708cb988c87f1bc Parents: c466240 Author: Geoff Macartney <[email protected]> Authored: Thu Nov 5 16:18:05 2015 +0000 Committer: Geoff Macartney <[email protected]> Committed: Thu Nov 5 16:18:05 2015 +0000 ---------------------------------------------------------------------- .../test/java/org/apache/brooklyn/util/HttpAssertsTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1433113f/utils/common/src/test/java/org/apache/brooklyn/util/HttpAssertsTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/HttpAssertsTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/HttpAssertsTest.java index 3b0c7c1..8bfd6e2 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/HttpAssertsTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/HttpAssertsTest.java @@ -35,6 +35,7 @@ import org.apache.http.localserver.ResponseBasicUnauthorized; import org.apache.http.protocol.ResponseServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.testng.Assert; import org.testng.annotations.*; import java.net.URI; @@ -44,8 +45,12 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; /** - * Created by geoff on 03/11/2015. + * Tests on {@link HttpAsserts}. + * + * @todo Restructure this to avoid sleeps, according to conversation at + * <a href="https://github.com/apache/incubator-brooklyn/pull/994#issuecomment-154074295";>#994</a> on github. */ +@Test(groups = "Integration") public class HttpAssertsTest { private static final Logger LOG = LoggerFactory.getLogger(HttpAssertsTest.class);
