1 files changed, 97 insertions, 2 deletions

diff --git a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp
index d0a0c9c7a..af24689fe 100644
--- a/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/sources/shiboken2/ApiExtractor/tests/testmodifyfunction.cpp
@@ -136,7 +136,8 @@ void TestModifyFunction::invalidateAfterUse()
         </object-type>\n\
         <object-type name='E' />\n\
     </typesystem>\n";
-    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false, "0.1"));
+    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode,
+                                                                false, QLatin1String("0.1")));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("B"));
@@ -208,7 +209,8 @@ void TestModifyFunction::testWithApiVersion()
         </modify-function>\n\
         </object-type>\n\
     </typesystem>\n";
-    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false, "0.1"));
+    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode,
+                                                                false, QLatin1String("0.1")));
     QVERIFY(!builder.isNull());
     AbstractMetaClassList classes = builder->classes();
     AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B"));
@@ -220,6 +222,61 @@ void TestModifyFunction::testWithApiVersion()
     QVERIFY(func->ownership(func->ownerClass(), TypeSystem::TargetLangCode, 0) != TypeSystem::CppOwnership);
 }
 
+void TestModifyFunction::testAllowThread()
+{
+    const char cppCode[] =R"CPP(\
+struct A {
+    void f1();
+    void f2();
+    void f3();
+    int getter1() const;
+    int getter2() const;
+};
+)CPP";
+
+    const char xmlCode[] = R"XML(
+<typesystem package='Foo'>
+    <primitive-type name='int'/>
+    <object-type name='A'>
+        <modify-function signature='f2()' allow-thread='auto'/>
+        <modify-function signature='f3()' allow-thread='no'/>
+        <modify-function signature='getter2()const' allow-thread='yes'/>
+    </object-type>
+</typesystem>
+)XML";
+    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode,
+                                                                false, QLatin1String("0.1")));
+    QVERIFY(!builder.isNull());
+    AbstractMetaClassList classes = builder->classes();
+    const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
+    QVERIFY(classA);
+
+    // Nothing specified, true
+    const AbstractMetaFunction *f1 = classA->findFunction(QLatin1String("f1"));
+    QVERIFY(f1);
+    QVERIFY(f1->allowThread());
+
+    // 'auto' specified, should be true for nontrivial function
+    const AbstractMetaFunction *f2 = classA->findFunction(QLatin1String("f2"));
+    QVERIFY(f2);
+    QVERIFY(f2->allowThread());
+
+    // 'no' specified, should be false
+    const AbstractMetaFunction *f3 = classA->findFunction(QLatin1String("f3"));
+    QVERIFY(f3);
+    QVERIFY(!f3->allowThread());
+
+    // Nothing specified, should be false for simple getter
+    const AbstractMetaFunction *getter1 = classA->findFunction(QLatin1String("getter1"));
+    QVERIFY(getter1);
+    QVERIFY(!getter1->allowThread());
+
+    // Forced to true simple getter
+    const AbstractMetaFunction *getter2 = classA->findFunction(QLatin1String("getter2"));
+    QVERIFY(getter2);
+    QVERIFY(getter2->allowThread()); // Forced to true simple getter
+}
+
 void TestModifyFunction::testGlobalFunctionModification()
 {
     const char* cppCode ="\
@@ -258,4 +315,42 @@ void TestModifyFunction::testGlobalFunctionModification()
     QCOMPARE(arg->defaultValueExpression(), QLatin1String("A()"));
 }
 
+void TestModifyFunction::testExceptionSpecification()
+{
+    const char cppCode[] = R"CPP(
+struct A {
+    void unspecified();
+    void nonThrowing() noexcept;
+    void throwing() throw(int);
+};
+)CPP";
+    const char xmlCode[] = R"XML(
+<typesystem package="Foo">
+    <primitive-type name='int'/>
+    <object-type name='A'>
+        <modify-function signature='throwing()' exception-handling='auto-on'/>
+    </object-type>
+</typesystem>)XML";
+    QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
+    QVERIFY(!builder.isNull());
+
+    const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), QLatin1String("A"));
+    QVERIFY(classA);
+
+    const AbstractMetaFunction *f = classA->findFunction(QStringLiteral("unspecified"));
+    QVERIFY(f);
+    QCOMPARE(f->exceptionSpecification(), ExceptionSpecification::Unknown);
+    QVERIFY(!f->generateExceptionHandling());
+
+    f = classA->findFunction(QStringLiteral("nonThrowing"));
+    QVERIFY(f);
+    QCOMPARE(f->exceptionSpecification(), ExceptionSpecification::NoExcept);
+    QVERIFY(!f->generateExceptionHandling());
+
+    f = classA->findFunction(QStringLiteral("throwing"));
+    QVERIFY(f);
+    QCOMPARE(f->exceptionSpecification(), ExceptionSpecification::Throws);
+    QVERIFY(f->generateExceptionHandling());
+}
+
 QTEST_APPLESS_MAIN(TestModifyFunction)