Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6AEA518D26 for ; Sun, 4 Oct 2015 14:32:28 +0000 (UTC) Received: (qmail 74311 invoked by uid 500); 4 Oct 2015 14:32:28 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 74294 invoked by uid 500); 4 Oct 2015 14:32:28 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 74284 invoked by uid 99); 4 Oct 2015 14:32:28 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2015 14:32:28 +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 C15FE1A093D for ; Sun, 4 Oct 2015 14:32:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.781 X-Spam-Level: * X-Spam-Status: No, score=1.781 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id rvdPFwNYDRaJ for ; Sun, 4 Oct 2015 14:32:25 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 024DF204D9 for ; Sun, 4 Oct 2015 14:32:23 +0000 (UTC) Received: (qmail 74243 invoked by uid 99); 4 Oct 2015 14:32:22 -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; Sun, 04 Oct 2015 14:32:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 86A79DFF13; Sun, 4 Oct 2015 14:32:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Sun, 04 Oct 2015 14:32:22 -0000 Message-Id: <963d19e8247d4c9a8e42835131e7f18e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker git commit: (Added a date format test for a markup producing format.) Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae db94e0726 -> 14fab44fe (Added a date format test for a markup producing format.) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/dd545946 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/dd545946 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/dd545946 Branch: refs/heads/2.3-gae Commit: dd54594617cd382b60c6113649c7717b20cd54b8 Parents: db94e07 Author: ddekany Authored: Sun Oct 4 16:31:21 2015 +0200 Committer: ddekany Committed: Sun Oct 4 16:31:21 2015 +0200 ---------------------------------------------------------------------- src/test/java/freemarker/core/DateFormatTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/dd545946/src/test/java/freemarker/core/DateFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/core/DateFormatTest.java b/src/test/java/freemarker/core/DateFormatTest.java index b36a97f..6902b95 100644 --- a/src/test/java/freemarker/core/DateFormatTest.java +++ b/src/test/java/freemarker/core/DateFormatTest.java @@ -62,7 +62,8 @@ public class DateFormatTest extends TemplateTest { "epoch", EpochMillisTemplateDateFormatFactory.INSTANCE, "loc", LocAndTZSensitiveTemplateDateFormatFactory.INSTANCE, "div", EpochMillisDivTemplateDateFormatFactory.INSTANCE, - "appMeta", AppMetaTemplateDateFormatFactory.INSTANCE)); + "appMeta", AppMetaTemplateDateFormatFactory.INSTANCE, + "htmlIso", HTMLISOTemplateDateFormatFactory.INSTANCE)); } @Test @@ -77,6 +78,14 @@ public class DateFormatTest extends TemplateTest { "<#assign d = d?datetime>" + "${d} ${d?string} <#setting locale='de_DE'>${d}", "123456789 123456789 123456789"); + + getConfiguration().setDateTimeFormat("@htmlIso"); + assertOutput( + "<#assign d = d?datetime>" + + "${d} ${d?string} <#setting locale='de_DE'>${d}", + "1970-01-02T10:17:36Z " + + "1970-01-02T10:17:36Z " + + "1970-01-02T10:17:36Z"); } @Test