GIT_REPOSITORIES/LPP/PythonQt Commit - r44:0f65c5e01031

added tests for return by value of objects, unregistered objects still fail...

florianlink -

r44:0f65c5e01031

parent child

Context file:

r44:0f65c5e01031

Collapse all files

tests/PythonQtTests.cpp +8 0

             {
               PythonQtTestCppFactory* f = new PythonQtTestCppFactory;
               PythonQt::self()->addInstanceDecorators(new PQCppObjectDecorator);
+              qRegisterMetaType<PQCppObjectNoWrap>("PQCppObjectNoWrap");
               PythonQt::self()->addDecorators(new PQCppObjectNoWrapDecorator);
               PythonQt::self()->addWrapperFactory(f);
               QVERIFY(_helper->runScript("if obj.createPQCppObjectNoWrap(12).getH()==12: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("if obj.getPQCppObjectNoWrapAsValue().getH()==47: obj.setPassed();\n"));
+              qRegisterMetaType<PQUnknownButRegisteredValueObject>("PQUnknownButRegisteredValueObject");
+              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsPtr();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownButRegisteredValueObjectAsValue();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsPtr();print a;\nif a!=None: obj.setPassed();\n"));
+              QVERIFY(_helper->runScript("a = obj.getUnknownValueObjectAsValue();print a;\nif a!=None: obj.setPassed();\n"));
               // expect to get strict call to double overload
               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObjectNoWrap\na = PQCppObjectNoWrap(22.2)\nif a.getH()==2: obj.setPassed();\n"));

tests/PythonQtTests.h +21 0

             class PQCppObjectNoWrap {
             public:
+              PQCppObjectNoWrap() { _height = 0; }
               PQCppObjectNoWrap(int h) { _height = h; }
               int getHeight() { return _height; }
             };
+            class PQUnknownValueObject
+            {
+            public:
+              PQUnknownValueObject() {};
+            };
+            class PQUnknownButRegisteredValueObject
+            {
+            public:
+              PQUnknownButRegisteredValueObject() {};
+            };
             //! test the calling of slots
             class PythonQtTestSlotCalling : public QObject
               //! cpp wrapper factory test
               PQCppObjectNoWrap* getPQCppObjectNoWrap(PQCppObjectNoWrap* p) { _called = true; return p; }
+              //! get a return by value PQCppObjectNoWrap
+              PQCppObjectNoWrap getPQCppObjectNoWrapAsValue() { _called = true; return PQCppObjectNoWrap(47); }
+              PQUnknownButRegisteredValueObject getUnknownButRegisteredValueObjectAsValue() { _called = true; return PQUnknownButRegisteredValueObject(); }
+              PQUnknownValueObject              getUnknownValueObjectAsValue() { _called = true; return PQUnknownValueObject(); }
+              PQUnknownButRegisteredValueObject* getUnknownButRegisteredValueObjectAsPtr() { _called = true; return new PQUnknownButRegisteredValueObject(); }
+              PQUnknownValueObject*              getUnknownValueObjectAsPtr() { _called = true; return new PQUnknownValueObject(); }
               ClassA* getClassAPtr(ClassA* o) { _called = true; return o; }
               ClassB* getClassBPtr(ClassB* o) { _called = true; return o; }
               ClassC* getClassCPtr(ClassC* o) { _called = true; return o; }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages