From cb677ee3bb1416762ef2efa767e10d87374d81c0 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 26 Jan 2005 18:59:10 +0000 Subject: [PATCH] r10281: 25 Jan 2005 Kevin Rosenberg * tests/*.lisp: Change Vladamir to Vladimir per Cyrus Harmons --- ChangeLog | 4 ++++ tests/test-fdml.lisp | 38 +++++++++++++++++++------------------- tests/test-init.lisp | 4 ++-- tests/test-oodml.lisp | 22 +++++++++++----------- 4 files changed, 36 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index a520d5f..47fc73d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +25 Jan 2005 Kevin Rosenberg + * tests/*.lisp: Change Vladamir to Vladimir per Cyrus Harmon's + suggestion. + 24 Jan 2005 Kevin Rosenberg * doc/bookinfo.xml, doc/csql.xml, doc/intro.xml: Update links now that LispWorks is an independant company [noted by diff --git a/tests/test-fdml.lisp b/tests/test-fdml.lisp index f067e1e..aa88777 100644 --- a/tests/test-fdml.lisp +++ b/tests/test-fdml.lisp @@ -96,14 +96,14 @@ :where [= [emplid] 1]) (progn (clsql:update-records [employee] - :av-pairs'((first_name "Vladamir") + :av-pairs'((first_name "Vladimir") (last_name "Lenin") (email "lenin@soviet.org")) :where [= [emplid] 1]) (clsql:select [first-name] [last-name] [email] :from [employee] :where [= [emplid] 1])))) (("Yuri" "Gagarin" "gagarin@soviet.org")) - (("Vladamir" "Lenin" "lenin@soviet.org"))) + (("Vladimir" "Lenin" "lenin@soviet.org"))) ;; updates a record using av-pairs and then deletes it (deftest :fdml/update/2 @@ -118,14 +118,14 @@ :where [= [emplid] 1]) (progn (clsql:update-records [employee] - :av-pairs'((first_name "Vladamir") + :av-pairs'((first_name "Vladimir") (last_name "Lenin") (email "lenin@soviet.org")) :where [= [emplid] 1]) (clsql:select [first-name] [last-name] [email] :from [employee] :where [= [emplid] 1])))) (("Yuri" "Gagarin" "gagarin@soviet.org")) - (("Vladamir" "Lenin" "lenin@soviet.org"))) + (("Vladimir" "Lenin" "lenin@soviet.org"))) ;; Computed values are not always classified as numeric by psqlodbc @@ -141,7 +141,7 @@ (clsql:query "SELECT FIRST_NAME,LAST_NAME FROM EMPLOYEE WHERE (EMPLID <= 5) ORDER BY LAST_NAME") (values rows (mapcar 'string-upcase field-names))) - (("Leonid" "Brezhnev") ("Nikita" "Kruschev") ("Vladamir" "Lenin") + (("Leonid" "Brezhnev") ("Nikita" "Kruschev") ("Vladimir" "Lenin") ("Josef" "Stalin") ("Leon" "Trotsky")) ("FIRST_NAME" "LAST_NAME")) @@ -161,7 +161,7 @@ (mapcar (lambda (p) (list (car p) (truncate (read-from-string (second p))))) res)) (("Josef" 2) ("Leon" 3) ("Nikita" 4) ("Leonid" 5) ("Yuri" 6) - ("Konstantin" 7) ("Mikhail" 8) ("Boris" 9) ("Vladamir" 11))) + ("Konstantin" 7) ("Mikhail" 8) ("Boris" 9) ("Vladimir" 11))) (deftest :fdml/query/6 (let ((res (clsql:query (clsql:sql [union [select [emplid] :from [employee]] @@ -227,7 +227,7 @@ :field-names nil :result-types nil :order-by [first-name]) - ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir" + ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladimir" "Yuri")) (deftest :fdml/select/3 @@ -239,7 +239,7 @@ (mapcar (lambda (p) (list (car p) (truncate (read-from-string (second p))))) res)) (("Boris" 1) ("Josef" 1) ("Konstantin" 1) ("Leon" 1) ("Leonid" 1) - ("Mikhail" 1) ("Nikita" 1) ("Vladamir" 2) ("Yuri" 1))) + ("Mikhail" 1) ("Nikita" 1) ("Vladimir" 2) ("Yuri" 1))) (deftest :fdml/select/4 (clsql:select [last-name] :from [employee] @@ -375,9 +375,9 @@ (deftest :fdml/select/22 (clsql:select [|| [first-name] " " [last-name]] :from [employee] :flatp t :order-by [emplid] :field-names nil) - ("Vladamir Lenin" "Josef Stalin" "Leon Trotsky" "Nikita Kruschev" + ("Vladimir Lenin" "Josef Stalin" "Leon Trotsky" "Nikita Kruschev" "Leonid Brezhnev" "Yuri Andropov" "Konstantin Chernenko" "Mikhail Gorbachev" - "Boris Yeltsin" "Vladamir Putin")) + "Boris Yeltsin" "Vladimir Putin")) (deftest :fdml/select/23 (clsql:select [emplid] :from [employee] :where [in [emplid] '(1 2 3 4)] @@ -388,7 +388,7 @@ (deftest :fdml/select/24 (clsql:select [distinct [first-name]] :from [employee] :flatp t :order-by [first-name] :field-names nil :result-types nil) - ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir" + ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladimir" "Yuri")) (deftest :fdml/select/25 @@ -397,7 +397,7 @@ :field-names nil :result-types nil :order-by [first-name]) - ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladamir" + ("Boris" "Josef" "Konstantin" "Leon" "Leonid" "Mikhail" "Nikita" "Vladimir" "Yuri")) (deftest :fdml/select/26 @@ -409,7 +409,7 @@ ["join" emplid]]]] :order-by '(["table" last-name]) :result-types nil :field-names nil) - (("Vladamir" "Lenin") ("Vladamir" "Putin"))) + (("Vladimir" "Lenin") ("Vladimir" "Putin"))) (deftest :fdml/select/27 (mapcar @@ -432,7 +432,7 @@ :order-by '(([first-name] :asc) ([last-name] :desc))) (("Boris" "Yeltsin") ("Josef" "Stalin") ("Konstantin" "Chernenko") ("Leon" "Trotsky") ("Leonid" "Brezhnev") ("Mikhail" "Gorbachev") - ("Nikita" "Kruschev") ("Vladamir" "Putin") ("Vladamir" "Lenin") + ("Nikita" "Kruschev") ("Vladimir" "Putin") ("Vladimir" "Lenin") ("Yuri" "Andropov"))) (deftest :fdml/select/30 @@ -441,7 +441,7 @@ :order-by '(([first-name] :asc) ([last-name] :asc))) (("Boris" "Yeltsin") ("Josef" "Stalin") ("Konstantin" "Chernenko") ("Leon" "Trotsky") ("Leonid" "Brezhnev") ("Mikhail" "Gorbachev") - ("Nikita" "Kruschev") ("Vladamir" "Lenin") ("Vladamir" "Putin") + ("Nikita" "Kruschev") ("Vladimir" "Lenin") ("Vladimir" "Putin") ("Yuri" "Andropov"))) (deftest :fdml/select/31 @@ -453,7 +453,7 @@ :field-names nil) ("Andropov" "Boris" "Brezhnev" "Chernenko" "Gorbachev" "Josef" "Konstantin" "Kruschev" "Lenin" "Leon" "Leonid" "Mikhail" "Nikita" "Putin" "Stalin" - "Trotsky" "Vladamir" "Yeltsin" "Yuri")) + "Trotsky" "Vladimir" "Yeltsin" "Yuri")) (deftest :fdml/select/32 (clsql:select [emplid] :from [employee] @@ -526,8 +526,8 @@ [select [first-name] [last-name] :from [employee] :order-by [last-name]]) (("Yuri" "Andropov") ("Leonid" "Brezhnev") ("Konstantin" "Chernenko") - ("Mikhail" "Gorbachev") ("Nikita" "Kruschev") ("Vladamir" "Lenin") - ("Vladamir" "Putin") ("Josef" "Stalin") ("Leon" "Trotsky") + ("Mikhail" "Gorbachev") ("Nikita" "Kruschev") ("Vladimir" "Lenin") + ("Vladimir" "Putin") ("Josef" "Stalin") ("Leon" "Trotsky") ("Boris" "Yeltsin"))) (deftest :fdml/loop/1 @@ -536,7 +536,7 @@ [select [first-name] [last-name] :from [employee] :order-by [last-name]] collect (concatenate 'string forename " " surname)) ("Yuri Andropov" "Leonid Brezhnev" "Konstantin Chernenko" "Mikhail Gorbachev" - "Nikita Kruschev" "Vladamir Lenin" "Vladamir Putin" + "Nikita Kruschev" "Vladimir Lenin" "Vladimir Putin" "Josef Stalin" "Leon Trotsky" "Boris Yeltsin")) (deftest :fdml/loop/2 diff --git a/tests/test-init.lisp b/tests/test-init.lisp index 84d09d3..d775054 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -259,7 +259,7 @@ :height (1+ (random 1.00)) :bd-utime *test-start-utime* :birthday now-time - :first-name "Vladamir" + :first-name "Vladimir" :last-name "Lenin" :email "lenin@soviet.org" :companyid 1) @@ -366,7 +366,7 @@ :height (1+ (random 1.00)) :bd-utime *test-start-utime* :birthday now-time - :first-name "Vladamir" + :first-name "Vladimir" :last-name "Putin" :email "putin@soviet.org" :managerid 1 diff --git a/tests/test-oodml.lisp b/tests/test-oodml.lisp index 78a379c..8bfdd36 100644 --- a/tests/test-oodml.lisp +++ b/tests/test-oodml.lisp @@ -50,11 +50,11 @@ " " (slot-value e 'last-name))) (clsql:select 'employee :where [= [slot-value 'employee 'first-name] - "Vladamir"] + "Vladimir"] :flatp t :order-by [last-name] :caching nil)) - ("Vladamir Lenin" "Vladamir Putin")) + ("Vladimir Lenin" "Vladimir Putin")) (deftest :oodml/select/5 (length (clsql:select 'employee :where [married] :flatp t :caching nil)) @@ -194,7 +194,7 @@ ": " (employee-email lenin)))) (progn - (setf (slot-value employee1 'first-name) "Vladamir" + (setf (slot-value employee1 'first-name) "Vladimir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") (clsql:update-records-from-instance employee1) @@ -209,9 +209,9 @@ (last-name lenin) ": " (employee-email lenin))))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Dimitriy Ivanovich: ivanovich@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-record-from-slot (deftest :oodml/update-records/2 @@ -270,7 +270,7 @@ ": " (employee-email lenin)))) (progn - (setf (slot-value employee1 'first-name) "Vladamir" + (setf (slot-value employee1 'first-name) "Vladimir" (slot-value employee1 'last-name) "Lenin" (slot-value employee1 'email) "lenin@soviet.org") (clsql:update-record-from-slots employee1 '(first-name last-name email)) @@ -285,9 +285,9 @@ (last-name lenin) ": " (employee-email lenin))))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Dimitriy Ivanovich: ivanovich@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-instance-from-records (deftest :oodml/update-instance/1 @@ -313,7 +313,7 @@ (slot-value employee1 'email))) (progn (clsql:update-records [employee] - :av-pairs '(([first-name] "Vladamir") + :av-pairs '(([first-name] "Vladimir") ([last-name] "Lenin") ([email] "lenin@soviet.org")) :where [= [emplid] 1]) @@ -324,9 +324,9 @@ (slot-value employee1 'last-name) ": " (slot-value employee1 'email)))) - "Vladamir Lenin: lenin@soviet.org" + "Vladimir Lenin: lenin@soviet.org" "Ivan Petrov: petrov@soviet.org" - "Vladamir Lenin: lenin@soviet.org") + "Vladimir Lenin: lenin@soviet.org") ;; tests update-slot-from-record (deftest :oodml/update-instance/2 -- 2.34.1