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 99DDB200B95 for ; Tue, 27 Sep 2016 20:29:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 989CE160AB9; Tue, 27 Sep 2016 18:29:22 +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 BFC9B160AE5 for ; Tue, 27 Sep 2016 20:29:21 +0200 (CEST) Received: (qmail 70442 invoked by uid 500); 27 Sep 2016 18:29:20 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 70268 invoked by uid 99); 27 Sep 2016 18:29:20 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Sep 2016 18:29:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 594E51A077A for ; Tue, 27 Sep 2016 18:29:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id W9Nxgls2Ha40 for ; Tue, 27 Sep 2016 18:29:19 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id B692C5FE36 for ; Tue, 27 Sep 2016 18:29:18 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id AF1B7E015D for ; Tue, 27 Sep 2016 18:29:17 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id B4BA03A027B for ; Tue, 27 Sep 2016 18:29:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1762532 - in /maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats: src/site/apt/velocity-context.apt.vm verify.groovy Date: Tue, 27 Sep 2016 18:29:15 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160927182916.B4BA03A027B@svn01-us-west.apache.org> archived-at: Tue, 27 Sep 2016 18:29:22 -0000 Author: hboutemy Date: Tue Sep 27 18:29:15 2016 New Revision: 1762532 URL: http://svn.apache.org/viewvc?rev=1762532&view=rev Log: improve IT: check that every tool works (with special $link case) Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm?rev=1762532&r1=1762531&r2=1762532&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm Tue Sep 27 18:29:15 2016 @@ -120,7 +120,7 @@ Doxia Site Renderer Velocity Context | <<>> | = <<<$convert>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$date>>> \ -| | <<<\$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd', $currentDate)>>> +| | <<< \$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd', $currentDate)>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$display>>> *-----------------------+-------------------------------------------------------+ @@ -130,7 +130,7 @@ Doxia Site Renderer Velocity Context *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$loop>>> *-----------------------+-------------------------------------------------------+ -| <<>> | = <<<$link>>> +| <<>> | = <<<$link.relative('MyPage.vm')>>> *-----------------------+-------------------------------------------------------+ | <<>> | = <<<$math>>> *-----------------------+-------------------------------------------------------+ Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy?rev=1762532&r1=1762531&r2=1762532&view=diff ============================================================================== --- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy (original) +++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy Tue Sep 27 18:29:15 2016 @@ -38,4 +38,6 @@ assert content.contains( '= <<>>' assert new File( basedir, 'target/site/markdown2.html' ).exists(); // DOXIA-535 +assert !content.replace('$link', '').contains( '$' ); // MSITE-550 + return true; \ No newline at end of file