Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E5209200B5B for ; Fri, 5 Aug 2016 12:24:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E3FCE160AAC; Fri, 5 Aug 2016 10:24:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 41222160A8E for ; Fri, 5 Aug 2016 12:24:24 +0200 (CEST) Received: (qmail 99919 invoked by uid 500); 5 Aug 2016 10:24:23 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 99878 invoked by uid 99); 5 Aug 2016 10:24:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2016 10:24:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48E2DEC22C; Fri, 5 Aug 2016 10:24:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.apache.org Date: Fri, 05 Aug 2016 10:24:23 -0000 Message-Id: <03198091f73546eab584c7f5b052ba12@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] brooklyn-server git commit: Fix non-deterministic test of SpecParameter by choosing correct entity archived-at: Fri, 05 Aug 2016 10:24:25 -0000 Repository: brooklyn-server Updated Branches: refs/heads/master 94e09e0e4 -> ddb6acc92 Fix non-deterministic test of SpecParameter by choosing correct entity Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/323433ed Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/323433ed Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/323433ed Branch: refs/heads/master Commit: 323433ed7c0ffcf08b0d4ca1c8d1fd575d646799 Parents: 56f7258 Author: Andrew Donald Kennedy Authored: Thu Aug 4 15:01:53 2016 +0100 Committer: Andrew Donald Kennedy Committed: Thu Aug 4 18:13:54 2016 +0100 ---------------------------------------------------------------------- .../catalog/SpecParameterUnwrappingTest.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/323433ed/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java index 3d46058..4bbf137 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/SpecParameterUnwrappingTest.java @@ -32,7 +32,6 @@ import org.testng.annotations.Test; import com.google.common.base.Optional; import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; @@ -539,25 +538,30 @@ public class SpecParameterUnwrappingTest extends AbstractYamlTest { List> params = spec.getParameters(); assertEquals(params.size(), 3); assertTrue(Iterables.tryFind(params, nameEqualTo("num")).isPresent()); - + Application app = (Application) createAndStartApplication( "services:", " - type: " + ver(SYMBOLIC_NAME)); - Optional s = Iterables.tryFind(mgmt().getEntityManager().getEntitiesInApplication(app), EntityPredicates.displayNameEqualTo("s")); - assertTrue(s.isPresent()); - assertEquals(s.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234); - Iterable children = app.getChildren(); Optional a = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("a")); assertTrue(a.isPresent()); assertEquals(a.get().config().get(NUM).intValue(), 1234); + Optional as = Iterables.tryFind(a.get().getChildren(), EntityPredicates.displayNameEqualTo("s")); + assertTrue(as.isPresent()); + assertEquals(as.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234); Optional b = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("b")); assertTrue(b.isPresent()); assertEquals(b.get().config().get(NUM).intValue(), 5678); + Optional bs = Iterables.tryFind(b.get().getChildren(), EntityPredicates.displayNameEqualTo("s")); + assertTrue(bs.isPresent()); + assertEquals(bs.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 5678); Optional c = Iterables.tryFind(children, EntityPredicates.displayNameEqualTo("c")); assertTrue(c.isPresent()); assertEquals(c.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234); + Optional cs = Iterables.tryFind(c.get().getChildren(), EntityPredicates.displayNameEqualTo("s")); + assertTrue(cs.isPresent()); + assertEquals(cs.get().config().get(ConfigKeys.newIntegerConfigKey("test")).intValue(), 1234); } @Test