Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7AA3217F79 for ; Thu, 30 Oct 2014 18:51:05 +0000 (UTC) Received: (qmail 95924 invoked by uid 500); 30 Oct 2014 18:51:04 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 95887 invoked by uid 500); 30 Oct 2014 18:51:04 -0000 Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list dev@brooklyn.incubator.apache.org Received: (qmail 95875 invoked by uid 99); 30 Oct 2014 18:51:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Oct 2014 18:51:04 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 30 Oct 2014 18:50:41 +0000 Received: (qmail 94832 invoked by uid 99); 30 Oct 2014 18:50:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Oct 2014 18:50:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 56B139839AA; Thu, 30 Oct 2014 18:50:39 +0000 (UTC) From: alasdairhodge To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Fix various integration tests Content-Type: text/plain Message-Id: <20141030185039.56B139839AA@tyr.zones.apache.org> Date: Thu, 30 Oct 2014 18:50:39 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Github user alasdairhodge commented on a diff in the pull request: https://github.com/apache/incubator-brooklyn/pull/281#discussion_r19627599 --- Diff: software/webapp/src/test/java/brooklyn/entity/webapp/nodejs/NodeJsWebAppFixtureIntegrationTest.java --- @@ -18,41 +18,188 @@ */ package brooklyn.entity.webapp.nodejs; -import org.testng.annotations.DataProvider; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import java.io.File; +import java.util.concurrent.TimeUnit; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import brooklyn.entity.Entity; +import brooklyn.entity.basic.Entities; +import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; +import brooklyn.entity.rebind.PersistenceExceptionHandlerImpl; +import brooklyn.entity.rebind.dto.MementosGenerators; +import brooklyn.entity.rebind.persister.BrooklynMementoPersisterToMultiFile; +import brooklyn.entity.trait.Startable; import brooklyn.entity.webapp.WebAppService; +import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; +import brooklyn.management.ManagementContext; +import brooklyn.management.ha.ManagementNodeState; +import brooklyn.management.internal.ManagementContextInternal; +import brooklyn.mementos.BrooklynMemento; +import brooklyn.test.Asserts; +import brooklyn.test.EntityTestUtils; +import brooklyn.test.HttpTestUtils; +import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; +import brooklyn.util.collections.MutableMap; +import brooklyn.util.net.Urls; +import brooklyn.util.os.Os; +import brooklyn.util.time.Time; + +import com.google.common.collect.ImmutableList; + +/** + * Integration tests for NodeJS. + * + * Only works on Linux (including Ubuntu and CentOS); not on OS X + */ +public class NodeJsWebAppFixtureIntegrationTest { -public class NodeJsWebAppFixtureIntegrationTest extends AbstractWebAppFixtureIntegrationTest { + // TODO Remove duplication from AbstractWebAppFixtureIntegrationTest. Those tests are geared towards Java-based + // tests (e.g. deploying WAR), so not extending it. --- End diff -- +1 perhaps an intermediate `JavaWebAppFixture` --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---