You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/07/18 15:42:20 UTC
[09/12] git commit: deprecte ApplicationBuilder.newManagedInstance to
encourage mgmt context to be supplied,
and convert many existing usages to conveniences which load
LocalManagementContextForTests (to speed up tests by preventng catalog
parsing)
deprecte ApplicationBuilder.newManagedInstance to encourage mgmt context to be supplied, and convert many existing usages to conveniences which load LocalManagementContextForTests (to speed up tests by preventng catalog parsing)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b15a4713
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b15a4713
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b15a4713
Branch: refs/heads/master
Commit: b15a4713d308302c698689d9e50dc41497773684
Parents: a882a87
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 18 01:26:47 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 18 09:15:18 2014 -0400
----------------------------------------------------------------------
.../main/java/brooklyn/entity/basic/ApplicationBuilder.java | 6 ++++++
.../enricher/CustomAggregatingEnricherDeprecatedTest.groovy | 3 ++-
.../enricher/TransformingEnricherDeprecatedTest.groovy | 2 +-
.../test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy | 3 +--
.../java/brooklyn/entity/basic/AbstractEntityLegacyTest.java | 4 ++--
.../java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy | 2 +-
.../java/brooklyn/entity/basic/EntitySubscriptionTest.groovy | 2 +-
.../basic/MapListAndOtherStructuredConfigKeyTest.groovy | 2 +-
core/src/test/java/brooklyn/entity/group/GroupTest.java | 3 +--
.../java/brooklyn/entity/rebind/RebindManagerSorterTest.java | 4 ++--
.../basic/AggregatingMachineProvisioningLocationTest.java | 3 ++-
.../brooklyn/location/basic/TestPortSupplierLocation.groovy | 3 +--
.../java/brooklyn/policy/basic/PolicySubscriptionTest.groovy | 2 +-
core/src/test/java/brooklyn/test/entity/TestApplication.java | 8 +++++++-
.../test/java/brooklyn/enricher/HttpLatencyDetectorTest.java | 2 +-
.../brooklyn/enricher/TimeFractionDeltaEnricherTest.java | 2 +-
.../test/java/brooklyn/policy/ha/ServiceReplacerTest.java | 3 +--
.../java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java | 4 +---
.../test/java/brooklyn/entity/java/EntityPollingTest.java | 2 +-
.../test/java/brooklyn/entity/java/VanillaJavaAppTest.java | 8 ++++----
.../io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java | 4 ++--
.../test/java/brooklyn/rest/domain/SensorSummaryTest.java | 3 +--
22 files changed, 41 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/main/java/brooklyn/entity/basic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/ApplicationBuilder.java b/core/src/main/java/brooklyn/entity/basic/ApplicationBuilder.java
index dd0c650..f3be0e0 100644
--- a/core/src/main/java/brooklyn/entity/basic/ApplicationBuilder.java
+++ b/core/src/main/java/brooklyn/entity/basic/ApplicationBuilder.java
@@ -70,6 +70,9 @@ public abstract class ApplicationBuilder {
@SuppressWarnings("unchecked")
@Beta
+ /** @deprecated since 0.7.0 the management context should normally be passed in;
+ * for TestApplication also see TestApplication.Factory.newManagedInstanceForTests() */
+ @Deprecated
public static <T extends StartableApplication> T newManagedApp(Class<T> type) {
if (type.isInterface()) {
return (T) newManagedApp(EntitySpec.create(type));
@@ -80,6 +83,9 @@ public abstract class ApplicationBuilder {
@SuppressWarnings("unchecked")
@Beta
+ /** @deprecated since 0.7.0 the management context should normally be passed in;
+ * for TestApplication also see TestApplication.Factory.newManagedInstanceForTests() */
+ @Deprecated
public static <T extends StartableApplication> T newManagedApp(EntitySpec<T> spec) {
return (T) new ApplicationBuilder(spec) {
@Override protected void doBuild() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy
index c51a0e7..adba709 100644
--- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy
+++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy
@@ -34,6 +34,7 @@ import brooklyn.event.AttributeSensor
import brooklyn.event.basic.BasicAttributeSensor
import brooklyn.location.basic.SimulatedLocation
import brooklyn.test.TestUtils
+import brooklyn.test.entity.LocalManagementContextForTests;
import brooklyn.test.entity.TestApplication
import brooklyn.test.entity.TestEntity
@@ -54,7 +55,7 @@ class CustomAggregatingEnricherDeprecatedTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
producer = app.createAndManageChild(EntitySpec.create(TestEntity.class));
intSensor = new BasicAttributeSensor<Integer>(Integer.class, "int sensor")
target = new BasicAttributeSensor<Integer>(Long.class, "target sensor")
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy
index f0103a5..f880232 100644
--- a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy
+++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy
@@ -53,7 +53,7 @@ public class TransformingEnricherDeprecatedTest {
@BeforeMethod()
public void before() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
producer = app.createAndManageChild(EntitySpec.create(TestEntity.class));
intSensorA = new BasicAttributeSensor<Integer>(Integer.class, "int.sensor.a");
target = new BasicAttributeSensor<Long>(Long.class, "long.sensor.target");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy
index e13e2ea..9061a99 100644
--- a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy
+++ b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy
@@ -28,7 +28,6 @@ import org.testng.annotations.Test
import brooklyn.entity.annotation.EffectorParam
import brooklyn.entity.basic.AbstractEntity
-import brooklyn.entity.basic.ApplicationBuilder
import brooklyn.entity.basic.BasicParameterType
import brooklyn.entity.basic.BrooklynTaskTags
import brooklyn.entity.basic.Entities
@@ -55,7 +54,7 @@ public class EffectorSayHiGroovyTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
e = app.createAndManageChild(EntitySpec.create(MyEntity.class));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java
index 5507710..3c0bb1e 100644
--- a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java
@@ -108,7 +108,7 @@ public class AbstractEntityLegacyTest {
@Test
public void testNewStyleCallsConfigureAfterConstruction() throws Exception {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
MyEntity entity = app.addChild(EntitySpec.create(MyEntity.class));
assertEquals(entity.getConfigureCount(), 1);
@@ -139,7 +139,7 @@ public class AbstractEntityLegacyTest {
@Test
public void testNewStyleSetsDefaultDisplayName() throws Exception {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
MyEntity entity = app.addChild(EntitySpec.create(MyEntity.class));
assertTrue(entity.getDisplayName().startsWith("MyEntity:"+entity.getId().substring(0,4)), "displayName="+entity.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy b/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy
index f9d905c..627b6f2 100644
--- a/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy
+++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy
@@ -36,7 +36,7 @@ public class ConfigMapGroovyTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = new MySubEntity(app);
Entities.manage(entity);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.groovy b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.groovy
index 23a612c..1317c12 100644
--- a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.groovy
+++ b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.groovy
@@ -56,7 +56,7 @@ public class EntitySubscriptionTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
loc = new SimulatedLocation();
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
observedEntity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
observedChildEntity = observedEntity.createAndManageChild(EntitySpec.create(TestEntity.class));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy
index f60d330..6462199 100644
--- a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy
+++ b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy
@@ -49,7 +49,7 @@ public class MapListAndOtherStructuredConfigKeyTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
locs = ImmutableList.of(new SimulatedLocation());
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/group/GroupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/group/GroupTest.java b/core/src/test/java/brooklyn/entity/group/GroupTest.java
index 1392175..43a31c0 100644
--- a/core/src/test/java/brooklyn/entity/group/GroupTest.java
+++ b/core/src/test/java/brooklyn/entity/group/GroupTest.java
@@ -25,7 +25,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import brooklyn.entity.Entity;
-import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.BasicGroup;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.proxying.EntitySpec;
@@ -52,7 +51,7 @@ public class GroupTest {
@BeforeMethod
public void setUp() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
loc = app.getManagementContext().getLocationManager().createLocation(LocationSpec.create(SimulatedLocation.class));
group = app.createAndManageChild(EntitySpec.create(BasicGroup.class));
entity1 = app.createAndManageChild(EntitySpec.create(TestEntity.class));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java
index 1b71e6a..991a000 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java
@@ -54,7 +54,7 @@ public class RebindManagerSorterTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
mgmts.add(managementContext = app.getManagementContext());
rebindManager = (RebindManagerImpl) managementContext.getRebindManager();
}
@@ -95,7 +95,7 @@ public class RebindManagerSorterTest {
@Test
public void testSortOrderMultipleApps() throws Exception {
- TestApplication app2 = ApplicationBuilder.newManagedApp(TestApplication.class);
+ TestApplication app2 = TestApplication.Factory.newManagedInstanceForTests();
mgmts.add(app2.getManagementContext());
TestEntity e1a = app.createAndManageChild(EntitySpec.create(TestEntity.class));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java b/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java
index 32ca4ea..e494a1f 100644
--- a/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java
+++ b/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java
@@ -34,6 +34,7 @@ import brooklyn.location.MachineProvisioningLocation;
import brooklyn.location.NoMachinesAvailableException;
import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine;
import brooklyn.management.internal.LocalManagementContext;
+import brooklyn.test.entity.LocalManagementContextForTests;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -53,7 +54,7 @@ public class AggregatingMachineProvisioningLocationTest {
@BeforeMethod(alwaysRun=true)
@SuppressWarnings("unchecked")
public void setUp() {
- managementContext = new LocalManagementContext();
+ managementContext = new LocalManagementContextForTests();
machine1a = newLocation(LocalhostMachine.class, "1a");
machine1b = newLocation(LocalhostMachine.class, "1b");
machine2a = newLocation(LocalhostMachine.class, "2a");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.groovy b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.groovy
index 7d2fcb6..51579d6 100644
--- a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.groovy
+++ b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.groovy
@@ -23,7 +23,6 @@ import org.testng.annotations.AfterMethod
import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test
-import brooklyn.entity.basic.ApplicationBuilder
import brooklyn.entity.basic.Entities
import brooklyn.entity.proxying.EntitySpec
import brooklyn.event.basic.PortAttributeSensorAndConfigKey
@@ -41,7 +40,7 @@ public class TestPortSupplierLocation {
@BeforeMethod
public void setup() {
l = new SimulatedLocation();
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
e = app.createAndManageChild(EntitySpec.create(TestEntity.class));
app.start([l]);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.groovy b/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.groovy
index 415d1c4..2290c07 100644
--- a/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.groovy
+++ b/core/src/test/java/brooklyn/policy/basic/PolicySubscriptionTest.groovy
@@ -55,7 +55,7 @@ public class PolicySubscriptionTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
loc = new SimulatedLocation();
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
entity2 = app.createAndManageChild(EntitySpec.create(TestEntity.class));
listener = new RecordingSensorEventListener();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/core/src/test/java/brooklyn/test/entity/TestApplication.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/test/entity/TestApplication.java b/core/src/test/java/brooklyn/test/entity/TestApplication.java
index 7614b35..cc0a628 100644
--- a/core/src/test/java/brooklyn/test/entity/TestApplication.java
+++ b/core/src/test/java/brooklyn/test/entity/TestApplication.java
@@ -19,6 +19,7 @@
package brooklyn.test.entity;
import brooklyn.entity.Entity;
+import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.basic.StartableApplication;
import brooklyn.entity.proxying.EntitySpec;
@@ -39,5 +40,10 @@ public interface TestApplication extends StartableApplication, EntityInternal {
public <T extends Entity> T createAndManageChild(EntitySpec<T> spec);
public LocalhostMachineProvisioningLocation newLocalhostProvisioningLocation();
-
+
+ public static class Factory {
+ public static TestApplication newManagedInstanceForTests() {
+ return ApplicationBuilder.newManagedApp(TestApplication.class, new LocalManagementContextForTests());
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java
index 989b1ce..b8504ad 100644
--- a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java
+++ b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java
@@ -57,7 +57,7 @@ public class HttpLatencyDetectorTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
loc = new LocalhostMachineProvisioningLocation();
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
app.start(ImmutableList.of(loc));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java
index f87a304..57abb98 100644
--- a/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java
+++ b/policy/src/test/java/brooklyn/enricher/TimeFractionDeltaEnricherTest.java
@@ -51,7 +51,7 @@ public class TimeFractionDeltaEnricherTest {
@BeforeMethod(alwaysRun=true)
public void before() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
producer = app.createAndManageChild(EntitySpec.create(TestEntity.class));
intSensor = Sensors.newIntegerSensor("int sensor");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java
index 830f7e9..4b5a0d9 100644
--- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java
+++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java
@@ -184,8 +184,7 @@ public class ServiceReplacerTest {
assertEventuallyHasEntityReplacementFailedEvent(cluster);
}
-
- @Test
+ @Test(groups="Integration") // 1s wait
public void testStopFailureOfOldEntityDoesNotSetClusterOnFire() throws Exception {
app.subscribe(null, ServiceReplacer.ENTITY_REPLACEMENT_FAILED, eventListener);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
index 4d37391..7c96416 100644
--- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
+++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java
@@ -27,9 +27,7 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.Entities;
-import brooklyn.entity.basic.EntityLocal;
import brooklyn.entity.drivers.downloads.DownloadResolver;
import brooklyn.event.feed.ConfigToAttributes;
import brooklyn.location.basic.SshMachineLocation;
@@ -48,7 +46,7 @@ public class BrooklynNodeTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
loc = new SshMachineLocation(MutableMap.of("address", "localhost"));
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java
index cfabf98..7960a07 100644
--- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java
+++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java
@@ -127,7 +127,7 @@ public class EntityPollingTest {
@BeforeMethod(alwaysRun=true)
public void setUp() {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
/*
* Create an entity, using real entity code, but that swaps out the external process
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java
index aaac6b8..851aebd 100644
--- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java
+++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java
@@ -45,7 +45,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityLocal;
import brooklyn.entity.basic.Lifecycle;
@@ -81,8 +80,8 @@ public class VanillaJavaAppTest {
private static final Object LONG_TIMEOUT_MS = 61*1000;
private static String BROOKLYN_THIS_CLASSPATH = null;
- private static Class MAIN_CLASS = ExampleVanillaMain.class;
- private static Class MAIN_CPU_HUNGRY_CLASS = ExampleVanillaMainCpuHungry.class;
+ private static Class<?> MAIN_CLASS = ExampleVanillaMain.class;
+ private static Class<?> MAIN_CPU_HUNGRY_CLASS = ExampleVanillaMainCpuHungry.class;
private TestApplication app;
private LocalhostMachineProvisioningLocation loc;
@@ -92,7 +91,7 @@ public class VanillaJavaAppTest {
if (BROOKLYN_THIS_CLASSPATH==null) {
BROOKLYN_THIS_CLASSPATH = ResourceUtils.create(MAIN_CLASS).getClassLoaderDir();
}
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
loc = new LocalhostMachineProvisioningLocation(MutableMap.of("address", "localhost"));
}
@@ -307,6 +306,7 @@ public class VanillaJavaAppTest {
final JMXServiceURL url;
final Map<String,Object> env;
+ @SuppressWarnings("unchecked")
public AsserterForJmxConnection(VanillaJavaApp e) throws MalformedURLException {
this.entity = e;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
index e405d5e..28e8ef5 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/JavaWebAppsMatchingTest.java
@@ -38,7 +38,7 @@ import org.testng.annotations.Test;
import brooklyn.entity.basic.Entities;
import brooklyn.management.ManagementContext;
-import brooklyn.management.internal.LocalManagementContext;
+import brooklyn.test.entity.LocalManagementContextForTests;
import brooklyn.util.ResourceUtils;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.stream.Streams;
@@ -54,7 +54,7 @@ public class JavaWebAppsMatchingTest {
@BeforeMethod(alwaysRun=true)
public void setup() {
- brooklynMgmt = new LocalManagementContext();
+ brooklynMgmt = new LocalManagementContextForTests();
platform = new BrooklynCampPlatform(
PlatformRootSummary.builder().name("Brooklyn CAMP Platform").build(),
brooklynMgmt);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b15a4713/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
index ba6ee4c..ccf1320 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/domain/SensorSummaryTest.java
@@ -31,7 +31,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import brooklyn.config.render.RendererHints;
-import brooklyn.entity.basic.ApplicationBuilder;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.event.AttributeSensor;
@@ -56,7 +55,7 @@ public class SensorSummaryTest {
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
- app = ApplicationBuilder.newManagedApp(TestApplication.class);
+ app = TestApplication.Factory.newManagedInstanceForTests();
mgmt = app.getManagementContext();
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
}