X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-connection.lisp;h=6c3bc97d6d4316ae75386f13b8e41f51d1a87686;hb=650466772f9eefbafd68fa66a4f5e5b4efd14c3a;hp=2952444743c80c1f763573d56c1a037e48b785c8;hpb=70227e5f0b76bb649fc6c1a478d7374953fd815b;p=clsql.git

diff --git a/tests/test-connection.lisp b/tests/test-connection.lisp
index 2952444..6c3bc97 100644
--- a/tests/test-connection.lisp
+++ b/tests/test-connection.lisp
@@ -1,28 +1,52 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; ======================================================================
 ;;;; File:    test-connection.lisp
-;;;; Author:  Marcus Pearce <m.t.pearce@city.ac.uk>
+;;;; Authors: Marcus Pearce <m.t.pearce@city.ac.uk>, Kevin Rosenberg
 ;;;; Created: 30/03/2004
 ;;;; Updated: $Id$
-;;;; ======================================================================
 ;;;;
-;;;; Description ==========================================================
-;;;; ======================================================================
+;;;; Tests for CLSQL database connections.
 ;;;;
-;;;; Tests for CLSQL database connections. 
+;;;; This file is part of CLSQL.
 ;;;;
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; ======================================================================
 
 (in-package #:clsql-tests)
 
 (setq *rt-connection*
       '(
-	
+
 (deftest :connection/1
     (let ((database (clsql:find-database
                      (clsql:database-name clsql:*default-database*)
-                     :db-type (clsql:database-type clsql:*default-database*))))
-      (eql (clsql:database-type database) *test-database-type*))
+                     :db-type (clsql-sys:database-type clsql:*default-database*))))
+      (eql (clsql-sys:database-type database) *test-database-type*))
   t)
 
+(deftest :connection/2
+    (clsql-sys::string-to-list-connection-spec
+     "localhost/dbname/user/passwd")
+  ("localhost" "dbname" "user" "passwd"))
+
+(deftest :connection/3
+    (clsql-sys::string-to-list-connection-spec
+     "dbname/user@hostname")
+  ("hostname" "dbname" "user"))
+
+(deftest :db/1
+    (let ((inner-db-same)
+          (original-a)
+          (outer-db-unchanged))
+      (print "test-connection-spec")
+      (print *test-connection-spec*)
+      (clsql:with-database (a '*test-connection-spec* :database-type *test-connection-db-type*)
+        (setq original-a a)
+        (clsql:with-database (b '*test-connection-spec* :database-type *test-connection-db-type*)
+          (setq inner-db-same (eq a b)))
+        (setq outer-db-unchanged (eq a original-a))))
+  t t)
+
 ))