From 890559aea41b58b6ae39cd477ff7ea671da2d20a Mon Sep 17 00:00:00 2001 From: tailor Date: Mon, 25 Jan 2010 12:25:30 +0000 Subject: [PATCH] [project @ fix test adjust-timestamp/bug2 (PLEASE AUDIT!)] --- src/local-time.lisp | 2 +- tests/tests.lisp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/local-time.lisp b/src/local-time.lisp index 17327709..0ac3b243 100644 --- a/src/local-time.lisp +++ b/src/local-time.lisp @@ -857,7 +857,7 @@ the previous day given by OFFSET." (safe-adjust (part offset time) (with-decoded-timestamp (:nsec nsec :sec sec :minute minute :hour hour :day day - :month month :year year :timezone timezone) + :month month :year year :timezone timezone :offset utc-offset) time (multiple-value-bind (month-new year-new) (%normalize-month-year-pair diff --git a/tests/tests.lisp b/tests/tests.lisp index f94a2b43..3109cb2a 100644 --- a/tests/tests.lisp +++ b/tests/tests.lisp @@ -306,17 +306,20 @@ (test adjust-timestamp/bug1 (let* ((timestamp (parse-timestring "2006-01-01T00:00:00Z")) (modified-timestamp (adjust-timestamp timestamp (offset :year 1)))) - (timestamp= (parse-timestring "2007-01-01T00:00:00Z") modified-timestamp))) + (is (timestamp= (parse-timestring "2007-01-01T00:00:00Z") modified-timestamp)))) (test adjust-timestamp/bug2 (let* ((timestamp (parse-timestring "2009-03-01T01:00:00.000000+00:00")) (modified-timestamp (adjust-timestamp timestamp (offset :month 1)))) - (timestamp= (parse-timestring "2009-04-01T01:00:00.000000+00:00") modified-timestamp))) + (is (timestamp= (parse-timestring "2009-04-01T01:00:00.000000+00:00") modified-timestamp)))) (test adjust-timestamp/bug3 (let* ((timestamp (parse-timestring "2009-03-01T01:00:00.000000+00:00")) (modified-timestamp (adjust-timestamp timestamp (offset :day-of-week :monday)))) - (timestamp= (parse-timestring "2009-02-23T01:00:00.000000+00:00") modified-timestamp))) + (is (timestamp= (parse-timestring "2009-02-23T01:00:00.000000+00:00") modified-timestamp))) + (let* ((timestamp (parse-timestring "2009-03-04T01:00:00.000000+00:00")) + (modified-timestamp (adjust-timestamp timestamp (offset :day-of-week :monday)))) + (is (timestamp= (parse-timestring "2009-03-02T01:00:00.000000+00:00") modified-timestamp)))) #+nil (test adjust-days