brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alasdairhodge <...@git.apache.org>
Subject [GitHub] incubator-brooklyn pull request: Fix various integration tests
Date Thu, 30 Oct 2014 18:50:39 GMT
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.
---

Mime
View raw message