Sun Dec 13 13:45:36 CET 2009 Tobias Rautenkranz * Support ASDF instead of Mudballs. diff -rN -u old-qt.tests/src/abort.lisp new-qt.tests/src/abort.lisp --- old-qt.tests/src/abort.lisp 2014-10-30 07:55:22.000000000 +0100 +++ new-qt.tests/src/abort.lisp 2014-10-30 07:55:22.000000000 +0100 @@ -80,3 +80,11 @@ (cxx:start timer 0) (qt:core-application.process-events)) (5am:is (eq t continued-p))))) + + +(5am:test msg-handler + "Test catching Q_ASSERTS." + (5am:signals error + (qt:qt-assert ":qt.tests msg-handler test assert" + "abort.lisp" + -1))) diff -rN -u old-qt.tests/src/gc.lisp new-qt.tests/src/gc.lisp --- old-qt.tests/src/gc.lisp 2014-10-30 07:55:22.000000000 +0100 +++ new-qt.tests/src/gc.lisp 2014-10-30 07:55:22.000000000 +0100 @@ -10,7 +10,7 @@ It is not required that every instance is gc'ed, since this rarely happens and is not a bug." (let ((objects nil)) - (dotimes (x 10) + (dotimes (x 30) (let ((object (make-instance class))) (push (make-weak-pointer object) objects))) diff -rN -u old-qt.tests/src/qbytearray.lisp new-qt.tests/src/qbytearray.lisp --- old-qt.tests/src/qbytearray.lisp 2014-10-30 07:55:22.000000000 +0100 +++ new-qt.tests/src/qbytearray.lisp 2014-10-30 07:55:22.000000000 +0100 @@ -11,12 +11,14 @@ (5am:for-all ((string (5am:gen-string))) (5am:is (string= string (cxx:data (make-instance 'qt:byte-array - :args (list string))))))) + :arg0 string)))))) (5am:test const-bytearray "Test const QByteArray." - (let ((const-array (qt:operator+ (make-instance 'qt:byte-array) - (make-instance 'qt:byte-array)))) - (5am:is (typep (cxx:operator[] (make-instance 'qt:byte-array) 0) + ;; Const operator[] returns a char, but the non const version a QByteRef. + ;; Using this to test constnes overload resolution. + (let ((const-array (qt:operator+ (make-instance 'qt:byte-array :arg0 "a") + (make-instance 'qt:byte-array :arg0 "b")))) + (5am:is (typep (cxx:operator[] (make-instance 'qt:byte-array :arg0 "a") 0) 'qt:byte-ref)) - (5am:is (eql #\Null (cxx:operator[] const-array 0))))) + (5am:is (eql #\a (cxx:operator[] const-array 0))))) diff -rN -u old-qt.tests/test.lisp new-qt.tests/test.lisp --- old-qt.tests/test.lisp 2014-10-30 07:55:22.000000000 +0100 +++ new-qt.tests/test.lisp 2014-10-30 07:55:22.000000000 +0100 @@ -1,25 +1,9 @@ #| exec -a "$0" sbcl --noinform --noprint --disable-debugger --load $0 --end-toplevel-options "$@" -# do not use --script to allow loading mudballs with ${HOME}/.sbclrc # Used for testing on darcs record. |# - -(in-package :sysdef-user) - -(defun load-sysdef (pathname system) - (load pathname) - (setf (mb.sysdef::pathname-of (find-system system)) pathname)) - -(defun load-sysdef-file (system-name) - "Loads a mbd file in the current directory." - (load-sysdef (make-pathname :defaults *default-pathname-defaults* - :name (string-downcase system-name) - :type "mbd") - system-name)) - -(load-sysdef-file :qt.tests) -(mb:clean :qt.tests) -(mb:test :qt.tests) +(adsf:operate 'asdf:load-op :qt.tests) +(adsf:operate 'asdf:test-op :qt.tests) (sb-ext:quit) diff -rN -u old-qt.tests/tests/test.lisp new-qt.tests/tests/test.lisp --- old-qt.tests/tests/test.lisp 2014-10-30 07:55:22.000000000 +0100 +++ new-qt.tests/tests/test.lisp 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -(in-package :qt.tests) - -(run)