Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB76A1884A for ; Fri, 4 Mar 2016 16:15:46 +0000 (UTC) Received: (qmail 2917 invoked by uid 500); 4 Mar 2016 16:15:46 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 2842 invoked by uid 500); 4 Mar 2016 16:15:46 -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 2717 invoked by uid 99); 4 Mar 2016 16:15:46 -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, 04 Mar 2016 16:15:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 65DFFE38D3; Fri, 4 Mar 2016 16:15:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Fri, 04 Mar 2016 16:15:57 -0000 Message-Id: In-Reply-To: <0212b61a860a42b28de6f1fb7418c1be@git.apache.org> References: <0212b61a860a42b28de6f1fb7418c1be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/18] brooklyn-server git commit: fix test for new destroyOnStop parameter fix test for new destroyOnStop parameter Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/385621bb Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/385621bb Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/385621bb Branch: refs/heads/master Commit: 385621bb6d1941c951b4db277957911403ac300c Parents: ba8a20d Author: Alex Heneveld Authored: Wed Feb 24 15:24:21 2016 -0800 Committer: Alex Heneveld Committed: Wed Feb 24 15:24:36 2016 -0800 ---------------------------------------------------------------------- .../camp/brooklyn/catalog/SpecParameterUnwrappingTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/385621bb/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 1f7ba48..29788ce 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 @@ -294,8 +294,9 @@ public class SpecParameterUnwrappingTest extends AbstractYamlTest { "services:", "- type: " + ver(SYMBOLIC_NAME)); List> params = spec.getParameters(); - assertEquals(params.size(), 2); // sample + defaultDisplayName - assertEquals(ImmutableSet.copyOf(params), ImmutableSet.copyOf(BasicSpecParameter.fromClass(mgmt(), ConfigAppForTest.class))); + assertEquals(params.size(), 3, "Wrong number of params: "+params); // sample + defaultDisplayName + destroy_on_stop + assertEquals(ImmutableSet.copyOf(params), + ImmutableSet.copyOf(BasicSpecParameter.fromClass(mgmt(), ConfigAppForTest.class))); } @Test