Repository: brooklyn-server Updated Branches: refs/heads/master b1126924f -> 59270ddad
avoid UpdatingMapTest non-det failure need to allow a first default event as that transformation may be running slowly Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/35afd7ee Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/35afd7ee Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/35afd7ee Branch: refs/heads/master Commit: 35afd7ee12166f1955b6eb710f73bd9a79cd97ff Parents: 48f0900 Author: Alex Heneveld <[email protected]> Authored: Thu Nov 2 09:56:25 2017 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Nov 2 09:56:25 2017 +0000 ---------------------------------------------------------------------- .../brooklyn/core/entity/RecordingSensorEventListener.java | 4 ++++ .../org/apache/brooklyn/enricher/stock/UpdatingMapTest.java | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/35afd7ee/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java index 2c00382..1246263 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java @@ -142,6 +142,10 @@ public class RecordingSensorEventListener<T> implements SensorEventListener<T>, tasks.clear(); lastValue = null; } + + public SensorEvent<T> removeEvent(int i) { + return events.remove(i); + } @Override public Iterator<SensorEvent<T>> iterator() { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/35afd7ee/core/src/test/java/org/apache/brooklyn/enricher/stock/UpdatingMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/UpdatingMapTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/UpdatingMapTest.java index c0e36e1..6771400 100644 --- a/core/src/test/java/org/apache/brooklyn/enricher/stock/UpdatingMapTest.java +++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/UpdatingMapTest.java @@ -123,7 +123,14 @@ public class UpdatingMapTest extends BrooklynAppUnitTestSupport { EntityAsserts.assertAttributeEqualsEventually(entity, mapSensor, ImmutableMap.of("myKey", "valIsV1")); listener.assertHasEventEventually(Predicates.alwaysTrue()); - assertEquals(Iterables.getOnlyElement(listener.getEventValues()), ImmutableMap.of("myKey", "valIsV1")); + Map<String, Object> ev = listener.removeEvent(0).getValue(); + if (ev.equals(ImmutableMap.of("myKey", "myDefault"))) { + // possible on slow machine for this to pick up myDefault computed late; get next + listener.assertHasEventEventually(Predicates.alwaysTrue()); + ev = listener.removeEvent(0).getValue(); + } + assertEquals(ev, ImmutableMap.of("myKey", "valIsV1")); + Asserts.assertSize(listener.getEventValues(), 0); } @Test
