Sun Jan 10 09:57:03 CET 2010 Tobias Rautenkranz <tobias@rautenkranz.ch>
* ASDF & modular smoke.
diff -rN -u old-qt.tests/cl-smoke.qt.tests.asd new-qt.tests/cl-smoke.qt.tests.asd
--- old-qt.tests/cl-smoke.qt.tests.asd 1970-01-01 01:00:00.000000000 +0100
+++ new-qt.tests/cl-smoke.qt.tests.asd 2014-10-30 07:02:41.000000000 +0100
@@ -0,0 +1,30 @@
+(defsystem :cl-smoke.qt.tests
+ :name :cl-smoke.qt.tests
+ :version (0 0 1)
+ :author "Tobias Rautenkranz"
+ :license "GPL with linking exception"
+ :description "Qt unit tests."
+ :depends-on (:cl-smoke.qt.test :cl-smoke.qt.gui :FiveAM :trivial-garbage :cl-smoke.smoke)
+
+ :components
+ ((:module "src"
+ :components
+ ((:file "package")
+ (:file "tests" :depends-on ("package"))
+ (:file "qbytearray" :depends-on ("tests"))
+ (:file "qstring" :depends-on ("tests"))
+ (:file "overload" :depends-on ("tests"))
+ (:file "gc" :depends-on ("tests" "object"))
+ (:file "variant" :depends-on ("tests"))
+ (:file "application" :depends-on ("tests"))
+ (:file "signal-slot" :depends-on ("tests"))
+ (:file "operators" :depends-on ("tests"))
+ (:file "undo" :depends-on ("tests"))
+ (:file "abort" :depends-on ("tests"))
+ (:file "object" :depends-on ("tests"))
+ (:file "thread" :depends-on ("tests"))
+ (:file "properties" :depends-on ("tests"))
+ (:file "click" :depends-on ("tests"))))))
+
+(defmethod perform ((operation test-op) (c (eql (find-system :cl-smoke.qt.tests))))
+ (funcall (intern (string :run) (string :qt.tests))))
diff -rN -u old-qt.tests/qt.tests.mbd new-qt.tests/qt.tests.mbd
--- old-qt.tests/qt.tests.mbd 2014-10-30 07:02:41.000000000 +0100
+++ new-qt.tests/qt.tests.mbd 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-;;;; -*- Mode: lisp; indent-tabs-mode: nil -*-
-
-(in-package :sysdef-user)
-
-(define-system :qt.tests ()
- (:version 0 0 1)
- (:documentation "Qt unit tests.")
- (:author "Tobias Rautenkranz")
- (:license "GPL with linking exception")
- (:needs :qt :qt.test :FiveAM :trivial-garbage)
- (:uses-macros-from :smoke)
- (:components
- ("src" module
- (:components
- "package"
- ("tests" (:needs "package"))
- ("qbytearray" (:needs "tests"))
- ("qstring" (:needs "tests"))
- ("overload" (:needs "tests"))
- ("gc" (:needs "tests" "object"))
- ("variant" (:needs "tests"))
- ("application" (:needs "tests"))
- ("signal-slot" (:needs "tests"))
- ("operators" (:needs "tests"))
- ("undo" (:needs "tests"))
- ("abort" (:needs "tests"))
- ("object" (:needs "tests"))
- ("thread" (:needs "tests"))
- ("properties" (:needs "tests"))
- ("click" (:needs "tests"))))))
diff -rN -u old-qt.tests/src/application.lisp new-qt.tests/src/application.lisp
--- old-qt.tests/src/application.lisp 2014-10-30 07:02:41.000000000 +0100
+++ new-qt.tests/src/application.lisp 2014-10-30 07:02:41.000000000 +0100
@@ -11,11 +11,13 @@
(if core-p
(qt:with-core-app ()
(5am:is (eql t (qt:app-p)))
- (5am:is (typep (qt:app) (find-class 'qt:core-application)))
+ (5am:is (string= "QCoreApplication"
+ (cxx:class-name (cxx:meta-object (qt:app)))))
(setf (cxx:object-name (qt:app)) "core-app")) ;; test for memfault
(qt:with-app ()
(5am:is (eql t (qt:app-p)))
- (5am:is (typep (qt:app) (find-class 'qt:application)))
+ (5am:is (string= "QApplication"
+ (cxx:class-name (cxx:meta-object (qt:app)))))
(setf (cxx:object-name (qt:app)) "app")))
(unless nested
(5am:is (eql nil (qt:app-p)))))))
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:02:41.000000000 +0100
+++ new-qt.tests/src/qbytearray.lisp 2014-10-30 07:02:41.000000000 +0100
@@ -8,6 +8,11 @@
(5am:test bytearray
"Test string <-> QByteArray."
+ (5am:for-all ((string (5am:gen-one-element "" "Foo" "bar" "öäü" "1234")))
+ (5am:is (string= string
+ (cxx:data (make-instance 'qt:byte-array
+ :arg0 string)))))
+ #-openmcl ;; FIXME utf-8 problems with Clozure cl?
(5am:for-all ((string (5am:gen-string)))
(5am:is (string= string
(cxx:data (make-instance 'qt:byte-array
diff -rN -u old-qt.tests/src/signal-slot.lisp new-qt.tests/src/signal-slot.lisp
--- old-qt.tests/src/signal-slot.lisp 2014-10-30 07:02:41.000000000 +0100
+++ new-qt.tests/src/signal-slot.lisp 2014-10-30 07:02:41.000000000 +0100
@@ -15,7 +15,7 @@
(5am:test (emit-int-signal :depends-on with-app)
"Emits a signal with a C++ integer argument to a C++ slot."
- (qt:with-core-app ()
+ (qt:with-app ()
(let ((my-signal (qt:make-signal))
(label (make-instance 'qt:label)))
(qt:connect my-signal (qt:get-slot label "setNum(int)"))
@@ -25,7 +25,7 @@
(5am:test (emit-float-signal :depends-on with-app)
"Emits a signal with a C++ integer argument to a C++ slot."
- (qt:with-core-app ()
+ (qt:with-app ()
(let ((my-signal (qt:make-signal))
(label (make-instance 'qt:label)))
(qt:connect my-signal (qt:get-slot label "setNum(double)"))
diff -rN -u old-qt.tests/test.lisp new-qt.tests/test.lisp
--- old-qt.tests/test.lisp 2014-10-30 07:02:41.000000000 +0100
+++ new-qt.tests/test.lisp 2014-10-30 07:02:41.000000000 +0100
@@ -3,7 +3,7 @@
# Used for testing on darcs record.
|#
-(adsf:operate 'asdf:load-op :qt.tests)
-(adsf:operate 'asdf:test-op :qt.tests)
+(asdf:operate 'asdf:load-op :cl-smoke.qt.tests)
+(asdf:operate 'asdf:test-op :cl-smoke.qt.tests)
(sb-ext:quit)