Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A674C178D4 for ; Fri, 10 Oct 2014 10:42:12 +0000 (UTC) Received: (qmail 78474 invoked by uid 500); 10 Oct 2014 10:42:12 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 78454 invoked by uid 500); 10 Oct 2014 10:42:11 -0000 Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list dev@brooklyn.incubator.apache.org Received: (qmail 78443 invoked by uid 99); 10 Oct 2014 10:42:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Oct 2014 10:42:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Oct 2014 10:42:10 +0000 Received: (qmail 78371 invoked by uid 99); 10 Oct 2014 10:41:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Oct 2014 10:41:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A373F19AE9; Fri, 10 Oct 2014 10:41:49 +0000 (UTC) From: neykov To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Promote apps in catalog to Templa... Content-Type: text/plain Message-Id: <20141010104149.A373F19AE9@tyr.zones.apache.org> Date: Fri, 10 Oct 2014 10:41:49 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Github user neykov commented on a diff in the pull request: https://github.com/apache/incubator-brooklyn/pull/211#discussion_r18698764 --- Diff: core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java --- @@ -25,35 +25,37 @@ import brooklyn.entity.rebind.transformer.impl.XsltTransformer; import brooklyn.entity.rebind.transformer.impl.XsltTransformerTest; import brooklyn.util.ResourceUtils; +import brooklyn.util.os.Os; import brooklyn.util.text.TemplateProcessor; import com.google.common.collect.ImmutableMap; public class XsltTransformerTest { + private static final String NL = Os.LINE_SEPARATOR; @Test public void testRenameType() throws Exception { String xsltTemplate = ResourceUtils.create(XsltTransformerTest.class).getResourceAsString("classpath://brooklyn/entity/rebind/transformer/renameType.xslt"); String xslt = TemplateProcessor.processTemplateContents(xsltTemplate, ImmutableMap.of("old_val", "mytype.Before", "new_val", "mytype.After")); String input = - ""+"\n"+ - " mytype.Before"+"\n"+ - " "+"\n"+ - " doesNotMatch"+"\n"+ - " partial.mytype.Before"+"\n"+ - " mytype.Before"+"\n"+ - " "+"\n"+ - " myid"+"\n"+ + ""+NL+ --- End diff -- Good point, would've been better to remove the new line. This is already merged with https://github.com/apache/incubator-brooklyn/pull/220 though. I have extracted the remaining test fixes in https://github.com/apache/incubator-brooklyn/pull/235 (not related to the changes). --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---