Fix NodeJs live tests: donât assert REQUEST_COUNT - attributes like REQUEST_COUNT are not set for NodeJs, so donât assert that they are non-null
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6416575d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6416575d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6416575d Branch: refs/heads/master Commit: 6416575da12c739052c473ef29077d93edc17b39 Parents: 6e1ec72 Author: Aled Sage <[email protected]> Authored: Thu Nov 6 13:38:38 2014 +0000 Committer: Aled Sage <[email protected]> Committed: Thu Nov 6 13:38:38 2014 +0000 ---------------------------------------------------------------------- .../entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 13 +++---------- .../webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java | 13 +++---------- 2 files changed, 6 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6416575d/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java index ac8e32d..b2b5937 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppEc2LiveTest.java @@ -18,15 +18,15 @@ */ package brooklyn.entity.webapp.nodejs; -import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.*; -import static org.testng.Assert.assertNotNull; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.APP_FILE; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.APP_NAME; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.GIT_REPO_URL; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.Asserts; import brooklyn.test.HttpTestUtils; import com.google.common.collect.ImmutableList; @@ -49,13 +49,6 @@ public class NodeJsWebAppEc2LiveTest extends AbstractEc2LiveTest { HttpTestUtils.assertHttpStatusCodeEventuallyEquals(url, 200); HttpTestUtils.assertContentContainsText(url, "Hello"); - - Asserts.succeedsEventually(new Runnable() { - @Override public void run() { - assertNotNull(server.getAttribute(NodeJsWebAppService.REQUEST_COUNT)); - assertNotNull(server.getAttribute(NodeJsWebAppService.ERROR_COUNT)); - assertNotNull(server.getAttribute(NodeJsWebAppService.TOTAL_PROCESSING_TIME)); - }}); } @Test(groups = {"Live", "Live-sanity"}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6416575d/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java index ce4de92..ae87086 100644 --- a/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppSoftlayerLiveTest.java @@ -18,15 +18,15 @@ */ package brooklyn.entity.webapp.nodejs; -import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.*; -import static org.testng.Assert.assertNotNull; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.APP_FILE; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.APP_NAME; +import static brooklyn.entity.webapp.nodejs.NodeJsWebAppFixtureIntegrationTest.GIT_REPO_URL; import org.testng.annotations.Test; import brooklyn.entity.AbstractSoftlayerLiveTest; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.Asserts; import brooklyn.test.HttpTestUtils; import com.google.common.collect.ImmutableList; @@ -49,13 +49,6 @@ public class NodeJsWebAppSoftlayerLiveTest extends AbstractSoftlayerLiveTest { HttpTestUtils.assertHttpStatusCodeEventuallyEquals(url, 200); HttpTestUtils.assertContentContainsText(url, "Hello"); - - Asserts.succeedsEventually(new Runnable() { - @Override public void run() { - assertNotNull(server.getAttribute(NodeJsWebAppService.REQUEST_COUNT)); - assertNotNull(server.getAttribute(NodeJsWebAppService.ERROR_COUNT)); - assertNotNull(server.getAttribute(NodeJsWebAppService.TOTAL_PROCESSING_TIME)); - }}); } @Test(groups = {"Live", "Live-sanity"})
