GIT_REPOSITORIES/LPP/PythonQt Commit - r50:ef758f9ae3a7

added new tests to validate enums return values, enums passed in slots and enums in signals (enums in signals is not yet implemented and fails)...

florianlink -

r50:ef758f9ae3a7

parent child

Context file:

r50:ef758f9ae3a7

Collapse all files

tests/PythonQtTests.cpp +20 -1

                QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObjectNoWrap\na = PQCppObjectNoWrap(22)\nif a.getH()==2: obj.setPassed();\n"));
                // expect to get strict call to copy constructor overload
                QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObjectNoWrap\na = PQCppObjectNoWrap(PQCppObjectNoWrap())\nprint a.getH()\nif a.getH()==1: obj.setPassed();\n"));
+               // test decorated enums
+               PythonQt::self()->registerCPPClass("PQCppObject2",NULL,NULL, PythonQtCreateObject<PQCppObject2Decorator>);
+               // enum with namespace (decorated)
+               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObject2\na = PQCppObject2()\nif a.testEnumFlag2(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
+               // local enum (decorated)
+               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObject2\na = PQCppObject2()\nif a.testEnumFlag1(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
+               // with int overload to check overloading
+               QVERIFY(_helper->runScript("obj.testNoArg()\nfrom PythonQt import PQCppObject2\na = PQCppObject2()\nif a.testEnumFlag3(PQCppObject2.TestEnumValue2)==PQCppObject2.TestEnumValue2: obj.setPassed();\n"));
              }
                QVERIFY(PythonQt::self()->addSignalHandler(_helper, SIGNAL(floatSignal(float)), main, "testFloatSignal"));
                QVERIFY(_helper->emitFloatSignal(12));
+               // test decorated enums
+               PythonQt::self()->registerCPPClass("PQCppObject2",NULL,NULL, PythonQtCreateObject<PQCppObject2Decorator>);
+               PyRun_SimpleString("def testEnumSignal(a):\n  if a==1: obj.setPassed();\n");
+               QVERIFY(PythonQt::self()->addSignalHandler(_helper, SIGNAL(enumSignal(PQCppObject2::TestEnumFlag)), main, "testEnumSignal"));
+               QVERIFY(_helper->emitEnumSignal(PQCppObject2::TestEnumValue2));
-               PyRun_SimpleString("def testVariantSignal(a):\n  if a==obj.expectedVariant(): obj.setPassed();\n");
                QVERIFY(PythonQt::self()->addSignalHandler(_helper, SIGNAL(variantSignal(QVariant)), main, "testVariantSignal"));
                _helper->setExpectedVariant(QString("Test"));
                QVERIFY(PythonQt::self()->removeSignalHandler(_helper, SIGNAL(intSignal(int)), main, "testIntSignal"));
                QVERIFY(PythonQt::self()->removeSignalHandler(_helper, SIGNAL(floatSignal(float)), main, "testFloatSignal"));
                QVERIFY(PythonQt::self()->removeSignalHandler(_helper, SIGNAL(variantSignal(QVariant)), main, "testVariantSignal"));
+               QVERIFY(PythonQt::self()->removeSignalHandler(_helper, SIGNAL(enumSignal(PQCppObject2::TestEnumFlag)), main, "testEnumSignal"));
              }
              void PythonQtTestApi::testQtNamespace()
              {
-               QVERIFY(!_main.getVariable("PythonQt.QtCore.Qt.red").toInt()==Qt::red);
+               QVERIFY(_main.getVariable("PythonQt.QtCore.Qt.red").toInt()==Qt::red);
                QVERIFY(_main.getVariable("PythonQt.QtCore.Qt.FlatCap").toInt()==Qt::FlatCap);
                QVERIFY(PythonQtObjectPtr(_main.getVariable("PythonQt.QtCore.Qt.escape")));
              }

tests/PythonQtTests.h +46 0

              class PQCppObjectNoWrapDecorator : public QObject {
                Q_OBJECT
              public slots:
                PQCppObjectNoWrap* new_PQCppObjectNoWrap() {
                  return new PQCppObjectNoWrap(0);
              };
+             //! an cpp object that is to be wrapped by decorators only
+             class PQCppObject2 {
+             public:
+               enum TestEnumFlag {
+                 TestEnumValue1 = 0,
+                 TestEnumValue2 = 1
+               };
+               PQCppObject2() {}
+             };
+             class PQCppObject2Decorator : public QObject {
+               Q_OBJECT
+             public:
+               Q_ENUMS(TestEnumFlag)
+               Q_FLAGS(TestEnum)
+               enum TestEnumFlag {
+                 TestEnumValue1 = 0,
+                 TestEnumValue2 = 1
+               };
+               Q_DECLARE_FLAGS(TestEnum, TestEnumFlag)
+               public slots:
+               PQCppObject2* new_PQCppObject2() {
+                 return new PQCppObject2();
+               }
+               TestEnumFlag testEnumFlag1(PQCppObject2* obj, TestEnumFlag flag) { return flag; }
+               PQCppObject2::TestEnumFlag testEnumFlag2(PQCppObject2* obj, PQCppObject2::TestEnumFlag flag) { return flag; }
+               // with int overload
+               TestEnumFlag testEnumFlag3(PQCppObject2* obj, int flag) { return (TestEnumFlag)-1; }
+               TestEnumFlag testEnumFlag3(PQCppObject2* obj, TestEnumFlag flag) { return flag; }
+             };
              class PQUnknownValueObject
              {
              public:
                bool emitIntSignal(int a) { _passed = false; emit intSignal(a); return _passed; };
                bool emitFloatSignal(float a) { _passed = false; emit floatSignal(a); return _passed; };
+               bool emitEnumSignal(PQCppObject2::TestEnumFlag flag) { _passed = false; emit enumSignal(flag); return _passed; };
                bool emitVariantSignal(const QVariant& v) { _passed = false; emit variantSignal(v); return _passed; };
                QVariant expectedVariant() { return _v; }
                void floatSignal(float);
                void variantSignal(const QVariant& v);
                void complexSignal(int a, float b, const QStringList& l, QObject* obj);
+               void enumSignal(PQCppObject2::TestEnumFlag flag);
                void signal1(int);
                void signal2(const QString&);

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