Sat Apr 3 21:13:24 CEST 2010 Tobias Rautenkranz * Test static member variable access using slot-value with a class object. Sat Apr 3 14:52:50 CEST 2010 Tobias Rautenkranz * Test slot-value for C++ attributes. Sat Apr 3 14:50:36 CEST 2010 Tobias Rautenkranz * Test qt.opengl conversions. Sat Feb 20 22:06:45 CET 2010 Tobias Rautenkranz * Test (qt:value (qt:make-variant qt:+green+)) Sat Feb 20 19:06:27 CET 2010 Tobias Rautenkranz * Test overload resolution exact match for long and ulong. Mon Jan 25 22:13:40 CET 2010 Tobias Rautenkranz * Test QGraphicsScene::setItem Mon Jan 25 19:51:13 CET 2010 Tobias Rautenkranz * Test QList translation Sat Jan 23 23:18:13 CET 2010 Tobias Rautenkranz * Test to QVector translation. Sun Jan 10 09:57:03 CET 2010 Tobias Rautenkranz * ASDF & modular smoke. Sun Dec 13 13:45:36 CET 2009 Tobias Rautenkranz * Support ASDF instead of Mudballs. Wed Sep 2 14:02:23 CEST 2009 Tobias Rautenkranz * Test Lisp to QList and test user conversion sequence for return values. Sun Aug 30 16:18:04 CEST 2009 Tobias Rautenkranz * Test multiple C++ superclasses. Thu Aug 27 10:41:11 CEST 2009 Tobias Rautenkranz * Updates for the new smokegenerator. * workaround missing default arguments for QTest::mouseClick * test const correctness. Thu Jul 23 00:22:47 CEST 2009 Tobias Rautenkranz * Qt property names are symbols in the keyword package. Wed Jul 1 13:02:20 CEST 2009 Tobias Rautenkranz * Use new qt:with-app Wed Jul 1 00:48:36 CEST 2009 Tobias Rautenkranz * CCL fixes Sun Jun 21 11:21:04 CEST 2009 Tobias Rautenkranz * uses-macros-from :smoke Thu Jun 11 20:52:38 CEST 2009 Tobias Rautenkranz * The Qt modules are now all in :qt Thu Jun 11 17:04:11 CEST 2009 Tobias Rautenkranz * Test adding a child to a no smoke object and fixes for :qt :qt-impl split. Wed Jun 10 14:09:14 CEST 2009 Tobias Rautenkranz * Test gc cycle and non cxx:object parent Fri Jun 5 09:52:01 CEST 2009 Tobias Rautenkranz * Test #'QT:GET-SLOT for function with this argument. Fri Jun 5 09:49:09 CEST 2009 Tobias Rautenkranz * Fix test failures when a qt:application instance is already running. Thu Jun 4 00:07:20 CEST 2009 Tobias Rautenkranz * Test restarts in callback and slot; and test abort-app Mon Jun 1 00:56:59 CEST 2009 Tobias Rautenkranz * Fix timer test Mon Jun 1 00:41:10 CEST 2009 Tobias Rautenkranz * Test QList to sequence conversion. Mon Jun 1 00:26:27 CEST 2009 Tobias Rautenkranz * Test QList to sequence conversion. Mon Jun 1 00:24:46 CEST 2009 Tobias Rautenkranz * Test undo stack Sun May 31 19:37:47 CEST 2009 Tobias Rautenkranz * Test return QVariant on the stack Sun May 31 19:36:58 CEST 2009 Tobias Rautenkranz * Test remove-property Sun May 31 19:36:36 CEST 2009 Tobias Rautenkranz * use cxx:class instead of smoke-wrapper-class Wed May 27 19:29:05 CEST 2009 Tobias Rautenkranz * Test CXX:= overload resolution Wed May 27 19:28:53 CEST 2009 Tobias Rautenkranz * Test dynamic properties Tue May 26 11:59:49 CEST 2009 Tobias Rautenkranz * Test argument conversion/promotion when emiting signals Sun May 24 16:14:11 CEST 2009 Tobias Rautenkranz * Test with-app Mon May 11 17:42:25 CEST 2009 Tobias Rautenkranz * Test setf for "set[A-Z].*" methods. Mon May 11 16:18:40 CEST 2009 Tobias Rautenkranz * Test setf value for variant, nil variant & operator conversion, Mon May 11 16:17:41 CEST 2009 Tobias Rautenkranz * Use value instead of from-variant Wed Apr 15 10:28:36 CEST 2009 Tobias Rautenkranz * Test cxx order relations. Tue Apr 14 16:30:40 CEST 2009 Tobias Rautenkranz * License Tue Apr 14 11:19:26 CEST 2009 Tobias Rautenkranz * Do not use :asdf. Sun Apr 12 21:51:20 CEST 2009 Tobias Rautenkranz * Test operator functions Sun Apr 12 16:45:00 CEST 2009 Tobias Rautenkranz * Update to overload by argument count & trick garbage collection in 5am test. diff -rN -u old-qt.tests/COPYING new-qt.tests/COPYING --- old-qt.tests/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/COPYING 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,676 @@ + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff -rN -u old-qt.tests/LICENSE new-qt.tests/LICENSE --- old-qt.tests/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/LICENSE 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,22 @@ +The software in this package is distributed under the GNU General Public +License (with a special exception described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. 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-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,35 @@ +(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 :cl-smoke.qt.opengl + :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 "qvector" :depends-on ("tests")) + (:file "qlist" :depends-on ("tests")) + (:file "graphics-item" :depends-on ("tests")) + (:file "overload" :depends-on ("tests")) + (:file "opengl" :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-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/qt.tests.mbd 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -;;;; -*- Mode: lisp; indent-tabs-mode: nil -*- - -(in-package :sysdef-user) - -(define-system :qt.tests () - (:version 0 0 1) - (:documentation "Qt unit tests.") - (:needs :qt :qt.test :FiveAM :trivial-garbage) - (:components - ("src" module - (:components "package" - ("tests" (:needs "package")) - ("qbytearray" (:needs "tests")) - ("qstring" (:needs "tests")) - ("overload" (:needs "tests")) - ("gc" (:needs "tests")) - ("variant" (:needs "tests")) - ("application" (:needs "tests")) - ("signal-slot" (:needs "tests")) - ("thread" (:needs "tests")) - ("properties" (:needs "tests")) - ("click" (:needs "tests")))))) diff -rN -u old-qt.tests/src/abort.lisp new-qt.tests/src/abort.lisp --- old-qt.tests/src/abort.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/abort.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,90 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(defmacro with-invoke-restart ((condition restart &optional handler) &body body) + "Invokes RESTART when CONDITION is signaled in BODY." + (alexandria:with-gensyms (c) + `(handler-bind ((,condition #'(lambda (,c) + (declare (ignore ,c)) + (assert (find-restart ',restart)) + ,(when handler `(funcall ,handler)) + (invoke-restart ',restart)))) + ,@body))) + +(define-condition no-ticket (error) ()) + +(defun call-slot (slot &rest arguments) + (let ((sig (qt:make-signal))) + (qt:connect sig slot qt:+queued-connection+) + (apply sig arguments))) + +(5am:test abort-with-app + "Test aborting the event loop." + (dotimes (i 3) + (bt:with-timeout (5) + (with-invoke-restart (no-ticket qt::abort-app) + (qt:with-app () + (let ((timer (make-instance 'qt:timer)) + (continued-p)) + (cxx:set-single-shot timer t) + (qt:connect (qt:get-signal timer "timeout()") + #'(lambda () + (cerror "ignore" (make-condition 'no-ticket)) + (setf continued-p t))) + (cxx:start timer 0) + (qt:exec) + (5am:is (eq continued-p t)))))))) + +(defclass error-object (qt:object) + () + (:metaclass cxx:class)) + +(defmethod cxx:timer-event ((object error-object) timer-event) + (cxx:kill-timer object (cxx:timer-id timer-event)) + (error (make-condition 'no-ticket))) + +(5am:test error-in-callback-return + "Test returning from a void method on error." + (qt:with-core-app () + (let ((object (make-instance 'error-object)) + (restarted-p)) + (with-invoke-restart (no-ticket smoke::return + #'(lambda () (setf restarted-p t))) + (cxx:start-timer object 0) + (qt:core-application.process-events)) + (5am:is (eq t restarted-p))))) + +(5am:test error-in-callback-default + "Test calling the default C++ method on error in the user defined method." + (qt:with-core-app () + (let ((object (make-instance 'error-object)) + (restarted-p)) + (with-invoke-restart (no-ticket smoke::call-default + #'(lambda () (setf restarted-p t))) + (cxx:start-timer object 0) + (qt:core-application.process-events)) + (5am:is (eq t restarted-p))))) + + (5am:test error-in-slot + "Test skipping a slot function when it signals an error." + (qt:with-core-app () + (let ((timer (make-instance 'qt:timer)) + (continued-p)) + (with-invoke-restart (no-ticket continue + #'(lambda () (setf continued-p t))) + (cxx:set-single-shot timer t) + (qt:connect (qt:get-signal timer "timeout()") + #'(lambda () + (error (make-condition 'no-ticket)))) + (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/application.lisp new-qt.tests/src/application.lisp --- old-qt.tests/src/application.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/application.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -4,23 +4,35 @@ (5am:test with-app "Tests qt:with-app and qt:with-core-app" - (5am:for-all ((core-p (5am:gen-one-element nil t))) -; (5am:is (eql nil (qt:app-p))) - (if core-p - (qt:with-core-app - (5am:is (eql t (qt:app-p))) - (5am:is (typep (qt:app) (find-class 'qt:core-application))) - (cxx:set-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))) - (cxx:set-object-name (qt:app) "app"))))) -; (5am:is (eql nil (qt:app-p))))) + (let ((nested (qt:app-p))) + (5am:for-all ((core-p (5am:gen-one-element nil t))) + (unless nested + (5am:is (eql nil (qt:app-p)))) + (if core-p + (qt:with-core-app () + (5am:is (eql t (qt:app-p))) + (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 (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))))))) (5am:test application-nest "Test qt:with-core-app nesting." - (qt:with-core-app + (qt:with-core-app () (5am:is (eql (qt:app) (qt:core-application.instance))) - (qt:with-core-app - (5am:is (eql (qt:app) (qt:core-application.instance)))))) + (qt:with-core-app () + (5am:is (eql (qt:app) (qt:core-application.instance)))) + (5am:is (eql (qt:app) (qt:core-application.instance))))) +(5am:test application-widgetlist + "Test cxx:all-widgets" + (qt:with-app () + (5am:is (= 0 (length (cxx:all-widgets (qt:app))))) + (let ((w (make-instance 'qt:widget))) + (5am:is (find w (cxx:all-widgets (qt:app))))))) diff -rN -u old-qt.tests/src/click.lisp new-qt.tests/src/click.lisp --- old-qt.tests/src/click.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/click.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -8,26 +8,28 @@ (5am:test (click-test :depends-on with-app) "Test clicking a button." - (qt:with-app + (qt:with-app () (let ((widget (make-instance 'click-test-widget)) (click-count 0)) (qt:connect (qt:get-signal widget "clicked()") #'(lambda () (5am:is (eq widget (qt:sender))) (incf click-count))) - + (cxx:set-text widget "Hello World") (5am:is (string= "Hello World" (cxx:text widget))) (5am:is (= 0 click-count)) - (qt.test:test.mouse-click widget qt:+left-button+) + (qt:test.mouse-click widget qt:+left-button+ + 0 (make-instance 'qt:point) -1) (5am:is (= 1 click-count)) - (qt.test:test.mouse-click widget qt:+right-button+) + (qt:test.mouse-click widget qt:+right-button+ + 0 (make-instance 'qt:point) -1) (5am:is (= 1 click-count))))) (5am:test (click-test-bool :depends-on click-test) "Test clicking a button (bool argument)." - (qt:with-app + (qt:with-app () (let ((widget (make-instance 'click-test-widget)) (click-count 0)) (qt:connect (qt:get-signal widget "clicked(bool)") @@ -35,10 +37,28 @@ (5am:is (eql nil checked)) (incf click-count))) (5am:is (= 0 click-count)) - (qt.test:test.mouse-click widget qt:+left-button+) + (qt:test.mouse-click widget qt:+left-button+ + 0 (make-instance 'qt:point) -1) (5am:is (= 1 click-count)) - (qt.test:test.mouse-click widget qt:+left-button+) + (qt:test.mouse-click widget qt:+left-button+ + 0 (make-instance 'qt:point) -1) (5am:is (= 2 click-count))))) - - +(5am:test (click-test-bool-this :depends-on click-test) + "Test clicking a button (bool argument) for a function with this argument." + (qt:with-app () + (let ((widget (make-instance 'click-test-widget)) + (click-count 0)) + (qt:connect (qt:get-signal widget "clicked(bool)") + (qt:get-slot widget + #'(lambda (object checked) + (5am:is (eq nil checked)) + (5am:is (eq widget object)) + (incf click-count)))) + (5am:is (= 0 click-count)) + (qt:test.mouse-click widget qt:+left-button+ + 0 (make-instance 'qt:point) -1) + (5am:is (= 1 click-count)) + (qt:test.mouse-click widget qt:+left-button+ + 0 (make-instance 'qt:point) -1) + (5am:is (= 2 click-count))))) diff -rN -u old-qt.tests/src/gc.lisp new-qt.tests/src/gc.lisp --- old-qt.tests/src/gc.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/gc.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -1,30 +1,28 @@ (in-package :qt.tests) (5am:in-suite :qt.suite) - ;;; The GC stuff depends on (gc :full t) to collect the consed objects. -;;; Sometimes calling GC twice helps in sbcl. +;;; Sometimes calling GC twice helps in SBCL. (defun test-gc (class) "Returns true when some instances of class get garbage collected and false otherwise. -It is not required that every instance is gc'ed, since this rarly happens +It is not required that every instance is gc'ed, since this rarely happens and is not a bug." (let ((objects nil)) - (dotimes (x 9) + (dotimes (x 30) (let ((object (make-instance class))) (push (make-weak-pointer object) objects))) (dotimes (x 2) (gc :full t)) - (5am:is (eql t - (some #'(lambda (o) (null (weak-pointer-value o))) - objects))))) + (5am:is (eq t (some #'(lambda (o) (null (weak-pointer-value o))) + objects))))) (defclass lisp-object () ((a :initform (make-array '(1000 1000) :initial-element 3)) (b :initform (list 1 2 43))) - (:documentation "For the object to be (hopefully) garbage colleted + (:documentation "For the object to be (hopefully) garbage collected we cons up some memory.")) (5am:test gc-lisp-object @@ -39,9 +37,13 @@ "Test garbage collection of a QObject." (test-gc 'qt:object)) +(5am:test gc-multi-object + "Test garbage collection of a custom object that has two C++ superclasses." + (test-gc 'my-multi-object)) + (defclass my-gc-object (qt:object) () - (:metaclass smoke::smoke-wrapper-class)) + (:metaclass cxx:class)) ;; FIXME 5am prevents garbage collection!? ;; use eval !? @@ -50,7 +52,7 @@ (dotimes (x 10) (let ((object (make-instance 'qt:object))) (make-instance 'qt:object :args (list object)) - ;(cxx:set-parent (make-instance 'qt:object) object) + ;;(cxx:set-parent (make-instance 'qt:object) object) (push object objects))) (gc :full t))) @@ -58,7 +60,6 @@ (let ((objects nil)) (dotimes (x 10) (let ((object (make-instance 'qt:object))) -; (cxx:set-parent (make-instance 'my-gc-object) object) (make-instance 'my-gc-object :args (list object)) (push object objects))) (gc :full t))) @@ -67,22 +68,119 @@ (5am:test (gc-child :depends-on gc-qobject) "Test garbage collection of a qt:object with a parent." (gc :full t) - (let ((count (hash-table-count smoke::*object-map*))) - (eval '(run-gc-child)) - (gc :full t) - (gc :full t) - (5am:is (= count (hash-table-count smoke::*object-map*))))) + (gc :full t) + (qt:with-core-app () + (let ((count (hash-table-count smoke::*object-map*))) + (eval '(run-gc-child)) + (eval '(gc :full t)) + (qt:core-application.send-posted-events) + (gc :full t) + (qt:core-application.send-posted-events) + (gc :full t) + (5am:is (>= count (hash-table-count smoke::*object-map*)))))) (5am:test (gc-lisp-child :depends-on (and gc-child with-app)) "Test garbage collection of a qt:object with a parent." (gc :full t) - (qt:with-core-app + (qt:with-core-app () (let ((count (hash-table-count smoke::*object-map*))) (eval '(run-gc-my-child)) + ;; a.k.a :really-full ;) (gc :full t) (qt:core-application.send-posted-events) + (eval '(gc :full t)) + (qt:core-application.send-posted-events) + (eval '(gc :full t)) + (qt:core-application.send-posted-events) (gc :full t) (qt:core-application.send-posted-events) - ;; allow some objects to be not collected (5am:is (>= (+ count 2) (hash-table-count smoke::*object-map*)))))) + +(defun test-gc-cycle () + (dotimes (i 10) + (let ((timer (make-instance 'qt:timer))) + (qt:connect (qt:get-signal timer "timeout()") + #'(lambda () + (format *debug-io* "Timeout ~A" timer))))) + (gc :full t) + (qt:core-application.send-posted-events) + (gc :full t) + (qt:core-application.send-posted-events)) + +(5am:test (gc-cycle :depends-on gc-lisp-child) + "Test GC a unreachable cycle." + ;; timer -> qslot -> closure(lambda) + ;; ^------------------/ + (qt:with-core-app () + (let ((objects (hash-table-count smoke::*object-map*))) + (eval '(test-gc-cycle)) + (eval '(gc :full t)) + (qt:core-application.send-posted-events) + (eval '(gc :full t)) + (qt:core-application.send-posted-events) + (gc :full t) + (qt:core-application.send-posted-events) + (gc :full t) + (5am:is (>= (+ 2 objects) (hash-table-count smoke::*object-map*)))))) + +(5am:test (ownership-transfer-no-wrapper :depends-on gc-lisp-child) + "Test ownership transfer of a QObject without a wrapper." + (let ((grand-parent (make-instance 'qt:object))) + (setf (cxx:object-name grand-parent) "grand parent") + (let* ((parent (make-instance 'qt:object :args (list grand-parent))) + (object (make-instance 'my-object :args (list parent)))) + (setf (cxx:object-name parent) "parent" + (cxx:object-name object) "child")) + (gc :full t) + (qt:core-application.send-posted-events) + (gc :full t) + (qt:core-application.send-posted-events) + (5am:is (member (find-class 'my-object) + (loop for c across (cxx:children grand-parent) append + (map 'list #'class-of + (cxx:children c))))))) + +(5am:test (gc-non-smoke-object :depends-on gc-lisp-child) + "Test adding a child to a non smoke object." + (qt:with-app () + (let ((model (make-instance 'qt:string-list-model :arg0 #("a" "b" "c"))) + (view (make-instance 'qt:list-view)) + (counter 0)) + (setf (cxx:model view) model) + (qt:connect (qt:get-signal (cxx:selection-model view) + "selectionChanged(QItemSelection, QItemSelection)") + #'(lambda (selected deselected) + (declare (ignore selected deselected)) + (incf counter))) + (cxx:destroyed (cxx:selection-model view) + (cxx:selection-model view)) + (gc :full t) + (qt:core-application.send-posted-events) + (gc :full t) + (qt:core-application.send-posted-events) + (5am:is (= 0 counter)) + (cxx:select (cxx:selection-model view) + (cxx:index model 0) + qt:item-selection-model.+toggle+) + (5am:is (= 1 counter)) + (cxx:select (cxx:selection-model view) + (cxx:index model 1) + qt:item-selection-model.+toggle+) + (5am:is (= 2 counter))))) + +#| +;; FIXME +(5am:test (gc-variant-cycle :depends-on gc-lisp-child lisp-variant) + (let ((finalized-p)) + (let* ((list (list nil)) + (variant (qt:make-lisp-variant list))) + (setf (first list) + variant) + (tg:finalize list #'(lambda () (setf finalized-p t))) + (5am:is (eq nil finalized-p))) + (gc :full t) + (gc :full t) + (5am:is (eq t finalized-p)))) + +|# diff -rN -u old-qt.tests/src/graphics-item.lisp new-qt.tests/src/graphics-item.lisp --- old-qt.tests/src/graphics-item.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/graphics-item.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,18 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test set-graphics-item + "Ownership transfer for QGraphicsScene::setItem." + (qt:with-app () + (let ((scene (make-instance 'qt:graphics-scene))) + (let ((item (make-instance 'qt:graphics-item))) + (cxx:set-tool-tip item "Foo") + (cxx:add-item scene item)) + (tg:gc :full t) + (tg:gc :full t) + (5am:is (= 1 (length (cxx:items scene)))) + (5am:is (string= "Foo" + (cxx:tool-tip (elt (cxx:items scene) 0)))) + ;; FIXME delete QGraphicsScene before the QApplication is deleted + (smoke::delete-object scene)))) diff -rN -u old-qt.tests/src/object.lisp new-qt.tests/src/object.lisp --- old-qt.tests/src/object.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/object.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,26 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test test-children + "Test QList to sequence conversion." + (let ((object (make-instance 'qt:object))) + (5am:is (= 0 (length (cxx:children object)))) + (let ((children (mapcar #'(lambda (parent) + (make-instance 'qt:object :args (list parent))) + (list object object object)))) + (5am:is (= (length children) + (length (cxx:children object)))) + (dolist (c children) + (5am:is (find c (cxx:children object))))))) + +(defclass my-multi-object (qt:object qt:graphics-item) + () + (:metaclass cxx:class)) + +(5am:test multi-object + "Tests a custom object that has two C++ superclasses." + (let ((object (make-instance 'my-multi-object))) + (5am:is (string= "" (cxx:object-name object))) + (5am:is (= qt:graphics-item.+user-type+ + (cxx:type object))))) diff -rN -u old-qt.tests/src/opengl.lisp new-qt.tests/src/opengl.lisp --- old-qt.tests/src/opengl.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/opengl.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,24 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test gluint + "GLuint conversion" + (qt:with-app () + (let* ((texture (make-instance 'qt:pixmap)) + (gl-widget (make-instance 'qt:glwidget)) + (id (cxx:bind-texture gl-widget texture))) + (5am:is (typep id '(integer 0))) + (cxx:delete-texture gl-widget id)))) + + +(5am:test glint + "Test GLint and GLenum conversion." + (qt:with-app () + (let* ((texture (make-instance 'qt:pixmap)) + (target 3553) ;(cffi:foreign-enum-value '%gl:enum :texture-2d)) + (format 6409) ;(cffi:foreign-enum-value '%gl:enum :rgba)) + (gl-widget (make-instance 'qt:glwidget)) + (id (cxx:bind-texture gl-widget texture target format))) + (5am:is (typep id '(integer 0))) + (cxx:delete-texture gl-widget id)))) diff -rN -u old-qt.tests/src/operators.lisp new-qt.tests/src/operators.lisp --- old-qt.tests/src/operators.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/operators.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,91 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test cxx-equality + "Test cxx:= cxx:/=" + (5am:is (eq t (cxx:= (make-instance 'qt:point)))) + (5am:is (eq t (cxx:= (make-instance 'qt:point) + (make-instance 'qt:point)))) + (5am:is (eq t (cxx:= (make-instance 'qt:point) + (make-instance 'qt:point) + (make-instance 'qt:point)))) + (5am:for-all ((x1 (5am:gen-integer)) + (x2 (5am:gen-integer)) + (y1 (5am:gen-integer)) + (y2 (5am:gen-integer))) + (let ((p1 (make-instance 'qt:point :args (list x1 y1))) + (p2 (make-instance 'qt:point :args (list x2 y2)))) + (5am:is (eq (and (= x1 x2) + (= y1 y2)) + (cxx:= p1 p2))) + (5am:is (eq (or (/= x1 x2) + (/= y1 y2)) + (cxx:/= p1 p2)))))) + +(5am:test cxx-equality-conversion + "Test cxx:= overload resolution." + (5am:is (eq t (cxx:= (qt:make-variant "foo") "foo"))) + (5am:is (eq t (cxx:= "foo" (qt:make-variant "foo") "foo"))) + (5am:is (eq nil (cxx:= "foo" (qt:make-variant "foo") "bar")))) + +(5am:test (cxx-+ :depends-on cxx-equality) + "Test cxx:+" + (5am:for-all ((x1 (5am:gen-integer)) + (x2 (5am:gen-integer)) + (y1 (5am:gen-integer)) + (y2 (5am:gen-integer))) + (let ((p1 (make-instance 'qt:point :args (list x1 y1))) + (p2 (make-instance 'qt:point :args (list x2 y2)))) + (5am:is (eq t (cxx:= (cxx:+ p1 p2) + (make-instance 'qt:point :args (list + (+ x1 x2) + (+ y1 y2))))))))) + + +(5am:test (cxx-decf :depends-on cxx-equality) + "Test cxx:decf" + (5am:for-all ((x1 (5am:gen-integer)) + (x2 (5am:gen-integer)) + (y1 (5am:gen-integer)) + (y2 (5am:gen-integer))) + (let ((p1 (make-instance 'qt:point :args (list x1 y1))) + (p2 (make-instance 'qt:point :args (list x2 y2)))) + (cxx:decf p1 p2) + (5am:is (eq t (cxx:= p1 + (make-instance 'qt:point :args (list + (- x1 x2) + (- y1 y2))))))))) + +(5am:test (cxx-<=) + "Test cxx:<=" + (let ((p1 (make-instance 'qt:byte-array :args '(""))) + (p2 (make-instance 'qt:byte-array :args '("a"))) + (p3 (make-instance 'qt:byte-array :args '("b")))) + (5am:is (eq t (cxx:<= p1 p2 p3))) + (5am:is (eq t (cxx:<= p1 p2 p2 p3))) + (5am:is (eq nil (cxx:<= p2 p1))) + (5am:is (eq nil (cxx:<= p1 p2 p1))))) + +(5am:test cxx-aref + "Test cxx-aref" + (let ((byte-array (make-instance 'qt:byte-array :args '("foobar")))) + (5am:is (eq #\b (cxx:aref byte-array 3))) + (5am:is (eq #\B + (setf (cxx:aref byte-array 3) + #\B))) + (5am:is (eq #\B (cxx:aref byte-array 3))))) + +(5am:test relations + "Test cxx order relations." + (dolist (relation (list #'cxx:< #'cxx:<= #'cxx:>= #'cxx:>)) + (5am:is (eq t (funcall relation (make-instance 'qt:byte-array))))) + + (5am:is (eq t (cxx:<= (make-instance 'qt:byte-array) + (make-instance 'qt:byte-array)))) + (5am:is (eq nil (cxx:< (make-instance 'qt:byte-array) + (make-instance 'qt:byte-array)))) + (5am:is (eq t (cxx:>= (make-instance 'qt:byte-array) + (make-instance 'qt:byte-array)))) + (5am:is (eq nil (cxx:> (make-instance 'qt:byte-array) + (make-instance 'qt:byte-array))))) diff -rN -u old-qt.tests/src/overload.lisp new-qt.tests/src/overload.lisp --- old-qt.tests/src/overload.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/overload.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -4,20 +4,51 @@ (defclass my-object (qt:object) ((counter :accessor counter :initform 0)) - (:metaclass smoke::smoke-wrapper-class)) + (:metaclass cxx:class)) -(defmethod cxx:timer-event ((object my-object) &rest args) - (declare (ignore args)) - (format t "TIME~%") - (incf (counter object))) +(defmethod cxx:timer-event ((object my-object) event) + (incf (counter object)) + (cxx:quit (qt:app))) - -;;FIXME -#|(5am:test timer +(5am:test timer (let ((object (make-instance 'my-object))) - (qt:init-app) - (5am:is (= 0 (counter object))) - (cxx:starttimer object 50) - (sleep 3) - (5am:is (= 1 (counter object))))) -|# + (qt:with-core-app () + (5am:is (= 0 (counter object))) + (cxx:start-timer object 0) + (with-timeout (5) + (qt:exec)) + (5am:is (= 1 (counter object)))))) + +(defclass my-list-model (qt:abstract-list-model) + ((counter :accessor counter :initform 0)) + (:metaclass cxx:class)) + +(defmethod cxx:data ((list my-list-model) index role) + (incf (counter list)) + (if (< (cxx:row index) 2) + (cxx:row index) ;; cl-smoke converts to the required qt:variant + (qt:make-variant))) + +(defmethod cxx:row-count ((list my-list-model) parent) + 2) + +(5am:test return-on-stack + "Test virtual method return value on stack." + (let ((list (make-instance 'my-list-model)) + (proxy (make-instance 'qt:sort-filter-proxy-model))) + (5am:is (= 0 (counter list))) + (setf (cxx:source-model proxy) list) + (dotimes (i 10) ;; test for faulty ownership transfer + (cxx:sort proxy 0) + (gc :full t)) + (5am:is (< 0 (counter list))))) + +(5am:test return-on-stack-c++ + (let ((list (make-instance + 'qt:string-list-model :args (list #("foo" "bar")))) + (proxy (make-instance 'qt:sort-filter-proxy-model))) + (setf (cxx:source-model proxy) list) + (dotimes (i 10) ;; test for faulty ownership transfer + (cxx:sort proxy 0) + (gc :full t)) + (5am:is (= 2 (cxx:row-count list))))) diff -rN -u old-qt.tests/src/package.lisp new-qt.tests/src/package.lisp --- old-qt.tests/src/package.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/package.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -1,3 +1,3 @@ (defpackage :qt.tests - (:use :cl :asdf :trivial-garbage :bordeaux-threads) + (:use :cl :trivial-garbage :bordeaux-threads :cxx-support) (:export :run)) diff -rN -u old-qt.tests/src/properties.lisp new-qt.tests/src/properties.lisp --- old-qt.tests/src/properties.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/properties.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -5,24 +5,28 @@ (5am:test property-list "Test properties" (5am:is (= 1 (length (qt:class-properties (find-class 'qt:object))))) - (5am:is (= 1 (length (qt:properties (make-instance 'qt:object))))) - (5am:is (= 1 (length (qt:class-properties (find-class 'qt:qslot)))))) + (5am:is (= 1 (length (qt:properties (make-instance 'qt:object)))))) (5am:test (property :depends-on qstring) "Tests get and set property string" (let ((o (make-instance 'qt:object))) (5am:is (eql t (qt:property-p o "objectName"))) - (5am:is (eql t (qt:property-p o 'object-name))) + (5am:is (eql t (qt:property-p o :object-name))) - (setf (qt:property o 'object-name) "fooBar") - (5am:is (string= (qt:property o 'object-name) "fooBar")) + (setf (qt:property o :object-name) "fooBar") + (5am:is (string= (qt:property o :object-name) "fooBar")) (5am:is (string= (qt:property o "objectName") "fooBar")) (5am:is (string= (cxx:object-name o) "fooBar")) (5am:is (eql nil (qt:property-p o 'foo))) (setf (qt:property o 'foo) "bar") - (5am:is (eql t (qt:property-p o 'foo))) - (5am:is (string= (qt:property o 'foo) "bar")))) + (5am:is (= 2 (length (qt:properties o)))) + (5am:is (member 'foo (qt:properties o))) + (5am:is (eq t (qt:property-p o 'foo))) + (5am:is (string= (qt:property o 'foo) "bar")) + + (qt:remove-property o 'foo) + (5am:is (eq nil (qt:property-p o 'foo))))) (5am:test property-int @@ -31,3 +35,24 @@ (5am:for-all ((integer (5am:gen-integer))) (setf (qt:property o 'foo-bar) integer) (5am:is (= integer (qt:property o 'foo-bar)))))) + +(5am:test attributes + "Test C++ attribute access with slot-* functions." + (let ((o (make-instance 'qt:object))) + (5am:is (slot-boundp o :static-meta-object)) + (5am:is (slot-boundp (find-class 'qt:object) :static-meta-object)) + (5am:is (string= "QObject" + (cxx:class-name + (slot-value o :static-meta-object)))) + (5am:is (string= "QObject" + (cxx:class-name + (slot-value (find-class 'qt:object) + :static-meta-object)))) + (5am:signals error + (setf (slot-value o :static-meta-object) + (cffi:null-pointer)))) + (let ((data (make-instance 'qt:shared-data))) + (5am:is (slot-boundp data :ref)) + (5am:for-all ((value (5am:gen-integer :min -255 :max 255))) + (setf (slot-value data :ref) value) + (5am:is (cxx:= (slot-value data :ref) value))))) diff -rN -u old-qt.tests/src/qbytearray.lisp new-qt.tests/src/qbytearray.lisp --- old-qt.tests/src/qbytearray.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/qbytearray.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -2,16 +2,28 @@ (5am:in-suite :qt.suite) - (5am:test null-bytearray "Test empty QByteArray." - (5am:is (string= "" - (cxx:data (make-instance 'qt:byte-array))))) - + (5am:is (string= "" (cxx:data (make-instance 'qt:byte-array))))) (5am:test bytearray - "Tests string <-> QByteArray." + "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 - :args (list string))))))) + :arg0 string)))))) + +(5am:test const-bytearray + "Test const QByteArray." + ;; 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 #\a (cxx:operator[] const-array 0))))) diff -rN -u old-qt.tests/src/qlist.lisp new-qt.tests/src/qlist.lisp --- old-qt.tests/src/qlist.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/qlist.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,11 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test variant-list + "QList" + (let ((variants (vector (qt:make-variant "foo")))) + (5am:is (every #'cxx:= + variants + (cxx:to-list (qt:make-variant variants)))))) + diff -rN -u old-qt.tests/src/qstring.lisp new-qt.tests/src/qstring.lisp --- old-qt.tests/src/qstring.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/qstring.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -5,12 +5,13 @@ (5am:test (qstring :depends-on bytearray) "Tests string <-> QString." (let ((object (make-instance 'qt:object))) -; (5am:for-all ((string (5am:gen-string))) ;;FIXME + ;; (5am:for-all ((string (5am:gen-string))) ;; FIXME (Qt bug?) (5am:for-all ((string (5am:gen-one-element "foo" - "FOO bar" - (format nil "A~AB" #\Null) - "öäüƧЪ"))) - (cxx:set-object-name object string) + "FOO bar" + "" + (format nil "A~AB" #\Null) + "öäüƧЪ"))) + (setf (cxx:object-name object) string) (5am:is (string= string (cxx:object-name object)))))) (5am:test (string-list :depends-on qstring) diff -rN -u old-qt.tests/src/qvector.lisp new-qt.tests/src/qvector.lisp --- old-qt.tests/src/qvector.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/qvector.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,41 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(5am:test qvector-qpoint + "Tests to QVector translation." + (let* ((points + (map 'vector #'(lambda (coords) + (make-instance 'qt:point :arg0 (first coords) + :arg1 (rest coords))) + '((9 . 8) (7 . 6) (5 . 4)))) + (polygon (make-instance 'qt:polygon :arg0 points))) + (dotimes (i (length points)) + (5am:is (= (cxx:x (aref points i)) + (cxx:x (cxx:point polygon i)))) + (5am:is (= (cxx:y (aref points i)) + (cxx:y (cxx:point polygon i)))))) + ;; Free the allocated QVector + (tg:gc :full t)) + +(5am:test qvector-double + "Test QVector <-> Lisp translation." + (5am:for-all ((pattern (5am:gen-one-element #() + #(1d0 2d0) + #(3.1415926d0 -10d0 1d10 0d0)))) + (let ((pen (make-instance 'qt:pen))) ;; set-dash-pattern only works once!? + (cxx:set-dash-pattern pen pattern) + (5am:is (equalp pattern (cxx:dash-pattern pen)))))) + +(5am:test qvector-uint + "Test QVector <-> Lisp translation." + (let ((image (make-instance 'qt:image + :args (list 10 10 qt:image.+format-indexed8+))) + (colors (map 'vector + #'qt:q-rgb + '(1 2 44 55 255) + '(4 6 23 43 12) + '(5 0 23 12 123)))) + (5am:is (equalp #() (cxx:color-table image))) + (cxx:set-color-table image colors) + (5am:is (equalp colors (cxx:color-table image))))) 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-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/signal-slot.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -1,22 +1,21 @@ (in-package :qt.tests) -(declaim (optimize (debug 3))) (5am:in-suite :qt.suite) (5am:test simple-signal-slot "Test custom signal to custom slot connection." (let ((counter 0)) - (let ((my-signal (make-instance 'qt:qsignal)) + (let ((my-signal (qt:make-signal)) (my-slot (qt::make-slot #'(lambda () (incf counter)) nil))) - + (qt:connect my-signal my-slot) (funcall my-signal) (5am:is (= 1 counter))))) (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)")) @@ -26,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)")) @@ -38,7 +37,7 @@ (5am:test emit-bool-signal "Emits a signal with an boolean C++ argument to a C++ slot." - (qt:with-app + (qt:with-app () (let ((my-signal (qt:make-signal)) (widget (make-instance 'qt:check-box))) (qt:connect my-signal (qt:get-slot widget "setChecked(bool)")) @@ -49,7 +48,7 @@ (5am:test (emit-qstring-signal :depends-on (and qstring with-app)) "Emits a signal with a C++ QString argument to a C++ slot." - (qt:with-app + (qt:with-app () (let ((my-signal (qt:make-signal)) (widget (make-instance 'qt:widget))) (qt:connect my-signal (qt:get-slot widget "setWindowTitle(QString)")) @@ -93,7 +92,7 @@ "Pass a lisp object over a signal-slot connection." (let ((num 1d0) (count 0)) - (let ((my-signal (make-instance 'qt:qsignal)) + (let ((my-signal (qt:make-signal)) (my-slot (qt::make-slot #'(lambda (a b) (5am:is (eq a num)) (5am:is (eql t b)) @@ -110,67 +109,87 @@ (qt:connect (qt:get-signal object "destroyed()") #'(lambda () (setf *destroyed* t))) (tg:gc :full t) - (5am:is (eql nil *destroyed*))) + (5am:is (eq nil *destroyed*))) (tg:gc :full t)) +;; SBCL runs the finalizer when the object has been garbage collected, +;; thus its children could be to and thus the destroyed() signal is not +;; received +#-(or sbcl cmucl ccl) (5am:test (destroyed-signal :depends-on gc-qobject) "Receive a destroy signal for a QObject." (setf *destroyed* nil) - (test-destroyed-signal) + (eval '(test-destroyed-signal)) ;; FIXME eval somehow makes gc in 5am work!? + (eval '(tg:gc :full t)) (tg:gc :full t) - (5am:is (eql t *destroyed*))) + (5am:is (eq t *destroyed*))) (5am:test int-signal "Receive a int signal." - (qt:with-app - (let ((spin-box (make-instance 'qt:spin-box)) - (current-value) - (current-string-value)) - (qt:connect (qt:get-signal spin-box "valueChanged(int)") - #'(lambda (value) - (setf current-value value))) - (qt:connect (qt:get-signal spin-box "valueChanged(const QString&)") - #'(lambda (value) - (setf current-string-value value))) - (5am:for-all ((value (5am:gen-integer - :min (cxx:minimum spin-box) - :max (cxx:maximum spin-box)))) - (cxx:set-value spin-box value) - (5am:is (= value current-value)) - (5am:is (= value (read-from-string current-string-value))))))) + (qt:with-app () + (let ((spin-box (make-instance 'qt:spin-box)) + (current-value) + (current-string-value)) + (qt:connect (qt:get-signal spin-box "valueChanged(int)") + #'(lambda (value) + (setf current-value value))) + (qt:connect (qt:get-signal spin-box "valueChanged(const QString&)") + #'(lambda (value) + (setf current-string-value value))) + (5am:for-all ((value (5am:gen-integer + :min (cxx:minimum spin-box) + :max (cxx:maximum spin-box)))) + (cxx:set-value spin-box value) + (5am:is (= value current-value)) + (5am:is (= value (read-from-string current-string-value))))))) (5am:test object-signal "Receive a qt:object pointer signal." - (qt:with-app - (let ((button (make-instance 'qt:push-button)) - (click-count 0) - (signal-mapper (make-instance 'qt:signal-mapper))) - (qt:connect (qt:get-signal button "clicked()") - (qt:get-slot signal-mapper "map()")) - (cxx:set-mapping signal-mapper button button) - - (qt:connect (qt:get-signal signal-mapper "mapped(QObject*)") - #'(lambda (object) - (5am:is (eq button object)) - (incf click-count))) - (5am:is (= 0 click-count)) - (qt.test:test.mouse-click button qt:+left-button+) - (5am:is (= 1 click-count))))) + (qt:with-app () + (let ((button (make-instance 'qt:push-button)) + (click-count 0) + (signal-mapper (make-instance 'qt:signal-mapper))) + (qt:connect (qt:get-signal button "clicked()") + (qt:get-slot signal-mapper "map()")) + (cxx:set-mapping signal-mapper button button) + ;; button is a QWidget thus it's mapped(QWidget*) and not + ;; mapped(QObject*) + (qt:connect (qt:get-signal signal-mapper "mapped(QWidget*)") + #'(lambda (object) + (5am:is (eq button object)) + (incf click-count))) + (5am:is (= 0 click-count)) + (qt:test.mouse-click button qt:+left-button+ + 0 (make-instance 'qt:point) -1) + (5am:is (= 1 click-count))))) (5am:test receive-by-value "Receive a C++ class by value signal." - (qt:with-app + (qt:with-app () (let ((model (make-instance 'qt:string-list-model)) - (count 0)) + (count 0)) (qt:connect (qt:get-signal model "rowsInserted(QModelIndex, int, int)") #'(lambda (parent start end) - (declare (ignore previous)) - (5am:is (eq (cxx:internal-id (cxx:parent (cxx:index model start))) - (cxx:internal-id parent))) + (declare (ignore end)) + (5am:is (cxx:= (cxx:parent (cxx:index model start))) + parent) (incf count))) (5am:is (= 0 count)) (cxx:insert-rows model 0 1) (5am:is (= 1 count)) (cxx:insert-rows model 0 3) (5am:is (= 2 count))))) + +(5am:test (emit-user-conversion :depends-on emit-qstring-signal) + "Emit a signal with a user conversion of the argument." + (qt:with-app () + (let ((combobox (make-instance 'qt:text-edit)) + (set-font (qt:make-signal))) + (qt:connect set-font + (qt:get-slot combobox "setCurrentFont(QFont)")) + (5am:is (cxx:operator== (cxx:current-font combobox) + (make-instance 'qt:font))) + (funcall set-font "Times") + (5am:is (cxx:operator== (cxx:current-font combobox) + "Times"))))) diff -rN -u old-qt.tests/src/tests.lisp new-qt.tests/src/tests.lisp --- old-qt.tests/src/tests.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/tests.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -1,3 +1,30 @@ +;;; Copyright (C) 2009 Tobias Rautenkranz +;;; +;;; This program is free software: you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . +;;; +;;; As a special exception, the copyright holders of this library give you +;;; permission to link this library with independent modules to produce an +;;; executable, regardless of the license terms of these independent +;;; modules, and to copy and distribute the resulting executable under +;;; terms of your choice, provided that you also meet, for each linked +;;; independent module, the terms and conditions of the license of that +;;; module. An independent module is a module which is not derived from or +;;; based on this library. If you modify this library, you may extend this +;;; exception to your version of the library, but you are not obligated to +;;; do so. If you do not wish to do so, delete this exception statement +;;; from your version. + (in-package :qt.tests) (5am:def-suite :qt.suite :description "Qt tests") diff -rN -u old-qt.tests/src/undo.lisp new-qt.tests/src/undo.lisp --- old-qt.tests/src/undo.lisp 1970-01-01 01:00:00.000000000 +0100 +++ new-qt.tests/src/undo.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -0,0 +1,33 @@ +(in-package :qt.tests) + +(5am:in-suite :qt.suite) + +(defclass reversible-incf (qt:undo-command) + ((place :accessor place + :initarg :place)) + (:metaclass cxx:class)) + +(defmethod cxx:redo ((incf reversible-incf)) + (incf (symbol-value (place incf)))) + +(defmethod cxx:undo ((incf reversible-incf)) + (decf (symbol-value (place incf)))) + +(5am:test undo-stack + "Test ownership transfer of a undo-command to the undo-stack." + (let ((undo-stack (make-instance 'qt:undo-stack)) + (iterations 10) + (counter 0)) + (declare (special counter)) + (dotimes (i iterations) + (cxx:push undo-stack + (make-instance 'reversible-incf :place 'counter)) + (gc :full t)) ;; Test for faulty ownership transfer + (5am:is (eq t (cxx:can-undo undo-stack))) + (5am:is (= iterations counter)) + + (dotimes (i iterations) + (cxx:undo undo-stack)) + (5am:is (eq nil (cxx:can-undo undo-stack))) + (5am:is (= 0 counter)))) + diff -rN -u old-qt.tests/src/variant.lisp new-qt.tests/src/variant.lisp --- old-qt.tests/src/variant.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/src/variant.lisp 2014-11-24 13:47:58.000000000 +0100 @@ -4,19 +4,58 @@ (5am:test (variant-string :depends-on qstring) "Test qt:variant <-> string conversion." -; (5am:for-all ((string (5am:gen-string))) + ;; (5am:for-all ((string (5am:gen-string))) (5am:for-all ((string (5am:gen-one-element "foo" - "Foo Bar"))) - (5am:is (string= string (qt:from-variant (qt:make-variant string)))))) + "Foo Bar"))) + (5am:is (eq t (cxx:= string (qt:make-variant string)))) + (5am:is (string= string (qt:value (qt:make-variant string)))))) (5am:test variant-int "Test qt:variant <-> string conversion." (5am:for-all ((integer (5am:gen-integer))) - (5am:is (= integer (qt:from-variant (qt:make-variant integer)))))) + (5am:is (eq t (cxx:= integer (qt:make-variant integer)))) + (5am:is (= integer (qt:value (qt:make-variant integer)))))) (5am:test lisp-variant "Test qt:variant <-> lisp object conversion." (5am:for-all ((object (5am:gen-one-element #(1 2 3) (list "foo" "bar")))) - (5am:is (eq object (qt:from-variant (qt:make-lisp-variant object)))))) + (5am:is (eq object (qt:value (qt:make-lisp-variant object)))))) + +(5am:test variant-color + "The C++ overload resolution for QColor:operator QVariant()." + (let* ((color (make-instance 'qt:color)) + (variant1 (qt:make-variant color)) + (variant2 (qt:make-variant color))) + (5am:is (eq t (cxx:= variant1 variant2))))) + +(5am:test nil-variant + "Make a nil variant." + (5am:is (eq nil (qt:variant-boundp (qt:make-variant))))) + +(5am:test setf-variant-value + "Set a qt:variant." + (let ((variant (qt:make-variant))) + (5am:is (= 1 (setf (qt:value variant) 1))) + (5am:is (= 1 (qt:value variant))))) + +(5am:test variant-list + (let ((list (qt:make-variant (map 'vector #'qt:make-variant + '(1 "asdf" #\a))))) + (5am:is (string= "QVariantList" + (cxx:type-name list))))) + +(5am:test exact-int-type-match + "Test overload resolution exact match long vs. int." + (5am:is (enum= qt:variant.+uint+ + (cxx:type (qt:make-variant 1)))) + (5am:is (enum= qt:variant.+int+ + (cxx:type (qt:make-variant -1))))) + ;; on 32 bit sizeof(long) == sizeof(int) thus not test for that. + +(5am:test variant-color + "Test QColor variant." + (let ((color (make-instance 'qt:color :arg0 qt:+green+))) + (5am:is (string= (cxx:name color) + (cxx:name (qt:value (qt:make-variant color))))))) diff -rN -u old-qt.tests/test.lisp new-qt.tests/test.lisp --- old-qt.tests/test.lisp 2014-11-24 13:47:58.000000000 +0100 +++ new-qt.tests/test.lisp 2014-11-24 13:47:58.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) +(asdf:operate 'asdf:load-op :cl-smoke.qt.tests) +(asdf:operate 'asdf:test-op :cl-smoke.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-11-24 13:47:58.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)