Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-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 81F5618384 for ; Thu, 5 Nov 2015 23:45:51 +0000 (UTC) Received: (qmail 55789 invoked by uid 500); 5 Nov 2015 23:45:51 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 55721 invoked by uid 500); 5 Nov 2015 23:45:51 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 55712 invoked by uid 99); 5 Nov 2015 23:45:51 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2015 23:45:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D7255C4C37 for ; Thu, 5 Nov 2015 23:45:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id y4G5r3ZC3yaE for ; Thu, 5 Nov 2015 23:45:49 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id E6A2620A92 for ; Thu, 5 Nov 2015 23:45:48 +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 7EE5EE022D for ; Thu, 5 Nov 2015 23:45:47 +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 603473A0C76 for ; Thu, 5 Nov 2015 23:45:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1712877 - in /commons/proper/validator/trunk/src: changes/changes.xml test/java/org/apache/commons/validator/routines/DateValidatorTest.java Date: Thu, 05 Nov 2015 23:45:47 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151105234547.603473A0C76@svn01-us-west.apache.org> Author: sebb Date: Thu Nov 5 23:45:47 2015 New Revision: 1712877 URL: http://svn.apache.org/viewvc?rev=1712877&view=rev Log: VALIDATOR-369 DateValidatorTest.testCompare() fails with GMT-12 Modified: commons/proper/validator/trunk/src/changes/changes.xml commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java Modified: commons/proper/validator/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/changes/changes.xml?rev=1712877&r1=1712876&r2=1712877&view=diff ============================================================================== --- commons/proper/validator/trunk/src/changes/changes.xml (original) +++ commons/proper/validator/trunk/src/changes/changes.xml Thu Nov 5 23:45:47 2015 @@ -41,8 +41,10 @@ The type attribute can be add,u - + + DateValidatorTest.testCompare() fails with GMT-12 + Validate 19 digit VPay (VISA) Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java?rev=1712877&r1=1712876&r2=1712877&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java Thu Nov 5 23:45:47 2015 @@ -122,41 +122,41 @@ public class DateValidatorTest extends A Date date20050101 = createDate(GMT, 20050101, sameTime); // same year Date date20041231 = createDate(GMT, 20041231, sameTime); // -1 year - assertEquals("date LT", -1, dateValidator.compareDates(value, date20050824, null)); // +1 day - assertEquals("date EQ", 0, dateValidator.compareDates(value, diffHour, null)); // same day, diff hour - assertEquals("date GT", 1, dateValidator.compareDates(value, date20050822, null)); // -1 day - - assertEquals("week LT", -1, dateValidator.compareWeeks(value, date20050830, null)); // +1 week - assertEquals("week =1", 0, dateValidator.compareWeeks(value, date20050824, null)); // +1 day - assertEquals("week =2", 0, dateValidator.compareWeeks(value, date20050822, null)); // same week - assertEquals("week =3", 0, dateValidator.compareWeeks(value, date20050822, null)); // -1 day - assertEquals("week GT", 1, dateValidator.compareWeeks(value, date20050816, null)); // -1 week - - assertEquals("mnth LT", -1, dateValidator.compareMonths(value, date20050901, null)); // +1 month - assertEquals("mnth =1", 0, dateValidator.compareMonths(value, date20050830, null)); // +1 week - assertEquals("mnth =2", 0, dateValidator.compareMonths(value, date20050801, null)); // same month - assertEquals("mnth =3", 0, dateValidator.compareMonths(value, date20050816, null)); // -1 week - assertEquals("mnth GT", 1, dateValidator.compareMonths(value, date20050731, null)); // -1 month - - assertEquals("qtrA <1", -1, dateValidator.compareQuarters(value, date20051101, null)); // +1 quarter (Feb) - assertEquals("qtrA <2", -1, dateValidator.compareQuarters(value, date20051001, null)); // +1 quarter - assertEquals("qtrA =1", 0, dateValidator.compareQuarters(value, date20050901, null)); // +1 month - assertEquals("qtrA =2", 0, dateValidator.compareQuarters(value, date20050701, null)); // same quarter - assertEquals("qtrA =3", 0, dateValidator.compareQuarters(value, date20050731, null)); // -1 month - assertEquals("qtrA GT", 1, dateValidator.compareQuarters(value, date20050630, null)); // -1 quarter + assertEquals("date LT", -1, dateValidator.compareDates(value, date20050824, GMT)); // +1 day + assertEquals("date EQ", 0, dateValidator.compareDates(value, diffHour, GMT)); // same day, diff hour + assertEquals("date GT", 1, dateValidator.compareDates(value, date20050822, GMT)); // -1 day + + assertEquals("week LT", -1, dateValidator.compareWeeks(value, date20050830, GMT)); // +1 week + assertEquals("week =1", 0, dateValidator.compareWeeks(value, date20050824, GMT)); // +1 day + assertEquals("week =2", 0, dateValidator.compareWeeks(value, date20050822, GMT)); // same week + assertEquals("week =3", 0, dateValidator.compareWeeks(value, date20050822, GMT)); // -1 day + assertEquals("week GT", 1, dateValidator.compareWeeks(value, date20050816, GMT)); // -1 week + + assertEquals("mnth LT", -1, dateValidator.compareMonths(value, date20050901, GMT)); // +1 month + assertEquals("mnth =1", 0, dateValidator.compareMonths(value, date20050830, GMT)); // +1 week + assertEquals("mnth =2", 0, dateValidator.compareMonths(value, date20050801, GMT)); // same month + assertEquals("mnth =3", 0, dateValidator.compareMonths(value, date20050816, GMT)); // -1 week + assertEquals("mnth GT", 1, dateValidator.compareMonths(value, date20050731, GMT)); // -1 month + + assertEquals("qtrA <1", -1, dateValidator.compareQuarters(value, date20051101, GMT)); // +1 quarter (Feb) + assertEquals("qtrA <2", -1, dateValidator.compareQuarters(value, date20051001, GMT)); // +1 quarter + assertEquals("qtrA =1", 0, dateValidator.compareQuarters(value, date20050901, GMT)); // +1 month + assertEquals("qtrA =2", 0, dateValidator.compareQuarters(value, date20050701, GMT)); // same quarter + assertEquals("qtrA =3", 0, dateValidator.compareQuarters(value, date20050731, GMT)); // -1 month + assertEquals("qtrA GT", 1, dateValidator.compareQuarters(value, date20050630, GMT)); // -1 quarter // Change quarter 1 to start in Feb - assertEquals("qtrB LT", -1, dateValidator.compareQuarters(value, date20051101, null, 2)); // +1 quarter (Feb) - assertEquals("qtrB =1", 0, dateValidator.compareQuarters(value, date20051001, null, 2)); // same quarter - assertEquals("qtrB =2", 0, dateValidator.compareQuarters(value, date20050901, null, 2)); // +1 month - assertEquals("qtrB =3", 1, dateValidator.compareQuarters(value, date20050701, null, 2)); // same quarter - assertEquals("qtrB =4", 1, dateValidator.compareQuarters(value, date20050731, null, 2)); // -1 month - assertEquals("qtrB GT", 1, dateValidator.compareQuarters(value, date20050630, null, 2)); // -1 quarter - assertEquals("qtrB prev", 1, dateValidator.compareQuarters(value, date20050110, null, 2)); // Jan Prev year qtr - - assertEquals("year LT", -1, dateValidator.compareYears(value, date20060101, null)); // +1 year - assertEquals("year EQ", 0, dateValidator.compareYears(value, date20050101, null)); // same year - assertEquals("year GT", 1, dateValidator.compareYears(value, date20041231, null)); // -1 year + assertEquals("qtrB LT", -1, dateValidator.compareQuarters(value, date20051101, GMT, 2)); // +1 quarter (Feb) + assertEquals("qtrB =1", 0, dateValidator.compareQuarters(value, date20051001, GMT, 2)); // same quarter + assertEquals("qtrB =2", 0, dateValidator.compareQuarters(value, date20050901, GMT, 2)); // +1 month + assertEquals("qtrB =3", 1, dateValidator.compareQuarters(value, date20050701, GMT, 2)); // same quarter + assertEquals("qtrB =4", 1, dateValidator.compareQuarters(value, date20050731, GMT, 2)); // -1 month + assertEquals("qtrB GT", 1, dateValidator.compareQuarters(value, date20050630, GMT, 2)); // -1 quarter + assertEquals("qtrB prev", 1, dateValidator.compareQuarters(value, date20050110, GMT, 2)); // Jan Prev year qtr + + assertEquals("year LT", -1, dateValidator.compareYears(value, date20060101, GMT)); // +1 year + assertEquals("year EQ", 0, dateValidator.compareYears(value, date20050101, GMT)); // same year + assertEquals("year GT", 1, dateValidator.compareYears(value, date20041231, GMT)); // -1 year // Compare using alternative TimeZone Date sameDayTwoAm = createDate(GMT, testDate, 20000);