Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-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 E14DC18E4A for ; Fri, 9 Oct 2015 09:13:50 +0000 (UTC) Received: (qmail 12508 invoked by uid 500); 9 Oct 2015 09:13:50 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 12361 invoked by uid 500); 9 Oct 2015 09:13:50 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 12345 invoked by uid 99); 9 Oct 2015 09:13:50 -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, 09 Oct 2015 09:13:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1B591DFDD7; Fri, 9 Oct 2015 09:13:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cnenning@apache.org To: commits@struts.apache.org Date: Fri, 09 Oct 2015 09:13:51 -0000 Message-Id: In-Reply-To: <7b487b203eb24484b1a3a97e7383c9c8@git.apache.org> References: <7b487b203eb24484b1a3a97e7383c9c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] struts git commit: added tests for rfc3339 date formats added tests for rfc3339 date formats Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/366a0b4a Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/366a0b4a Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/366a0b4a Branch: refs/heads/master Commit: 366a0b4a5876b26c95eb186487afbd7e84a1cfaf Parents: d95fc63 Author: cnenning Authored: Fri Oct 9 11:11:34 2015 +0200 Committer: cnenning Committed: Fri Oct 9 11:11:34 2015 +0200 ---------------------------------------------------------------------- .../xwork2/conversion/impl/XWorkConverterTest.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/366a0b4a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java index 3d7fc49..d185c64 100644 --- a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkConverterTest.java @@ -109,6 +109,13 @@ public class XWorkConverterTest extends XWorkTestCase { assertEquals(date, ts); java.sql.Time time1 = (java.sql.Time) converter.convertValue(context, null, null, null, datetStr, java.sql.Time.class); assertEquals(datet, time1); + + Date dateWithTime = format.parse("01/10/2001 01:02:03"); + Date dateRfc3339 = (Date) converter.convertValue(context, null, null, null, "2001-01-10T01:02:03", Date.class); + assertEquals(dateWithTime, dateRfc3339); + + Date dateRfc3339DateOnly = (Date) converter.convertValue(context, null, null, null, "2001-01-10", Date.class); + assertEquals(date, dateRfc3339DateOnly); } public void testFieldErrorMessageAddedForComplexProperty() {