[climacs-cvs] CVS update: climacs/base-test.lisp climacs/buffer-test.lisp

[Aleksandar Bakic]

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv20153

Modified Files:
	base-test.lisp buffer-test.lisp 
Log Message:
Updated persistent buffers and tests to catch up with recent changes.

Date: Fri Feb 25 21:45:08 2005
Author: abakic

Index: climacs/base-test.lisp
diff -u climacs/base-test.lisp:1.10 climacs/base-test.lisp:1.11
--- climacs/base-test.lisp:1.10	Sat Feb 12 16:34:46 2005
+++ climacs/base-test.lisp	Fri Feb 25 21:45:07 2005
@@ -8,20 +8,22 @@
 (defmultitest previous-line.test-1
   (let ((buffer (make-instance %%buffer)))
     (insert-buffer-sequence buffer 0 "climacs
+climacs
 climacs")
     (let ((mark (make-instance %%left-sticky-mark
-			       :buffer buffer :offset 8)))
-      (previous-line mark)
+			       :buffer buffer :offset 16)))
+      (previous-line mark nil 2)
       (offset mark)))
   0)
 
 (defmultitest previous-line.test-2
   (let ((buffer (make-instance %%buffer)))
     (insert-buffer-sequence buffer 0 "climacs
+climacs
 climacs")
     (let ((mark (make-instance %%right-sticky-mark
-			       :buffer buffer :offset 11)))
-      (previous-line mark 2)
+			       :buffer buffer :offset 19)))
+      (previous-line mark 2 2)
       (offset mark)))
   2)
 
@@ -78,22 +80,24 @@
 (defmultitest next-line.test-1
   (let ((buffer (make-instance %%buffer)))
     (insert-buffer-sequence buffer 0 "climacs
+climacs
 climacs")
     (let ((mark (make-instance %%left-sticky-mark
 			       :buffer buffer :offset 6)))
-      (next-line mark)
+      (next-line mark nil 2)
       (offset mark)))
-  14)
+  22)
 
 (defmultitest next-line.test-2
   (let ((buffer (make-instance %%buffer)))
     (insert-buffer-sequence buffer 0 "climacs
+climacs
 climacs")
     (let ((mark (make-instance %%right-sticky-mark
 			       :buffer buffer :offset 3)))
-      (next-line mark 2)
+      (next-line mark 2 2)
       (offset mark)))
-  10)
+  18)
 
 (defmultitest next-line.test-3
   (let ((buffer (make-instance %%buffer)))
@@ -150,9 +154,10 @@
     (insert-buffer-sequence buffer 0 "climacs")
     (let ((mark (make-instance %%left-sticky-mark
 			       :buffer buffer :offset 0)))
-      (open-line mark)
+      (open-line mark 2)
       (values (buffer-sequence buffer 0 (size buffer)) (offset mark))))
   "
+
 climacs" 0)
 
 (defmultitest open-line.test-2


Index: climacs/buffer-test.lisp
diff -u climacs/buffer-test.lisp:1.16 climacs/buffer-test.lisp:1.17
--- climacs/buffer-test.lisp:1.16	Fri Feb 25 08:11:24 2005
+++ climacs/buffer-test.lisp	Fri Feb 25 21:45:07 2005
@@ -55,7 +55,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(make-instance %%left-sticky-mark :buffer buffer :offset 1))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 1)))
   t)
 
@@ -63,7 +63,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(make-instance %%right-sticky-mark :buffer buffer :offset 1))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 1)))
   t)
 
@@ -137,7 +137,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(insert-buffer-object buffer -1 #\a))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)
 
@@ -171,7 +171,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(insert-buffer-sequence buffer 1 "climacs"))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 1)))
   t)
 
@@ -179,7 +179,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(insert-buffer-sequence buffer -1 "climacs"))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)
 
@@ -225,7 +225,7 @@
       (let ((buffer (make-instance %%buffer)))
 	(insert-buffer-sequence buffer 0 "climacs")
 	(delete-buffer-range buffer -1 0))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)
 
@@ -234,7 +234,7 @@
       (let ((buffer (make-instance %%buffer)))
 	(insert-buffer-sequence buffer 0 "climacs")
 	(delete-buffer-range buffer 6 2))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 8)))
   t)
 
@@ -482,7 +482,7 @@
 	(let ((m (make-instance %%left-sticky-mark
 				:buffer buffer :offset 4)))
 	  (setf (offset m) -1)))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)
 
@@ -493,7 +493,7 @@
 	(let ((m (make-instance %%left-sticky-mark
 				:buffer buffer :offset 4)))
 	  (setf (offset m) 8)))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 8)))
   t)
 
@@ -516,7 +516,7 @@
 	       (m2 (clone-mark m1)))
 	  (backward-object m1 3)
 	  (region-to-sequence m1 m2)))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)
 
@@ -539,7 +539,7 @@
 	       (m2 (clone-mark m1)))
 	  (forward-object m1 3)
 	  (region-to-sequence m1 m2)))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-after-end (c)
       (= (climacs-buffer::condition-offset c) 9)))
   t)
 
@@ -554,7 +554,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(setf (buffer-object buffer 0) #\a))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::offset-after-end (c)
       (= (climacs-buffer::condition-offset c) 0)))
   t)
 
@@ -562,7 +562,7 @@
   (handler-case
       (let ((buffer (make-instance %%buffer)))
 	(setf (buffer-object buffer -1) #\a))
-    (climacs-buffer::no-such-offset (c)
+    (climacs-buffer::motion-before-beginning (c)
       (= (climacs-buffer::condition-offset c) -1)))
   t)