Tidy up a bit
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/83875637 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/83875637 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/83875637 Branch: refs/heads/master Commit: 83875637e119a76f73a976f883fc6aaa0460382b Parents: 19b06ba Author: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Authored: Sat Jan 27 16:31:52 2018 +0000 Committer: Geoff Macartney <geoff.macart...@cloudsoftcorp.com> Committed: Fri Feb 9 21:09:20 2018 +0000 ---------------------------------------------------------------------- .../core/entity/ApplicationLoggingTest.java | 36 +++++++------------- .../org/apache/brooklyn/test/LogWatcher.java | 6 ++-- 2 files changed, 14 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/83875637/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLoggingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLoggingTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLoggingTest.java index 2e74593..4c075aa 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLoggingTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLoggingTest.java @@ -18,9 +18,8 @@ */ package org.apache.brooklyn.core.entity; -import static com.google.common.base.Predicates.and; import static org.apache.brooklyn.test.LogWatcher.EventPredicates.containsMessage; -import static org.apache.brooklyn.test.LogWatcher.EventPredicates.matchesPatterns; +import static org.apache.brooklyn.test.LogWatcher.EventPredicates.matchingRegexes; import java.util.ArrayDeque; import java.util.Collection; @@ -41,17 +40,14 @@ import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.test.LogWatcher; import org.apache.brooklyn.util.collections.QuorumCheck; import org.apache.brooklyn.util.exceptions.Exceptions; -import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.spi.ILoggingEvent; @Test public class ApplicationLoggingTest extends BrooklynAppUnitTestSupport { @@ -156,14 +152,19 @@ public class ApplicationLoggingTest extends BrooklynAppUnitTestSupport { assertHealthEventually(app, Lifecycle.RUNNING, true); app.stop(); assertHealthEventually(app, Lifecycle.STOPPED, false); - watcher.assertHasEvent(matchesPatterns(".*" + app.getApplicationId() + ".*Hello world.*")); - watcher.assertHasEvent(matchesPatterns(".*" - + ImmutableList.of(app.getId(), entity.getId()).toString() - + ".*from entity.*" + entity.getId() + ".*")); - watcher.assertHasEvent(matchesPatterns(".*" + + + // Look for output like + // 2018-01-27 16:25:52,386 INFO [dwym20xr82, b1babwc34d, se1d2nn62j] Hello from entity se1d2nn62j + // 2018-01-27 16:25:52,388 INFO [dwym20xr82, b1babwc34d] Hello from entity b1babwc34d + // 2018-01-27 16:25:52,389 INFO [dwym20xr82] Hello world + // 2018-01-27 16:25:52,399 INFO [dwym20xr82] Goodbye cruel world + // 2018-01-27 16:25:52,400 INFO [dwym20xr82, b1babwc34d] Goodbye from entity b1babwc34d + // 2018-01-27 16:25:52,401 INFO [dwym20xr82, b1babwc34d, se1d2nn62j] Goodbye from entity se1d2nn62j + watcher.assertHasEvent(matchingRegexes(".*" + app.getApplicationId() + ".*Hello world.*"));; + watcher.assertHasEvent(matchingRegexes(".*" + ImmutableList.of(app.getId(), entity.getId()).toString() + ".*from entity.*" + entity.getId() + ".*")); - watcher.assertHasEvent(matchesPatterns(".*" + + watcher.assertHasEvent(matchingRegexes(".*" + ImmutableList.of(app.getId(), entity.getId(), child.getId()).toString() + ".*from entity.*" + child.getId() + ".*")); } finally { @@ -171,19 +172,6 @@ public class ApplicationLoggingTest extends BrooklynAppUnitTestSupport { } } - - @Test - public void testOne() { - LogWatcher watcher = new LogWatcher(LOG.getName(), Level.DEBUG, Predicates.alwaysTrue()); - - watcher.start(); - try { - LOG.error("Test message"); - } finally { - watcher.close(); - } - } - private void assertHealthEventually(Entity entity, Lifecycle expectedState, Boolean expectedUp) { EntityAsserts.assertAttributeEqualsEventually(entity, Attributes.SERVICE_STATE_ACTUAL, expectedState); EntityAsserts.assertAttributeEqualsEventually(entity, Attributes.SERVICE_UP, expectedUp); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/83875637/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java ---------------------------------------------------------------------- diff --git a/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java b/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java index 3f6b002..8b3b451 100644 --- a/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java +++ b/test-support/src/main/java/org/apache/brooklyn/test/LogWatcher.java @@ -33,7 +33,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiPredicate; -import java.util.regex.Pattern; import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; @@ -54,7 +53,6 @@ import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.StackTraceElementProxy; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; -import ch.qos.logback.core.OutputStreamAppender; /** * Testing utility that registers an appender to watch a given logback logger, and records events @@ -73,7 +71,7 @@ public class LogWatcher implements Closeable { return containsMessages(expected); } - public static Predicate<ILoggingEvent> matchPredicate(BiPredicate<String, String> pred, + protected static Predicate<ILoggingEvent> matchPredicate(BiPredicate<String, String> pred, final String... expecteds) { return event -> { if (event == null) return false; @@ -86,7 +84,7 @@ public class LogWatcher implements Closeable { }; } - public static Predicate<ILoggingEvent> matchesPatterns(final String... patterns) { + public static Predicate<ILoggingEvent> matchingRegexes(final String... patterns) { return matchPredicate(String::matches, patterns); }