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 2015/09/21 18:05:42 UTC
[5/7] incubator-brooklyn git commit: Update deprecated code in
subscription tests
Update deprecated code in subscription tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d9b3a81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d9b3a81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d9b3a81
Branch: refs/heads/master
Commit: 0d9b3a810e02fad2e0fb6dad0cfda579c3fedb93
Parents: a566d32
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 18 19:34:33 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Sep 21 14:33:20 2015 +0100
----------------------------------------------------------------------
.../core/entity/EntitySubscriptionTest.java | 44 ++++++++++----------
.../internal/LocalSubscriptionManagerTest.java | 4 +-
.../policy/basic/PolicySubscriptionTest.java | 22 +++++-----
.../SubscriptionPerformanceTest.java | 6 +--
4 files changed, 37 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d9b3a81/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java
index 599d28c..8b8d244 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java
@@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals;
import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
-import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.sensor.BasicSensorEvent;
import org.apache.brooklyn.core.test.entity.TestApplication;
@@ -81,10 +80,10 @@ public class EntitySubscriptionTest {
entity.subscribe(observedEntity, TestEntity.NAME, listener);
entity.subscribe(observedEntity, TestEntity.MY_NOTIF, listener);
- otherEntity.setAttribute(TestEntity.SEQUENCE, 123);
- observedEntity.setAttribute(TestEntity.SEQUENCE, 123);
- observedEntity.setAttribute(TestEntity.NAME, "myname");
- observedEntity.emit(TestEntity.MY_NOTIF, 456);
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ observedEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ observedEntity.sensors().set(TestEntity.NAME, "myname");
+ observedEntity.sensors().emit(TestEntity.MY_NOTIF, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -99,8 +98,8 @@ public class EntitySubscriptionTest {
public void testSubscriptionToAllReceivesEvents() {
entity.subscribe(null, TestEntity.SEQUENCE, listener);
- observedEntity.setAttribute(TestEntity.SEQUENCE, 123);
- otherEntity.setAttribute(TestEntity.SEQUENCE, 456);
+ observedEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -114,8 +113,8 @@ public class EntitySubscriptionTest {
public void testSubscribeToChildrenReceivesEvents() {
entity.subscribeToChildren(observedEntity, TestEntity.SEQUENCE, listener);
- observedChildEntity.setAttribute(TestEntity.SEQUENCE, 123);
- observedEntity.setAttribute(TestEntity.SEQUENCE, 456);
+ observedChildEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ observedEntity.sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -129,7 +128,7 @@ public class EntitySubscriptionTest {
entity.subscribeToChildren(observedEntity, TestEntity.SEQUENCE, listener);
final TestEntity observedChildEntity2 = observedEntity.createAndManageChild(EntitySpec.create(TestEntity.class));
- observedChildEntity2.setAttribute(TestEntity.SEQUENCE, 123);
+ observedChildEntity2.sensors().set(TestEntity.SEQUENCE, 123);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -142,8 +141,8 @@ public class EntitySubscriptionTest {
public void testSubscribeToMembersReceivesEvents() {
entity.subscribeToMembers(observedGroup, TestEntity.SEQUENCE, listener);
- observedMemberEntity.setAttribute(TestEntity.SEQUENCE, 123);
- ((EntityLocal)observedGroup).setAttribute(TestEntity.SEQUENCE, 456);
+ observedMemberEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ ((EntityLocal)observedGroup).sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -158,7 +157,7 @@ public class EntitySubscriptionTest {
final TestEntity observedMemberEntity2 = app.createAndManageChild(EntitySpec.create(TestEntity.class));
observedGroup.addMember(observedMemberEntity2);
- observedMemberEntity2.setAttribute(TestEntity.SEQUENCE, 123);
+ observedMemberEntity2.sensors().set(TestEntity.SEQUENCE, 123);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -173,7 +172,7 @@ public class EntitySubscriptionTest {
observedGroup.removeMember(observedMemberEntity);
- observedMemberEntity.setAttribute(TestEntity.SEQUENCE, 123);
+ observedMemberEntity.sensors().set(TestEntity.SEQUENCE, 123);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -189,10 +188,10 @@ public class EntitySubscriptionTest {
entity.subscribe(otherEntity, TestEntity.SEQUENCE, listener);
entity.unsubscribe(observedEntity);
- observedEntity.setAttribute(TestEntity.SEQUENCE, 123);
- observedEntity.setAttribute(TestEntity.NAME, "myname");
- observedEntity.emit(TestEntity.MY_NOTIF, 123);
- otherEntity.setAttribute(TestEntity.SEQUENCE, 456);
+ observedEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ observedEntity.sensors().set(TestEntity.NAME, "myname");
+ observedEntity.sensors().emit(TestEntity.MY_NOTIF, 123);
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -209,9 +208,9 @@ public class EntitySubscriptionTest {
entity.unsubscribe(observedEntity, handle2);
- observedEntity.setAttribute(TestEntity.SEQUENCE, 123);
- observedEntity.setAttribute(TestEntity.NAME, "myname");
- otherEntity.setAttribute(TestEntity.SEQUENCE, 456);
+ observedEntity.sensors().set(TestEntity.SEQUENCE, 123);
+ observedEntity.sensors().set(TestEntity.NAME, "myname");
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -227,7 +226,7 @@ public class EntitySubscriptionTest {
entity.subscribe(observedEntity, TestEntity.MY_NOTIF, listener);
for (int i = 0; i < NUM_EVENTS; i++) {
- observedEntity.emit(TestEntity.MY_NOTIF, i);
+ observedEntity.sensors().emit(TestEntity.MY_NOTIF, i);
}
Asserts.succeedsEventually(new Runnable() {
@@ -238,5 +237,4 @@ public class EntitySubscriptionTest {
}
}});
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d9b3a81/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
index 1e5dda1..08efee4 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManagerTest.java
@@ -128,7 +128,7 @@ public class LocalSubscriptionManagerTest extends BrooklynAppUnitTestSupport {
events.add(event);
latch.countDown();
}});
- member.setAttribute(TestEntity.SEQUENCE, 123);
+ member.sensors().set(TestEntity.SEQUENCE, 123);
if (!latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
fail("Timeout waiting for Event on parent TestEntity listener");
@@ -168,7 +168,7 @@ public class LocalSubscriptionManagerTest extends BrooklynAppUnitTestSupport {
try {
thread.start();
for (int i = 0; i < 10000; i++) {
- entity.setAttribute(TestEntity.SEQUENCE, i);
+ entity.sensors().set(TestEntity.SEQUENCE, i);
}
} finally {
thread.interrupt();
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d9b3a81/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java
index ed4a9c0..fa7333f 100644
--- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java
@@ -65,10 +65,10 @@ public class PolicySubscriptionTest extends BrooklynAppUnitTestSupport {
policy.subscribe(entity, TestEntity.NAME, listener);
policy.subscribe(entity, TestEntity.MY_NOTIF, listener);
- otherEntity.setAttribute(TestEntity.SEQUENCE, 456);
- entity.setAttribute(TestEntity.SEQUENCE, 123);
- entity.setAttribute(TestEntity.NAME, "myname");
- entity.emit(TestEntity.MY_NOTIF, 789);
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 456);
+ entity.sensors().set(TestEntity.SEQUENCE, 123);
+ entity.sensors().set(TestEntity.NAME, "myname");
+ entity.sensors().emit(TestEntity.MY_NOTIF, 789);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
@@ -87,10 +87,10 @@ public class PolicySubscriptionTest extends BrooklynAppUnitTestSupport {
policy.subscribe(otherEntity, TestEntity.SEQUENCE, listener);
policy.unsubscribe(entity);
- entity.setAttribute(TestEntity.SEQUENCE, 123);
- entity.setAttribute(TestEntity.NAME, "myname");
- entity.emit(TestEntity.MY_NOTIF, 456);
- otherEntity.setAttribute(TestEntity.SEQUENCE, 789);
+ entity.sensors().set(TestEntity.SEQUENCE, 123);
+ entity.sensors().set(TestEntity.NAME, "myname");
+ entity.sensors().emit(TestEntity.MY_NOTIF, 456);
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 789);
Thread.sleep(SHORT_WAIT_MS);
Asserts.succeedsEventually(new Runnable() {
@@ -108,9 +108,9 @@ public class PolicySubscriptionTest extends BrooklynAppUnitTestSupport {
policy.unsubscribe(entity, handle2);
- entity.setAttribute(TestEntity.SEQUENCE, 123);
- entity.setAttribute(TestEntity.NAME, "myname");
- otherEntity.setAttribute(TestEntity.SEQUENCE, 456);
+ entity.sensors().set(TestEntity.SEQUENCE, 123);
+ entity.sensors().set(TestEntity.NAME, "myname");
+ otherEntity.sensors().set(TestEntity.SEQUENCE, 456);
Asserts.succeedsEventually(new Runnable() {
@Override public void run() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d9b3a81/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
index 3c4a14d..154c0e6 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/SubscriptionPerformanceTest.java
@@ -84,7 +84,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest {
measureAndAssert("updateAttributeWithManyPublishedOneSubscriber", numIterations, minRatePerSec,
new Runnable() {
public void run() {
- entity.setAttribute(TestEntity.SEQUENCE, (iter.getAndIncrement()));
+ entity.sensors().set(TestEntity.SEQUENCE, (iter.getAndIncrement()));
}
},
new Runnable() {
@@ -121,7 +121,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest {
measureAndAssert("updateAttributeWithManyListeners", numIterations, minRatePerSec,
new Runnable() {
@Override public void run() {
- entity.setAttribute(TestEntity.SEQUENCE, (iter.getAndIncrement()));
+ entity.sensors().set(TestEntity.SEQUENCE, (iter.getAndIncrement()));
}},
new Runnable() {
public void run() {
@@ -157,7 +157,7 @@ public class SubscriptionPerformanceTest extends AbstractPerformanceTest {
measureAndAssert("updateAttributeWithUnrelatedListeners", numIterations, minRatePerSec, new Runnable() {
@Override public void run() {
- entity.setAttribute(TestEntity.SEQUENCE, (iter.incrementAndGet()));
+ entity.sensors().set(TestEntity.SEQUENCE, (iter.incrementAndGet()));
}});
if (exception.get() != null) {