This closes #473

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bfaaa909
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bfaaa909
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bfaaa909

Branch: refs/heads/master
Commit: bfaaa909eeae9850f8af9d360ef8faed7661ccf5
Parents: 615c635 816dc56
Author: Aled Sage <aled.s...@gmail.com>
Authored: Thu Dec 1 16:19:06 2016 +0000
Committer: Aled Sage <aled.s...@gmail.com>
Committed: Thu Dec 1 16:19:06 2016 +0000

----------------------------------------------------------------------
 .../brooklyn/test/framework/TestSensorTest.java | 62 +++++++++++++++++++-
 .../org/apache/brooklyn/test/LogWatcher.java    | 24 +++++++-
 .../apache/brooklyn/util/repeat/Repeater.java   |  9 ++-
 3 files changed, 92 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bfaaa909/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
----------------------------------------------------------------------
diff --cc test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
index 6495db3,ba29ad7..beed018
--- a/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
+++ b/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java
@@@ -25,8 -25,8 +25,9 @@@ import static org.testng.Assert.assertF
  import java.io.Closeable;
  import java.util.Collections;
  import java.util.List;
 +import java.util.Map;
  import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.concurrent.atomic.AtomicReference;
  
  import org.mockito.Mockito;
  import org.mockito.invocation.InvocationOnMock;
@@@ -37,8 -37,8 +38,9 @@@ import org.slf4j.LoggerFactory
  import com.google.common.annotations.Beta;
  import com.google.common.base.Predicate;
  import com.google.common.collect.ImmutableList;
+ import com.google.common.collect.Iterables;
  import com.google.common.collect.Lists;
 +import com.google.common.collect.Maps;
  
  import ch.qos.logback.classic.Level;
  import ch.qos.logback.classic.spi.ILoggingEvent;

Reply via email to