From cd64aa8907160d3a2c2d0e531c831f1db44c7a61 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 11 Apr 2004 13:09:01 +0000 Subject: [PATCH] r8962: properly handle object creation, close datatabase after use --- tests/new-test-init.lisp | 332 --------------------------------------- tests/test-init.lisp | 242 ++++++++++++++-------------- 2 files changed, 118 insertions(+), 456 deletions(-) delete mode 100644 tests/new-test-init.lisp diff --git a/tests/new-test-init.lisp b/tests/new-test-init.lisp deleted file mode 100644 index 48940a0..0000000 --- a/tests/new-test-init.lisp +++ /dev/null @@ -1,332 +0,0 @@ -;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;;;; ====================================================================== -;;;; File: test-init.lisp -;;;; Authors: Marcus Pearce , Kevin Rosenberg -;;;; Created: 30/03/2004 -;;;; Updated: $Id: test-init.lisp 8936 2004-04-11 02:49:49Z kevin $ -;;;; -;;;; Initialisation utilities for running regression tests on CLSQL. -;;;; -;;;; ====================================================================== - -(in-package #:clsql-tests) - -(defvar *rt-connection*) -(defvar *rt-fddl*) -(defvar *rt-fdml*) -(defvar *rt-ooddl*) -(defvar *rt-oodml*) -(defvar *rt-syntax*) - -(defvar *test-database-type* nil) -(defvar *test-database-user* nil) - -(defclass thing () - ((extraterrestrial :initform nil :initarg :extraterrestrial))) - -(def-view-class person (thing) - ((height :db-kind :base :accessor height :type float :nulls-ok t - :initarg :height) - (married :db-kind :base :accessor married :type boolean :nulls-ok t - :initarg :married) - (birthday :nulls-ok t :type clsql-base:wall-time :initarg :birthday) - (hobby :db-kind :virtual :initarg :hobby :initform nil))) - -(def-view-class employee (person) - ((emplid - :db-kind :key - :db-constraints :not-null - :nulls-ok nil - :type integer - :initarg :emplid) - (groupid - :db-kind :key - :db-constraints :not-null - :nulls-ok nil - :type integer - :initarg :groupid) - (first-name - :accessor first-name - :type (string 30) - :initarg :first-name) - (last-name - :accessor last-name - :type (string 30) - :initarg :last-name) - (email - :accessor employee-email - :type (string 100) - :nulls-ok t - :initarg :email) - (companyid - :type integer) - (company - :accessor employee-company - :db-kind :join - :db-info (:join-class company - :home-key companyid - :foreign-key companyid - :set nil)) - (managerid - :type integer - :nulls-ok t) - (manager - :accessor employee-manager - :db-kind :join - :db-info (:join-class employee - :home-key managerid - :foreign-key emplid - :set nil))) - (:base-table employee)) - -(def-view-class company () - ((companyid - :db-type :key - :db-constraints :not-null - :type integer - :initarg :companyid) - (groupid - :db-type :key - :db-constraints :not-null - :type integer - :initarg :groupid) - (name - :type (string 100) - :initarg :name) - (presidentid - :type integer) - (president - :reader president - :db-kind :join - :db-info (:join-class employee - :home-key presidentid - :foreign-key emplid - :set nil)) - (employees - :reader company-employees - :db-kind :join - :db-info (:join-class employee - :home-key (companyid groupid) - :foreign-key (companyid groupid) - :set t))) - (:base-table company)) - - - -(defun test-connect-to-database (database-type spec) - (setf *test-database-type* database-type) - (when (>= (length spec) 3) - (setq *test-database-user* (third spec))) - - ;; Connect to the database - (clsql:connect spec - :database-type database-type - :make-default t - :if-exists :old)) - -(defmacro with-ignore-errors (&rest forms) - `(progn - ,@(mapcar - (lambda (x) (list 'ignore-errors x)) - forms))) - -(defparameter company1 nil) -(defparameter employee1 nil) -(defparameter employee2 nil) -(defparameter employee3 nil) -(defparameter employee4 nil) -(defparameter employee5 nil) -(defparameter employee6 nil) -(defparameter employee7 nil) -(defparameter employee8 nil) -(defparameter employee9 nil) -(defparameter employee10 nil) - -(defun test-initialise-database () - ;; Create the tables for our view classes - (ignore-errors - (clsql:drop-view-from-class 'employee) - (clsql:drop-view-from-class 'company)) - (clsql:create-view-from-class 'employee) - (clsql:create-view-from-class 'company) - - (setf company1 (make-instance 'company - :companyid 1 - :groupid 1 - :name "Widgets Inc.") - employee1 (make-instance 'employee - :emplid 1 - :groupid 1 - :married t - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Lenin" - :email "lenin@soviet.org") - employee2 (make-instance 'employee - :emplid 2 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Josef" - :last-name "Stalin" - :email "stalin@soviet.org") - employee3 (make-instance 'employee - :emplid 3 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Leon" - :last-name "Trotsky" - :email "trotsky@soviet.org") - employee4 (make-instance 'employee - :emplid 4 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Nikita" - :last-name "Kruschev" - :email "kruschev@soviet.org") - - employee5 (make-instance 'employee - :emplid 5 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Leonid" - :last-name "Brezhnev" - :email "brezhnev@soviet.org") - - employee6 (make-instance 'employee - :emplid 6 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Yuri" - :last-name "Andropov" - :email "andropov@soviet.org") - employee7 (make-instance 'employee - :emplid 7 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Konstantin" - :last-name "Chernenko" - :email "chernenko@soviet.org") - employee8 (make-instance 'employee - :emplid 8 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Mikhail" - :last-name "Gorbachev" - :email "gorbachev@soviet.org") - employee9 (make-instance 'employee - :emplid 9 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Boris" - :last-name "Yeltsin" - :email "yeltsin@soviet.org") - employee10 (make-instance 'employee - :emplid 10 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Putin" - :email "putin@soviet.org")) - - ;; Lenin manages everyone - (clsql:add-to-relation employee2 'manager employee1) - (clsql:add-to-relation employee3 'manager employee1) - (clsql:add-to-relation employee4 'manager employee1) - (clsql:add-to-relation employee5 'manager employee1) - (clsql:add-to-relation employee6 'manager employee1) - (clsql:add-to-relation employee7 'manager employee1) - (clsql:add-to-relation employee8 'manager employee1) - (clsql:add-to-relation employee9 'manager employee1) - (clsql:add-to-relation employee10 'manager employee1) - ;; Everyone works for Widgets Inc. - (clsql:add-to-relation company1 'employees employee1) - (clsql:add-to-relation company1 'employees employee2) - (clsql:add-to-relation company1 'employees employee3) - (clsql:add-to-relation company1 'employees employee4) - (clsql:add-to-relation company1 'employees employee5) - (clsql:add-to-relation company1 'employees employee6) - (clsql:add-to-relation company1 'employees employee7) - (clsql:add-to-relation company1 'employees employee8) - (clsql:add-to-relation company1 'employees employee9) - (clsql:add-to-relation company1 'employees employee10) - ;; Lenin is president of Widgets Inc. - (clsql:add-to-relation company1 'president employee1) - ;; store these instances - (clsql:update-records-from-instance employee1) - (clsql:update-records-from-instance employee2) - (clsql:update-records-from-instance employee3) - (clsql:update-records-from-instance employee4) - (clsql:update-records-from-instance employee5) - (clsql:update-records-from-instance employee6) - (clsql:update-records-from-instance employee7) - (clsql:update-records-from-instance employee8) - (clsql:update-records-from-instance employee9) - (clsql:update-records-from-instance employee10) - (clsql:update-records-from-instance company1)) - -(defvar *error-count* 0) - -(defun run-tests () - (let ((specs (read-specs)) - (*error-count* 0)) - (unless specs - (warn "Not running tests because test configuration file is missing") - (return-from run-tests :skipped)) - (load-necessary-systems specs) - (dolist (db-type +all-db-types+) - (let ((spec (db-type-spec db-type specs))) - (when spec - (do-tests-for-backend spec db-type)))) - (zerop *error-count*))) - -(defun load-necessary-systems (specs) - (dolist (db-type +all-db-types+) - (when (db-type-spec db-type specs) - (db-type-ensure-system db-type)))) - -(defun do-tests-for-backend (spec db-type) - (format t - "~& -******************************************************************* -*** Running CLSQL tests with ~A backend. -******************************************************************* -" db-type) - (regression-test:rem-all-tests) - - ;; Tests of clsql-base - (ignore-errors (destroy-database spec :database-type db-type)) - (ignore-errors (create-database spec :database-type db-type)) - (with-tests (:name "CLSQL") - (test-basic spec db-type)) - (incf *error-count* *test-errors*) - - (ignore-errors (destroy-database spec :database-type db-type)) - (ignore-errors (create-database spec :database-type db-type)) - (dolist (test (append *rt-connection* *rt-fddl* *rt-fdml* - *rt-ooddl* *rt-oodml* *rt-syntax*)) - (eval test)) - (test-connect-to-database db-type spec) - (test-initialise-database) - (let ((remaining (rtest:do-tests))) - (when (consp remaining) - (incf *error-count* (length remaining))))) - diff --git a/tests/test-init.lisp b/tests/test-init.lisp index 1d41ea7..0f4180a 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -111,110 +111,7 @@ :set t))) (:base-table company)) -(defparameter company1 (make-instance 'company - :companyid 1 - :groupid 1 - :name "Widgets Inc.")) -(defparameter employee1 (make-instance 'employee - :emplid 1 - :groupid 1 - :married t - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Lenin" - :email "lenin@soviet.org")) - -(defparameter employee2 (make-instance 'employee - :emplid 2 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Josef" - :last-name "Stalin" - :email "stalin@soviet.org")) - -(defparameter employee3 (make-instance 'employee - :emplid 3 - :groupid 1 - :height (1+ (random 1.00)) - :married t - :birthday (clsql-base:get-time) - :first-name "Leon" - :last-name "Trotsky" - :email "trotsky@soviet.org")) - -(defparameter employee4 (make-instance 'employee - :emplid 4 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Nikita" - :last-name "Kruschev" - :email "kruschev@soviet.org")) - -(defparameter employee5 (make-instance 'employee - :emplid 5 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Leonid" - :last-name "Brezhnev" - :email "brezhnev@soviet.org")) - -(defparameter employee6 (make-instance 'employee - :emplid 6 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Yuri" - :last-name "Andropov" - :email "andropov@soviet.org")) - -(defparameter employee7 (make-instance 'employee - :emplid 7 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Konstantin" - :last-name "Chernenko" - :email "chernenko@soviet.org")) - -(defparameter employee8 (make-instance 'employee - :emplid 8 - :groupid 1 - :height (1+ (random 1.00)) - :married nil - :birthday (clsql-base:get-time) - :first-name "Mikhail" - :last-name "Gorbachev" - :email "gorbachev@soviet.org")) - -(defparameter employee9 (make-instance 'employee - :emplid 9 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Boris" - :last-name "Yeltsin" - :email "yeltsin@soviet.org")) - -(defparameter employee10 (make-instance 'employee - :emplid 10 - :groupid 1 - :married nil - :height (1+ (random 1.00)) - :birthday (clsql-base:get-time) - :first-name "Vladamir" - :last-name "Putin" - :email "putin@soviet.org")) (defun test-connect-to-database (database-type spec) (setf *test-database-type* database-type) @@ -223,9 +120,9 @@ ;; Connect to the database (clsql:connect spec - :database-type database-type - :make-default t - :if-exists :old)) + :database-type database-type + :make-default t + :if-exists :old)) (defmacro with-ignore-errors (&rest forms) `(progn @@ -233,26 +130,123 @@ (lambda (x) (list 'ignore-errors x)) forms))) +(defparameter company1 nil) +(defparameter employee1 nil) +(defparameter employee2 nil) +(defparameter employee3 nil) +(defparameter employee4 nil) +(defparameter employee5 nil) +(defparameter employee6 nil) +(defparameter employee7 nil) +(defparameter employee8 nil) +(defparameter employee9 nil) +(defparameter employee10 nil) + (defun test-initialise-database () - ;; Delete the instance records - (with-ignore-errors - (clsql:delete-instance-records company1) - (clsql:delete-instance-records employee1) - (clsql:delete-instance-records employee2) - (clsql:delete-instance-records employee3) - (clsql:delete-instance-records employee4) - (clsql:delete-instance-records employee5) - (clsql:delete-instance-records employee6) - (clsql:delete-instance-records employee7) - (clsql:delete-instance-records employee8) - (clsql:delete-instance-records employee9) - (clsql:delete-instance-records employee10) - ;; Drop the required tables if they exist - (clsql:drop-view-from-class 'employee) - (clsql:drop-view-from-class 'company)) ;; Create the tables for our view classes + (ignore-errors + (clsql:drop-view-from-class 'employee) + (clsql:drop-view-from-class 'company)) (clsql:create-view-from-class 'employee) (clsql:create-view-from-class 'company) + + (setf company1 (make-instance 'company + :companyid 1 + :groupid 1 + :name "Widgets Inc.") + employee1 (make-instance 'employee + :emplid 1 + :groupid 1 + :married t + :height (1+ (random 1.00)) + :birthday (clsql-base:get-time) + :first-name "Vladamir" + :last-name "Lenin" + :email "lenin@soviet.org") + employee2 (make-instance 'employee + :emplid 2 + :groupid 1 + :height (1+ (random 1.00)) + :married t + :birthday (clsql-base:get-time) + :first-name "Josef" + :last-name "Stalin" + :email "stalin@soviet.org") + employee3 (make-instance 'employee + :emplid 3 + :groupid 1 + :height (1+ (random 1.00)) + :married t + :birthday (clsql-base:get-time) + :first-name "Leon" + :last-name "Trotsky" + :email "trotsky@soviet.org") + employee4 (make-instance 'employee + :emplid 4 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql-base:get-time) + :first-name "Nikita" + :last-name "Kruschev" + :email "kruschev@soviet.org") + + employee5 (make-instance 'employee + :emplid 5 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql-base:get-time) + :first-name "Leonid" + :last-name "Brezhnev" + :email "brezhnev@soviet.org") + + employee6 (make-instance 'employee + :emplid 6 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql-base:get-time) + :first-name "Yuri" + :last-name "Andropov" + :email "andropov@soviet.org") + employee7 (make-instance 'employee + :emplid 7 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql-base:get-time) + :first-name "Konstantin" + :last-name "Chernenko" + :email "chernenko@soviet.org") + employee8 (make-instance 'employee + :emplid 8 + :groupid 1 + :height (1+ (random 1.00)) + :married nil + :birthday (clsql-base:get-time) + :first-name "Mikhail" + :last-name "Gorbachev" + :email "gorbachev@soviet.org") + employee9 (make-instance 'employee + :emplid 9 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql-base:get-time) + :first-name "Boris" + :last-name "Yeltsin" + :email "yeltsin@soviet.org") + employee10 (make-instance 'employee + :emplid 10 + :groupid 1 + :married nil + :height (1+ (random 1.00)) + :birthday (clsql-base:get-time) + :first-name "Vladamir" + :last-name "Putin" + :email "putin@soviet.org")) + ;; Lenin manages everyone (clsql:add-to-relation employee2 'manager employee1) (clsql:add-to-relation employee3 'manager employee1) @@ -334,6 +328,6 @@ (test-initialise-database) (let ((remaining (rtest:do-tests))) (when (consp remaining) - (incf *error-count* (length remaining))))) - + (incf *error-count* (length remaining)))) + (disconnect)) -- 2.34.1