Repository: brooklyn-server Updated Branches: refs/heads/master 4f75b2185 -> 004c6c1f0
Fixup Javadoc Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a3cddf12 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a3cddf12 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a3cddf12 Branch: refs/heads/master Commit: a3cddf12b966fdb175175cc056d8b640a6ffee8c Parents: 4681c0d Author: Sam Corbett <sam.corb...@cloudsoftcorp.com> Authored: Tue Jun 21 18:40:56 2016 +0100 Committer: Sam Corbett <sam.corb...@cloudsoftcorp.com> Committed: Tue Jun 21 18:43:16 2016 +0100 ---------------------------------------------------------------------- .../test/framework/TestFrameworkAssertions.java | 30 +++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a3cddf12/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java ---------------------------------------------------------------------- diff --git a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java index 3c00020..ba32f40 100644 --- a/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java +++ b/test-framework/src/main/java/org/apache/brooklyn/test/framework/TestFrameworkAssertions.java @@ -65,21 +65,23 @@ public class TestFrameworkAssertions { * Get assertions tolerantly from a configuration key. * This supports either a simple map of assertions, such as * - <pre> - assertOut: - contains: 2 users - matches: .*[\d]* days.* - </pre> + * <pre> + * assertOut: + * contains: 2 users + * matches: .*[\d]* days.* + * </pre> * or a list of such maps, (which allows you to repeat keys): - <pre> - assertOut: - - contains: 2 users - - contains: 2 days - </pre> - or - private static List<Map<String,Object>> getAssertions(ConfigKey<Object> key) { - } - */ + * <pre> + * assertOut: + * - contains: 2 users + * - contains: 2 days + * </pre> + * or + * <pre> + * private static List<Map<String,Object>> getAssertions(ConfigKey<Object> key) { + * } + * </pre> + */ public static List<Map<String, Object>> getAssertions(Entity entity, ConfigKey<Object> key) { Object config = entity.getConfig(key); Maybe<Map<String, Object>> maybeMap = TypeCoercions.tryCoerce(config, new TypeToken<Map<String, Object>>() {});
