X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-time.lisp;h=5d2e2e580992bc2cc3a24a912ce751532ee842e0;hb=2d6d03a10087483843856e09f5204b1b172fbea6;hp=9a9136f1698ea10f798f17ced7bf17fb10ccf52e;hpb=0364b03f9b49590d89156c2fa6c8718ed7804b07;p=clsql.git

diff --git a/tests/test-time.lisp b/tests/test-time.lisp
index 9a9136f..5d2e2e5 100644
--- a/tests/test-time.lisp
+++ b/tests/test-time.lisp
@@ -37,6 +37,38 @@
 (setq *rt-time*
       '(
 
+;; we use parse timestring a lot through here verifying other things
+;; start off just checking that.
+(deftest :time/iso-parse/0
+    (let* ((time1 (parse-timestring "2010-01-23")))
+      (decode-time time1))
+  0 0 0 0 23 1 2010 6)
+
+(deftest :time/iso-parse/1
+    (let* ((time1 (parse-timestring "2010-01-23T14:56:32Z")))
+      (decode-time time1))
+  0 32 56 14 23 1 2010 6)
+
+(deftest :time/iso-parse/2
+    (let* ((time1 (parse-timestring "2008-02-29 12:46:32")))
+      (decode-time time1))
+  0 32 46 12 29 2 2008 5)
+
+(deftest :time/iso-parse/3
+    (let* ((time1 (parse-timestring "2010-01-23 14:56:32.44")))
+      (decode-time time1))
+  440000 32 56 14 23 1 2010 6)
+
+(deftest :time/iso-parse/4
+    (let* ((time1 (parse-timestring "2010-01-23 14:56:32.0044")))
+      (decode-time time1))
+  4400 32 56 14 23 1 2010 6)
+
+(deftest :time/iso-parse/5
+    (let* ((time1 (parse-timestring "2010-01-23 14:56:32.000003")))
+      (decode-time time1))
+  3 32 56 14 23 1 2010 6)
+
 ;; relations of intervals
 (deftest :time/1
     (let* ((time-1 (clsql:parse-timestring "2002-01-01 10:00:00"))
@@ -330,39 +362,37 @@
 
 
 (deftest :time/pg/fdml/usec
-    (with-dataset *ds-datetest*
-      (let ((time (parse-timestring "2008-09-09T14:37:29.000213-04:00")))
-	(clsql-sys:insert-records :into [datetest]
-				  :attributes '([testtimetz] [testtime])
-				  :values (list time time))
-	(destructuring-bind (testtimetz testtime)
-	    (first (clsql:select [testtimetz] [testtime]
-				 :from [datetest]
-				 :limit 1 :flatp T
-				 :where [= [testtime] time] ))
-	  (assert (time= (parse-timestring testtimetz) time) (testtimetz time)
-		  "Timetz of db: ~s should be time:~s" testtimetz time)
-	  (assert (time= (parse-timestring testtime) time) (testtime time)
-		  "Time of db: ~s should be time:~s" testtime time))))
-  nil)
+  (with-dataset *ds-datetest*
+    (let ((time (parse-timestring "2008-09-09T14:37:29.000213-04:00")))
+      (clsql-sys:insert-records :into [datetest]
+				:attributes '([testtimetz] [testtime])
+				:values (list time time))
+      (destructuring-bind (testtimetz testtime)
+	  (first (clsql:select [testtimetz] [testtime]
+			       :from [datetest]
+			       :limit 1 :flatp T
+			       :where [= [testtime] time] ))
+	(values (iso-timestring (parse-timestring testtime))
+		(iso-timestring (parse-timestring testtimetz))))))
+  #.(iso-timestring (parse-timestring "2008-09-09T14:37:29.000213-04:00"))
+  #.(iso-timestring (parse-timestring "2008-09-09T14:37:29.000213-04:00")))
 
 (deftest :time/pg/oodml/no-usec
-    (with-dataset *ds-datetest*
-      (let ((time (parse-timestring "2008-09-09T14:37:29-04:00")))
-	(clsql-sys:update-records-from-instance
-	 (make-instance 'datetest :testtimetz time :testtime time))
-	(let ((o (first (clsql:select
-			 'datetest
-			 :limit 1 :flatp T
-			 :where [= [testtime] time] ))))
-	  (assert o (o) "o shouldnt be null here (we should have just inserted)")
-	  (update-records-from-instance o)
-	  (update-instance-from-records o)
-	  (assert (time= (testtime o) time) (time o)
-		  "Time of o: ~s should be time:~s" (testtime o) time)
-	  (assert (time= (testtimetz o) time) (time o)
-		  "Timetz of o: ~s should be time:~s" (testtime o) time))))
-  nil)
+  (with-dataset *ds-datetest*
+    (let ((time (parse-timestring "2008-09-09T14:37:29-04:00")))
+      (clsql-sys:update-records-from-instance
+       (make-instance 'datetest :testtimetz time :testtime time))
+      (let ((o (first (clsql:select
+			  'datetest
+			:limit 1 :flatp T
+			:where [= [testtime] time] ))))
+	(assert o (o) "o shouldnt be null here (we should have just inserted)")
+	(update-records-from-instance o)
+	(update-instance-from-records o)
+	(values (iso-timestring (testtime o))
+		(iso-timestring (testtimetz o))))))
+  #.(iso-timestring (parse-timestring "2008-09-09T14:37:29-04:00"))
+  #.(iso-timestring (parse-timestring "2008-09-09T14:37:29-04:00")))
 
 (deftest :time/pg/oodml/usec
     (with-dataset *ds-datetest*
@@ -376,12 +406,11 @@
 	  (assert o (o) "o shouldnt be null here (we should have just inserted)")
 	  (update-records-from-instance o)
 	  (update-instance-from-records o)
-	  (assert (time= (testtime o) time) (time o)
-		  "Time of o: ~s should be time:~s" (testtime o) time)
-	  (assert (time= (testtimetz o) time) (time o)
-		  "Timetz of o: ~s should be time:~s" (testtime o) time)
+	  (values (iso-timestring (testtime o))
+		  (iso-timestring (testtimetz o)))
 	  )))
-  nil)
+    #.(iso-timestring (parse-timestring "2008-09-09T14:37:29.000278-04:00"))
+    #.(iso-timestring (parse-timestring "2008-09-09T14:37:29.000278-04:00")))
 
 ))