diff options
Diffstat (limited to 'sources/shiboken6/ApiExtractor/tests')
31 files changed, 269 insertions, 270 deletions
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp index 8021810b3..6f96f6de5 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp @@ -71,7 +71,7 @@ void TestAbstractMetaClass::testClassNameUnderNamespace() // QVERIFY(classes[0]->hasNonPrivateConstructor()); } -static AbstractMetaFunctionCList virtualFunctions(const AbstractMetaClass *c) +static AbstractMetaFunctionCList virtualFunctions(const AbstractMetaClassCPtr &c) { AbstractMetaFunctionCList result; const auto &functions = c->functions(); @@ -113,11 +113,11 @@ public: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 4); - auto *a = AbstractMetaClass::findClass(classes, u"A"); - auto *b = AbstractMetaClass::findClass(classes, u"B"); - auto *c = AbstractMetaClass::findClass(classes, u"C"); - const AbstractMetaClass *f = AbstractMetaClass::findClass(classes, u"F"); - QVERIFY(f); + const auto a = AbstractMetaClass::findClass(classes, u"A"); + const auto b = AbstractMetaClass::findClass(classes, u"B"); + const auto c = AbstractMetaClass::findClass(classes, u"C"); + const auto f = AbstractMetaClass::findClass(classes, u"F"); + QVERIFY(!f.isNull()); QCOMPARE(a->baseClass(), nullptr); QCOMPARE(b->baseClass(), a); @@ -196,10 +196,10 @@ class Derived : public Base {}; QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto base = AbstractMetaClass::findClass(classes, u"Base"); - QVERIFY(base); + const auto base = AbstractMetaClass::findClass(classes, u"Base"); + QVERIFY(!base.isNull()); QVERIFY(base->isPolymorphic()); - auto derived = AbstractMetaClass::findClass(classes, u"Derived"); + const auto derived = AbstractMetaClass::findClass(classes, u"Derived"); QVERIFY(derived); QVERIFY(derived->isPolymorphic()); } @@ -221,7 +221,7 @@ void TestAbstractMetaClass::testDefaultValues() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); const auto candidates = classA->queryFunctionsByName(u"method"_s); QCOMPARE(candidates.size(), 1); const auto &method = candidates.constFirst(); @@ -251,7 +251,7 @@ void TestAbstractMetaClass::testModifiedDefaultValues() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); const auto methodMatches = classA->queryFunctionsByName(u"method"_s); QCOMPARE(methodMatches.size(), 1); const auto method = methodMatches.constFirst(); @@ -277,11 +277,11 @@ void TestAbstractMetaClass::testInnerClassOfAPolymorphicOne() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QVERIFY(classA->isPolymorphic()); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"A::B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"A::B"); + QVERIFY(!classB.isNull()); QVERIFY(!classB->isPolymorphic()); } @@ -305,10 +305,10 @@ void TestAbstractMetaClass::testForwardDeclaredInnerClass() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"A::B"); - QVERIFY(classB); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); + const auto classB = AbstractMetaClass::findClass(classes, u"A::B"); + QVERIFY(!classB.isNull()); const auto fooF = classB->findFunction(u"foo"); QVERIFY(!fooF.isNull()); } @@ -337,8 +337,8 @@ void TestAbstractMetaClass::testSpecialFunctions() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); QCOMPARE(ctors.constFirst()->functionType(), AbstractMetaFunction::ConstructorFunction); @@ -348,8 +348,8 @@ void TestAbstractMetaClass::testSpecialFunctions() QCOMPARE(assigmentOps.constFirst()->functionType(), AbstractMetaFunction::AssignmentOperatorFunction); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); ctors = classB->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); QCOMPARE(ctors.constFirst()->functionType(), AbstractMetaFunction::ConstructorFunction); @@ -403,7 +403,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 6); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); QCOMPARE(classA->functions().size(), 2); @@ -417,29 +417,29 @@ void TestAbstractMetaClass::testClassDefaultConstructors() QCOMPARE(ctors[1]->arguments().size(), 1); QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); QCOMPARE(classB->functions().size(), 2); QCOMPARE(classB->functions().constFirst()->minimalSignature(), u"B()"); - auto *classC = AbstractMetaClass::findClass(classes, u"C"); - QVERIFY(classC); + const auto classC = AbstractMetaClass::findClass(classes, u"C"); + QVERIFY(!classC.isNull()); QCOMPARE(classC->functions().size(), 1); QCOMPARE(classC->functions().constFirst()->minimalSignature(), u"C(C)"); - auto *classD = AbstractMetaClass::findClass(classes, u"D"); - QVERIFY(classD); + const auto classD = AbstractMetaClass::findClass(classes, u"D"); + QVERIFY(!classD.isNull()); QCOMPARE(classD->functions().size(), 1); QCOMPARE(classD->functions().constFirst()->minimalSignature(), u"D(D)"); QVERIFY(classD->functions().constFirst()->isPrivate()); - auto *classE = AbstractMetaClass::findClass(classes, u"E"); - QVERIFY(classE); + const auto classE = AbstractMetaClass::findClass(classes, u"E"); + QVERIFY(!classE.isNull()); QVERIFY(classE->hasPrivateDestructor()); QCOMPARE(classE->functions().size(), 0); - auto *classF = AbstractMetaClass::findClass(classes, u"F"); - QVERIFY(classF); + const auto classF = AbstractMetaClass::findClass(classes, u"F"); + QVERIFY(!classF.isNull()); ctors = classF->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); @@ -471,7 +471,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); @@ -485,8 +485,8 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); QVERIFY(ctors[1]->isPrivate()); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); ctors = classB->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); @@ -509,8 +509,8 @@ void TestAbstractMetaClass::testAbstractClassDefaultConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); @@ -530,8 +530,8 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); QCOMPARE(ctors.size(), 1); @@ -566,10 +566,10 @@ void TestAbstractMetaClass::testIsPolymorphic() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *b = AbstractMetaClass::findClass(classes, u"A"); + const auto b = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(!b->isPolymorphic()); - auto *a = AbstractMetaClass::findClass(classes, u"B"); + const auto a = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(!a->isPolymorphic()); } @@ -596,10 +596,10 @@ class Derived : public BaseAlias2 { QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto base = AbstractMetaClass::findClass(classes, u"Base"); - QVERIFY(base); - auto derived = AbstractMetaClass::findClass(classes, u"Derived"); - QVERIFY(derived); + const auto base = AbstractMetaClass::findClass(classes, u"Base"); + QVERIFY(!base.isNull()); + const auto derived = AbstractMetaClass::findClass(classes, u"Derived"); + QVERIFY(!derived.isNull()); QCOMPARE(derived->baseClasses().value(0), base); } @@ -681,10 +681,10 @@ public: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto base = AbstractMetaClass::findClass(classes, u"Base"); - QVERIFY(base); - auto derived = AbstractMetaClass::findClass(classes, u"Derived"); - QVERIFY(derived); + const auto base = AbstractMetaClass::findClass(classes, u"Base"); + QVERIFY(!base.isNull()); + const auto derived = AbstractMetaClass::findClass(classes, u"Derived"); + QVERIFY(!derived.isNull()); const auto usingMembers = derived->usingMembers(); QCOMPARE(usingMembers.size(), 2); for (const auto &um : usingMembers) { @@ -735,8 +735,8 @@ void TestAbstractMetaClass::testUsingTemplateMembers() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(code.constData(), xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto valueList = AbstractMetaClass::findClass(classes, u"ValueList"); - QVERIFY(valueList); + const auto valueList = AbstractMetaClass::findClass(classes, u"ValueList"); + QVERIFY(!valueList.isNull()); auto list = valueList->templateBaseClass(); QVERIFY(valueList->isUsingMember(list, u"append"_s, Access::Public)); QCOMPARE(valueList->queryFunctionsByName(u"append"_s).size(), 2); @@ -765,7 +765,7 @@ public: QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *tc = AbstractMetaClass::findClass(classes, u"TestClass"); + const auto tc = AbstractMetaClass::findClass(classes, u"TestClass"); // Verify that the constructor and 2 functions are generated. const auto &functions = tc->functions(); QCOMPARE(functions.size(), 5); diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp index 072764155..2c6cb5324 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetatype.cpp @@ -161,8 +161,8 @@ void TestAbstractMetaType::testTypedef() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - const AbstractMetaClass *c = AbstractMetaClass::findClass(classes, u"C"); - QVERIFY(c); + const auto c = AbstractMetaClass::findClass(classes, u"C"); + QVERIFY(!c.isNull()); QVERIFY(c->isTypeDef()); } @@ -211,8 +211,8 @@ void TestAbstractMetaType::testObjectTypeUsedAsValue() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto overloads = classA->queryFunctionsByName(u"method"_s); QCOMPARE(overloads.size(), 1); const auto method = overloads.constFirst(); diff --git a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp index 72cf34693..883cc62e0 100644 --- a/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testaddfunction.cpp @@ -105,8 +105,8 @@ struct A { QVERIFY(!builder.isNull()); auto *typeDb = TypeDatabase::instance(); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); // default ctor, default copy ctor, func a() and the added functions QCOMPARE(classA->functions().size(), 5); @@ -148,8 +148,8 @@ void TestAddFunction::testAddFunctionConstructor() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->functions().size(), 3); // default and added ctors const auto addedFunc = classA->functions().constLast(); QCOMPARE(addedFunc->access(), Access::Public); @@ -171,8 +171,8 @@ void TestAddFunction::testAddFunctionTagDefaultValues() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); // default ctor, default copy ctor and the added function QCOMPARE(classA->functions().size(), 3); const auto addedFunc = classA->functions().constLast(); @@ -197,8 +197,8 @@ void TestAddFunction::testAddFunctionCodeSnippets() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->functions().constLast(); QVERIFY(addedFunc->hasInjectedCode()); } @@ -227,8 +227,8 @@ void TestAddFunction::testAddFunctionWithoutParenteses() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); QVERIFY(addedFunc->hasInjectedCode()); @@ -264,8 +264,8 @@ void TestAddFunction::testAddFunctionWithDefaultArgs() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); const AbstractMetaArgument &arg = addedFunc->arguments().at(1); @@ -287,8 +287,8 @@ void TestAddFunction::testAddFunctionAtModuleLevel() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); auto *typeDb = TypeDatabase::instance(); @@ -328,8 +328,8 @@ void TestAddFunction::testAddFunctionWithVarargs() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); const AbstractMetaArgument &arg = addedFunc->arguments().constLast(); @@ -352,8 +352,8 @@ void TestAddFunction::testAddStaticFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"func"); QVERIFY(!addedFunc.isNull()); QVERIFY(addedFunc->isStatic()); @@ -378,7 +378,7 @@ void TestAddFunction::testAddGlobalFunction() QVERIFY(!builder.isNull()); const auto globalFuncs = builder->globalFunctions(); QCOMPARE(globalFuncs.size(), 2); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(builder->classes(), u"B"); + const auto classB = AbstractMetaClass::findClass(builder->classes(), u"B"); QVERIFY(classB); QVERIFY(!classB->findFunction(u"globalFunc")); QVERIFY(!classB->findFunction(u"globalFunc2")); @@ -426,7 +426,7 @@ void TestAddFunction::testModifyAddedFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *foo = AbstractMetaClass::findClass(classes, u"Foo"); + const auto foo = AbstractMetaClass::findClass(classes, u"Foo"); const auto method = foo->findFunction(u"method"); QVERIFY(!method.isNull()); QCOMPARE(method->arguments().size(), 2); @@ -453,8 +453,8 @@ void TestAddFunction::testAddFunctionOnTypedef() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *foo = AbstractMetaClass::findClass(classes, u"FooInt"); - QVERIFY(foo); + const auto foo = AbstractMetaClass::findClass(classes, u"FooInt"); + QVERIFY(!foo.isNull()); QVERIFY(foo->hasNonPrivateConstructor()); const auto &lst = foo->queryFunctions(FunctionQueryOption::AnyConstructor); for (const auto &f : lst) diff --git a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp index e7c3a0106..6b6f7e599 100644 --- a/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testarrayargument.cpp @@ -34,8 +34,8 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByInteger() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); const AbstractMetaArgument &arg = classA->functions().constLast()->arguments().constFirst(); QVERIFY(arg.type().isArray()); @@ -43,7 +43,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByInteger() QCOMPARE(arg.type().arrayElementType()->name(), u"double"); } -static QString functionMinimalSignature(const AbstractMetaClass *c, const QString &name) +static QString functionMinimalSignature(const AbstractMetaClassCPtr &c, const QString &name) { const auto f = c->findFunction(name); return f.isNull() ? QString() : f->minimalSignature(); @@ -72,7 +72,7 @@ void TestArrayArgument::testArraySignature() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); QCOMPARE(functionMinimalSignature(classA, u"mi1"_s), u"mi1(int[5])"); QCOMPARE(functionMinimalSignature(classA, u"mi1c"_s), @@ -108,8 +108,8 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + AbstractMetaClassPtr classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); auto someEnum = classA->findEnum(u"SomeEnum"_s); QVERIFY(someEnum.has_value()); @@ -139,8 +139,8 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnu QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); AbstractMetaEnum someEnum = builder->globalEnums().constFirst(); auto nvalues = someEnum.findEnumValue(u"NValues"); diff --git a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp index bb8c6882b..ed71e6d55 100644 --- a/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testcodeinjection.cpp @@ -61,7 +61,7 @@ void TestCodeInjections::testReadFile() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode.toLocal8Bit().constData())); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QCOMPARE(classA->typeEntry()->codeSnips().size(), 1); QString code = classA->typeEntry()->codeSnips().constFirst().code(); QVERIFY(code.indexOf(expected) != -1); @@ -87,7 +87,7 @@ void TestCodeInjections::testInjectWithValidApiVersion() true, u"1.0"_s)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QCOMPARE(classA->typeEntry()->codeSnips().size(), 1); } @@ -108,7 +108,7 @@ void TestCodeInjections::testInjectWithInvalidApiVersion() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QCOMPARE(classA->typeEntry()->codeSnips().size(), 0); } diff --git a/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp index 4f8dcd4b7..e266c146f 100644 --- a/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testcontainer.cpp @@ -32,8 +32,8 @@ void TestContainer::testContainerType() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); //search for class A - auto *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); auto baseContainer = classA->typeEntry()->baseContainerType(); QVERIFY(baseContainer); QCOMPARE(reinterpret_cast<const ContainerTypeEntry*>(baseContainer.data())->containerKind(), @@ -65,8 +65,8 @@ void TestContainer::testListOfValueType() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->templateBaseClassInstantiations().size(), 1); const AbstractMetaType templateInstanceType = classA->templateBaseClassInstantiations().constFirst(); diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp index f7d4b0673..ac6cb0290 100644 --- a/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testconversionoperator.cpp @@ -35,12 +35,12 @@ void TestConversionOperator::testConversionOperator() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C"); - QVERIFY(classA); - QVERIFY(classB); - QVERIFY(classC); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classC = AbstractMetaClass::findClass(classes, u"C"); + QVERIFY(!classA.isNull()); + QVERIFY(!classB.isNull()); + QVERIFY(!classC.isNull()); QCOMPARE(classA->functions().size(), 2); QCOMPARE(classB->functions().size(), 3); QCOMPARE(classC->functions().size(), 3); @@ -73,8 +73,8 @@ void TestConversionOperator::testConversionOperatorOfDiscardedClass() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->externalConversionOperators().size(), 0); } @@ -97,10 +97,10 @@ void TestConversionOperator::testRemovedConversionOperator() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classA); - QVERIFY(classB); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classA.isNull()); + QVERIFY(!classB.isNull()); QCOMPARE(classA->functions().size(), 2); QCOMPARE(classB->functions().size(), 3); QCOMPARE(classA->externalConversionOperators().size(), 0); @@ -123,10 +123,10 @@ void TestConversionOperator::testConversionOperatorReturningReference() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classA); - QVERIFY(classB); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classA.isNull()); + QVERIFY(!classB.isNull()); QCOMPARE(classA->functions().size(), 2); QCOMPARE(classB->functions().size(), 3); QCOMPARE(classA->externalConversionOperators().size(), 1); @@ -157,10 +157,10 @@ void TestConversionOperator::testConversionOperatorReturningConstReference() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classA); - QVERIFY(classB); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classA.isNull()); + QVERIFY(!classB.isNull()); QCOMPARE(classA->functions().size(), 2); QCOMPARE(classB->functions().size(), 3); QCOMPARE(classA->externalConversionOperators().size(), 1); diff --git a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp index 0f3edcfe5..5b25c685d 100644 --- a/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testconversionruletag.cpp @@ -37,8 +37,8 @@ void TestConversionRuleTag::testConversionRuleTagWithFile() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode.toLocal8Bit().data())); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto typeEntry = classA->typeEntry(); QVERIFY(typeEntry->isValue()); auto vte = qSharedPointerCast<const ValueTypeEntry>(typeEntry); @@ -154,8 +154,8 @@ if (!TargetDateTimeAPI) TargetDateTime_IMPORT;\n\ QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); - auto *classA = AbstractMetaClass::findClass(builder->classes(), u"Date"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"Date"); + QVERIFY(!classA.isNull()); QVERIFY(classA->typeEntry()->isValue()); auto vte = qSharedPointerCast<const ValueTypeEntry>(classA->typeEntry()); diff --git a/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp index 7579509ff..8b1b23a49 100644 --- a/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testctorinformation.cpp @@ -22,14 +22,14 @@ void TestCtorInformation::testCtorIsPrivate() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - auto *klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + auto klass = AbstractMetaClass::findClass(classes, u"Control"); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasNonPrivateConstructor()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasNonPrivateConstructor()); klass = AbstractMetaClass::findClass(classes, u"CtorLess"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasNonPrivateConstructor()); } @@ -48,9 +48,9 @@ void TestCtorInformation::testHasNonPrivateCtor() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *base = AbstractMetaClass::findClass(classes, u"Base"); + const auto base = AbstractMetaClass::findClass(classes, u"Base"); QCOMPARE(base->hasNonPrivateConstructor(), true); - const AbstractMetaClass *derived = AbstractMetaClass::findClass(classes, u"Derived"); + const auto derived = AbstractMetaClass::findClass(classes, u"Derived"); QCOMPARE(derived->hasNonPrivateConstructor(), true); } diff --git a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp index 95b33243e..11b0f6b62 100644 --- a/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testdtorinformation.cpp @@ -28,11 +28,11 @@ private: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + auto klass = AbstractMetaClass::findClass(classes, u"Control"); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasPrivateDestructor()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasPrivateDestructor()); } @@ -56,11 +56,11 @@ protected: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + auto klass = AbstractMetaClass::findClass(classes, u"Control"); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasProtectedDestructor()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasProtectedDestructor()); } @@ -84,11 +84,11 @@ protected: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + auto klass = AbstractMetaClass::findClass(classes, u"Control"); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasVirtualDestructor()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasVirtualDestructor()); } @@ -111,17 +111,17 @@ class Subject : public SubjectBase {}; QCOMPARE(classes.size(), 4); auto klass = AbstractMetaClass::findClass(classes, u"ControlBase"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasVirtualDestructor()); klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(!klass->hasVirtualDestructor()); klass = AbstractMetaClass::findClass(classes, u"SubjectBase"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasVirtualDestructor()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->hasVirtualDestructor()); } @@ -145,11 +145,11 @@ protected: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *klass = AbstractMetaClass::findClass(classes, u"Control"); - QVERIFY(klass); + auto klass = AbstractMetaClass::findClass(classes, u"Control"); + QVERIFY(!klass.isNull()); QVERIFY(klass->isPolymorphic()); klass = AbstractMetaClass::findClass(classes, u"Subject"); - QVERIFY(klass); + QVERIFY(!klass.isNull()); QVERIFY(klass->isPolymorphic()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testenum.cpp b/sources/shiboken6/ApiExtractor/tests/testenum.cpp index e45da9e70..018c0d231 100644 --- a/sources/shiboken6/ApiExtractor/tests/testenum.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testenum.cpp @@ -54,7 +54,7 @@ void TestEnum::testEnumCppSignature() u"A::ClassEnum"); // enum as parameter of a method - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); QCOMPARE(classA->enums().size(), 1); const auto funcs = classA->queryFunctionsByName(u"method"_s); QVERIFY(!funcs.isEmpty()); @@ -286,8 +286,8 @@ void TestEnum::testEnumValueFromExpression() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + AbstractMetaClassPtr classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); auto enumA = classA->findEnum(u"EnumA"_s); QVERIFY(enumA.has_value()); @@ -364,8 +364,8 @@ void TestEnum::testPrivateEnum() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); - AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->enums().size(), 2); auto privateEnum = classA->findEnum(u"PrivateEnum"_s); @@ -472,14 +472,14 @@ namespace Test2 fixture->globalEnum = AbstractMetaType(globalEnums.constFirst().typeEntry()); fixture->globalEnum.decideUsagePattern(); - const AbstractMetaClass *testNamespace = nullptr; - for (auto *c : fixture->builder->classes()) { + AbstractMetaClassCPtr testNamespace; + for (const auto &c : fixture->builder->classes()) { if (c->name() == u"Test2") { testNamespace = c; break; } } - if (!testNamespace) + if (testNamespace.isNull()) return -3; const auto namespaceEnums = testNamespace->enums(); diff --git a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp index 048626d2a..befa3a2b9 100644 --- a/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testextrainclude.cpp @@ -23,8 +23,8 @@ void TestExtraInclude::testClassExtraInclude() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QList<Include> includes = classA->typeEntry()->extraIncludes(); QCOMPARE(includes.size(), 1); diff --git a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp index eabd8b046..5c33512b7 100644 --- a/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testimplicitconversions.cpp @@ -33,8 +33,8 @@ void TestImplicitConversions::testWithPrivateCtors() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classC = AbstractMetaClass::findClass(classes, u"C"); const auto implicitConvs = classA->implicitConversions(); QCOMPARE(implicitConvs.size(), 1); QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(), @@ -62,8 +62,8 @@ void TestImplicitConversions::testWithModifiedVisibility() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); const auto implicitConvs = classA->implicitConversions(); QCOMPARE(implicitConvs.size(), 1); QCOMPARE(implicitConvs.constFirst()->arguments().constFirst().type().typeEntry(), @@ -97,12 +97,12 @@ void TestImplicitConversions::testWithAddedCtor() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); auto implicitConvs = classA->implicitConversions(); QCOMPARE(implicitConvs.size(), 2); // Added constructors with custom types should never result in implicit converters. - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); implicitConvs = classB->implicitConversions(); QCOMPARE(implicitConvs.size(), 0); } @@ -123,8 +123,8 @@ void TestImplicitConversions::testWithExternalConversionOperator() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); const auto implicitConvs = classA->implicitConversions(); QCOMPARE(implicitConvs.size(), 1); const auto &externalConvOps = classA->externalConversionOperators(); diff --git a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp index ffab76923..a063b37d0 100644 --- a/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testinserttemplate.cpp @@ -28,8 +28,8 @@ void TestInsertTemplate::testInsertTemplateOnClassInjectCode() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->typeEntry()->codeSnips().size(), 1); QString code = classA->typeEntry()->codeSnips().constFirst().code(); QVERIFY(code.contains(u"code template content")); diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp index 168f1a67b..49c5b525f 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmodifydocumentation.cpp @@ -34,8 +34,8 @@ R"(<typesystem package="Foo"> )"; QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); - AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); DocModificationList docMods = classA->typeEntry()->docModifications(); QCOMPARE(docMods.size(), 2); QCOMPARE(docMods[0].code().trimmed(), u"<brief>Modified Brief</brief>"); @@ -95,8 +95,8 @@ void TestModifyDocumentation::testInjectAddedFunctionDocumentation() )XML"; QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); - AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); const auto f = classA->findFunction(u"foo"); QVERIFY(!f.isNull()); QVERIFY(f->isUserAdded()); diff --git a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp index 2b2525a8c..4f98c7240 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmodifyfunction.cpp @@ -48,7 +48,7 @@ void TestModifyFunction::testRenameArgument() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode.constData(), false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); const auto func = classA->findFunction(u"method"); QVERIFY(!func.isNull()); @@ -76,7 +76,7 @@ void TestModifyFunction::testOwnershipTransfer() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); const auto func = classB->findFunction(u"method"); QVERIFY(!func.isNull()); @@ -126,14 +126,14 @@ void TestModifyFunction::invalidateAfterUse() false, u"0.1"_s)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); auto func = classB->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C"); - QVERIFY(classC); + const auto classC = AbstractMetaClass::findClass(classes, u"C"); + QVERIFY(!classC.isNull()); func = classC->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); @@ -144,7 +144,7 @@ void TestModifyFunction::invalidateAfterUse() QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, u"D"); + AbstractMetaClassCPtr classD = AbstractMetaClass::findClass(classes, u"D"); QVERIFY(classD); func = classD->findFunction(u"call"); QCOMPARE(func->modifications().size(), 1); @@ -156,8 +156,8 @@ void TestModifyFunction::invalidateAfterUse() QCOMPARE(func->modifications().at(0).argument_mods().size(), 1); QVERIFY(func->modifications().at(0).argument_mods().at(0).resetAfterUse()); - const AbstractMetaClass *classE = AbstractMetaClass::findClass(classes, u"E"); - QVERIFY(classE); + const auto classE = AbstractMetaClass::findClass(classes, u"E"); + QVERIFY(!classE.isNull()); func = classE->findFunction(u"call"); QVERIFY(func); QCOMPARE(func->modifications().size(), 1); @@ -199,7 +199,7 @@ void TestModifyFunction::testWithApiVersion() false, u"0.1"_s)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); auto func = classB->findFunction(u"method"); auto returnOwnership = func->argumentTargetOwnership(func->ownerClass(), 0); @@ -238,8 +238,8 @@ struct A { false, u"0.1"_s)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); // Nothing specified, true const auto f1 = classA->findFunction(u"f1"); @@ -436,8 +436,8 @@ void TestModifyFunction::testScopedModifications() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode.constData(), xmlCode.constData(), false)); QVERIFY(!builder.isNull()); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(builder->classes(), u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(builder->classes(), u"A"); + QVERIFY(!classA.isNull()); auto f = classA->findFunction(QStringLiteral("unspecified")); QVERIFY(!f.isNull()); diff --git a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp index a3f955602..62f95b67e 100644 --- a/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testmultipleinheritance.cpp @@ -35,7 +35,7 @@ void TestMultipleInheritance::testVirtualClass() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 4); - const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, u"D"); + const auto classD = AbstractMetaClass::findClass(classes, u"D"); bool functionFound = false; for (const auto &f : classD->functions()) { if (f->name() == u"theBug") { diff --git a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp index 248812048..fe7055343 100644 --- a/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testnamespace.cpp @@ -33,8 +33,8 @@ void NamespaceTest::testNamespaceMembers() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - AbstractMetaClass *ns = AbstractMetaClass::findClass(classes, u"Namespace"); - QVERIFY(ns); + const auto ns = AbstractMetaClass::findClass(classes, u"Namespace"); + QVERIFY(!ns.isNull()); auto metaEnum = ns->findEnum(u"Option"_s); QVERIFY(metaEnum.has_value()); const auto func = ns->findFunction(u"foo"); @@ -63,12 +63,12 @@ void NamespaceTest::testNamespaceInnerClassMembers() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *ons = AbstractMetaClass::findClass(classes, u"OuterNamespace"); - QVERIFY(ons); - const AbstractMetaClass *ins = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace"); - QVERIFY(ins); - const AbstractMetaClass *sc = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace::SomeClass"); - QVERIFY(sc); + const auto ons = AbstractMetaClass::findClass(classes, u"OuterNamespace"); + QVERIFY(!ons.isNull()); + const auto ins = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace"); + QVERIFY(!ins.isNull()); + const auto sc = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace::SomeClass"); + QVERIFY(!sc.isNull()); const auto meth = sc->findFunction(u"method"); QVERIFY(!meth.isNull()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp index f6daab0b8..028af5e1d 100644 --- a/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testnestedtypes.cpp @@ -46,11 +46,11 @@ void TestNestedTypes::testNestedTypesModifications() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *ons = AbstractMetaClass::findClass(classes, u"OuterNamespace"); - QVERIFY(ons); + const auto ons = AbstractMetaClass::findClass(classes, u"OuterNamespace"); + QVERIFY(!ons.isNull()); - auto *ins = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace"); - QVERIFY(ins); + const auto ins = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace"); + QVERIFY(!ins.isNull()); QCOMPARE(ins->functions().size(), 1); QCOMPARE(ins->typeEntry()->codeSnips().size(), 1); CodeSnip snip = ins->typeEntry()->codeSnips().constFirst(); @@ -68,8 +68,9 @@ void TestNestedTypes::testNestedTypesModifications() snip = addedFunc->modifications().constFirst().snips().constFirst(); QCOMPARE(snip.code().trimmed(), u"custom_code2();"); - auto *sc = AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace::SomeClass"); - QVERIFY(ins); + const auto sc = + AbstractMetaClass::findClass(classes, u"OuterNamespace::InnerNamespace::SomeClass"); + QVERIFY(!sc.isNull()); QCOMPARE(sc->functions().size(), 2); // default constructor and removed method const auto removedFunc = sc->functions().constLast(); QVERIFY(removedFunc->isModifiedRemoved()); @@ -95,12 +96,12 @@ void TestNestedTypes::testDuplicationOfNestedTypes() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto *nspace = AbstractMetaClass::findClass(classes, u"Namespace"); - QVERIFY(nspace); - auto *cls1 = AbstractMetaClass::findClass(classes, u"SomeClass"); - QVERIFY(cls1); - auto *cls2 = AbstractMetaClass::findClass(classes, u"Namespace::SomeClass"); - QVERIFY(cls2); + const auto nspace = AbstractMetaClass::findClass(classes, u"Namespace"); + QVERIFY(!nspace.isNull()); + const auto cls1 = AbstractMetaClass::findClass(classes, u"SomeClass"); + QVERIFY(!cls1.isNull()); + const auto cls2 = AbstractMetaClass::findClass(classes, u"Namespace::SomeClass"); + QVERIFY(!cls2.isNull()); QCOMPARE(cls1, cls2); QCOMPARE(cls1->name(), u"SomeClass"); QCOMPARE(cls1->qualifiedCppName(), u"Namespace::SomeClass"); diff --git a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp index ba2b25829..76ce7a1e1 100644 --- a/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testprimitivetypetag.cpp @@ -27,8 +27,8 @@ void TestPrimitiveTypeTag::testPrimitiveTypeDefaultConstructor() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); auto typeEntry = TypeDatabase::instance()->findPrimitiveType(u"A"_s); QVERIFY(!typeEntry.isNull()); diff --git a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp index ef83d99fb..76eccf27c 100644 --- a/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testrefcounttag.cpp @@ -34,7 +34,7 @@ void TestRefCountTag::testReferenceCountTag() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); const auto func = classB->findFunction(u"keepObject"); QVERIFY(!func.isNull()); const auto refCount = @@ -68,7 +68,7 @@ void TestRefCountTag::testWithApiVersion() false, u"0.1"_s)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); const auto func = classB->findFunction(u"keepObject"); QVERIFY(!func.isNull()); const auto refCount = diff --git a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp index 74a0adcea..89a5f78c6 100644 --- a/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testreferencetopointer.cpp @@ -25,8 +25,8 @@ void TestReferenceToPointer::testReferenceToPointerArgument() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); const auto func = classB->findFunction(u"dummy"); QVERIFY(!func.isNull()); QCOMPARE(func->arguments().constFirst().type().minimalSignature(), u"A*&"); diff --git a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp index e0acb0e5b..7f8244160 100644 --- a/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testremovefield.cpp @@ -25,8 +25,8 @@ void TestRemoveField::testRemoveField() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->fields().size(), 1); const AbstractMetaField &fieldA = classA->fields().constFirst(); QCOMPARE(fieldA.name(), u"fieldA"); diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp index 59528d517..5d22739c7 100644 --- a/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testremoveimplconv.cpp @@ -33,12 +33,12 @@ void TestRemoveImplConv::testRemoveImplConv() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); - const AbstractMetaClass *classC = AbstractMetaClass::findClass(classes, u"C"); - QVERIFY(classC); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); + const auto classC = AbstractMetaClass::findClass(classes, u"C"); + QVERIFY(!classC.isNull()); const auto implConv = classC->implicitConversions(); QCOMPARE(implConv.size(), 1); QCOMPARE(implConv.constFirst()->arguments().constFirst().type().typeEntry(), diff --git a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp index a6d929c8f..d7b716c6a 100644 --- a/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testremoveoperatormethod.cpp @@ -69,8 +69,8 @@ void TestRemoveOperatorMethod::testRemoveOperatorMethod() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->functions().size(), 14); QStringList removedSignatures; removedSignatures.append(u"operator>>(char&)"_s); diff --git a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp index a798c4339..b87bfb6a1 100644 --- a/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testresolvetype.cpp @@ -47,8 +47,8 @@ void TestResolveType::testResolveReturnTypeFromParentScope() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classD = AbstractMetaClass::findClass(classes, u"A::D"); - QVERIFY(classD); + const auto classD = AbstractMetaClass::findClass(classes, u"A::D"); + QVERIFY(!classD.isNull()); const auto meth = classD->findFunction(u"method"); QVERIFY(!meth.isNull()); QVERIFY(meth); @@ -66,7 +66,7 @@ struct DefaultValuesFixture AbstractMetaType stringType; AbstractMetaType classType; AbstractMetaType listType; - const AbstractMetaClass *klass{}; + AbstractMetaClassCPtr klass{}; }; Q_DECLARE_METATYPE(DefaultValuesFixture) @@ -253,8 +253,8 @@ public: QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *testClass = AbstractMetaClass::findClass(classes, u"Test"); - QVERIFY(testClass); + const auto testClass = AbstractMetaClass::findClass(classes, u"Test"); + QVERIFY(!testClass.isNull()); auto *tdb = TypeDatabase::instance(); auto int32TEntry = tdb->findType(u"int32_t"_s); diff --git a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp index 0e191668b..9bebf1c10 100644 --- a/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testreverseoperators.cpp @@ -27,8 +27,8 @@ void TestReverseOperators::testReverseSum() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->functions().size(), 4); AbstractMetaFunctionCPtr reverseOp; @@ -69,12 +69,12 @@ void TestReverseOperators::testReverseSumWithAmbiguity() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QCOMPARE(classA->functions().size(), 4); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); QCOMPARE(classB->functions().size(), 4); AbstractMetaFunctionCPtr reverseOp; @@ -114,8 +114,8 @@ void TestReverseOperators::testSpaceshipOperator() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - const AbstractMetaClass *testClass = AbstractMetaClass::findClass(classes, u"Test"); - QVERIFY(testClass); + const auto testClass = AbstractMetaClass::findClass(classes, u"Test"); + QVERIFY(!testClass.isNull()); const auto &functions = testClass->functions(); // 6 operators should be synthesized const auto count = std::count_if(functions.cbegin(), functions.cend(), diff --git a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp index 65c95e378..3be0a9a35 100644 --- a/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testtemplates.cpp @@ -58,8 +58,8 @@ namespace Internet { QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classB = AbstractMetaClass::findClass(classes, u"Bookmarks"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"Bookmarks"); + QVERIFY(!classB.isNull()); const auto func = classB->findFunction(u"list"); QVERIFY(!func.isNull()); AbstractMetaType funcType = func->type(); @@ -96,8 +96,8 @@ namespace Namespace { QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); QVERIFY(!classB->baseClass()); QVERIFY(classB->baseClassName().isEmpty()); const auto func = classB->findFunction(u"foo"); @@ -213,7 +213,7 @@ struct List { const AbstractMetaClassList templates = builder->templates(); QCOMPARE(templates.size(), 1); - const AbstractMetaClass *list = templates.constFirst(); + AbstractMetaClassCPtr list = templates.constFirst(); // Verify that the parameter of "void append(List l)" gets fixed to "List<T >" const auto append = list->findFunction(QStringLiteral("append")); QVERIFY(!append.isNull()); @@ -256,10 +256,10 @@ struct FooBars : public ListContainer<FooBar> {}; QCOMPARE(classes.size(), 2); QCOMPARE(templates.size(), 1); - const auto *foobars = AbstractMetaClass::findClass(classes, u"FooBars"); + const auto foobars = AbstractMetaClass::findClass(classes, u"FooBars"); QCOMPARE(foobars->functions().size(), 4); - const AbstractMetaClass *lc = templates.constFirst(); + AbstractMetaClassCPtr lc = templates.constFirst(); QCOMPARE(lc->functions().size(), 2); } @@ -290,8 +290,8 @@ template<SomeEnum type> struct Future {}; QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); QVERIFY(!classB->baseClass()); QVERIFY(classB->baseClassName().isEmpty()); // 3 functions: simple constructor, copy constructor and "method()". @@ -329,8 +329,8 @@ template<SomeEnum type> struct Future {}; QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto *classB = AbstractMetaClass::findClass(classes, u"Namespace::B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"Namespace::B"); + QVERIFY(!classB.isNull()); QVERIFY(!classB->baseClass()); QVERIFY(classB->baseClassName().isEmpty()); // 3 functions: simple constructor, copy constructor and "method()". @@ -366,10 +366,10 @@ typedef BaseTemplateClass<TypeOne> TypeOneClass; AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 3); - const auto *base = AbstractMetaClass::findClass(classes, u"BaseTemplateClass"); - QVERIFY(base); - const auto *one = AbstractMetaClass::findClass(classes, u"TypeOneClass"); - QVERIFY(one); + const auto base = AbstractMetaClass::findClass(classes, u"BaseTemplateClass"); + QVERIFY(!base.isNull()); + const auto one = AbstractMetaClass::findClass(classes, u"TypeOneClass"); + QVERIFY(!one.isNull()); QCOMPARE(one->templateBaseClass(), base); QCOMPARE(one->functions().size(), base->functions().size()); QVERIFY(one->isTypeDef()); @@ -415,8 +415,8 @@ typedef Vector<int> IntVector; AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - auto *vector = AbstractMetaClass::findClass(classes, u"IntVector"); - QVERIFY(vector); + const auto vector = AbstractMetaClass::findClass(classes, u"IntVector"); + QVERIFY(!vector.isNull()); auto baseContainer = vector->typeEntry()->baseContainerType(); QVERIFY(!baseContainer.isNull()); QCOMPARE(reinterpret_cast<const ContainerTypeEntry*>(baseContainer.data())->containerKind(), @@ -541,19 +541,17 @@ void TestTemplates::testTemplateTypeDefs() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *optional = AbstractMetaClass::findClass(classes, u"Optional"); - QVERIFY(optional); + const auto optional = AbstractMetaClass::findClass(classes, u"Optional"); + QVERIFY(!optional.isNull()); // Find the typedef'ed class - const AbstractMetaClass *optionalInt = - AbstractMetaClass::findClass(classes, u"IntOptional"); - QVERIFY(optionalInt); + const auto optionalInt = AbstractMetaClass::findClass(classes, u"IntOptional"); + QVERIFY(!optionalInt.isNull()); QCOMPARE(optionalInt->templateBaseClass(), optional); // Find the class typedef'ed in the typesystem XML - const AbstractMetaClass *xmlOptionalInt = - AbstractMetaClass::findClass(classes, u"XmlIntOptional"); - QVERIFY(xmlOptionalInt); + const auto xmlOptionalInt = AbstractMetaClass::findClass(classes, u"XmlIntOptional"); + QVERIFY(!xmlOptionalInt.isNull()); QCOMPARE(xmlOptionalInt->templateBaseClass(), optional); // Check whether the value() method now has an 'int' return @@ -612,8 +610,8 @@ public: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto testClass = AbstractMetaClass::findClass(classes, u"Test"); - QVERIFY(testClass); + const auto testClass = AbstractMetaClass::findClass(classes, u"Test"); + QVERIFY(!testClass.isNull()); auto fields = testClass->fields(); QCOMPARE(fields.size(), 1); @@ -621,8 +619,8 @@ public: QCOMPARE(fieldType.name(), u"Container1"); QCOMPARE(fieldType.instantiations().size(), 1); - auto derived = AbstractMetaClass::findClass(classes, u"Derived"); - QVERIFY(derived); + const auto derived = AbstractMetaClass::findClass(classes, u"Derived"); + QVERIFY(!derived.isNull()); auto base = derived->templateBaseClass(); QCOMPARE(base->name(), u"Container1"); } diff --git a/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp index 1ebe71ef6..400979c4c 100644 --- a/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testtyperevision.cpp @@ -32,13 +32,13 @@ void TestTypeRevision::testRevisionAttr() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *rev0 = AbstractMetaClass::findClass(classes, u"Rev_0"); + const auto rev0 = AbstractMetaClass::findClass(classes, u"Rev_0"); QCOMPARE(rev0->typeEntry()->revision(), 0); - const AbstractMetaClass *rev1 = AbstractMetaClass::findClass(classes, u"Rev_1"); + const auto rev1 = AbstractMetaClass::findClass(classes, u"Rev_1"); QCOMPARE(rev1->typeEntry()->revision(), 1); - AbstractMetaClass *rev2 = AbstractMetaClass::findClass(classes, u"Rev_2"); + const auto rev2 = AbstractMetaClass::findClass(classes, u"Rev_2"); QCOMPARE(rev2->typeEntry()->revision(), 2); auto rev3 = rev2->findEnum(u"Rev_3"_s); diff --git a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp index 06fbe9ee3..2e762c1f9 100644 --- a/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testvaluetypedefaultctortag.cpp @@ -26,13 +26,13 @@ void TestValueTypeDefaultCtorTag::testValueTypeDefaultCtorTagArgument() AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); QVERIFY(classA->typeEntry()->hasDefaultConstructor()); QCOMPARE(classA->typeEntry()->defaultConstructor(), u"A(0, 0)"); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); - QVERIFY(classB); + const auto classB = AbstractMetaClass::findClass(classes, u"B"); + QVERIFY(!classB.isNull()); QVERIFY(!classB->typeEntry()->hasDefaultConstructor()); } diff --git a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp index 255a33953..daf0d2aa5 100644 --- a/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testvoidarg.cpp @@ -19,8 +19,8 @@ void TestVoidArg::testVoidParsedFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 0); @@ -38,8 +38,8 @@ void TestVoidArg::testVoidAddedFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 0); @@ -56,8 +56,8 @@ void TestVoidArg::testVoidPointerParsedFunction() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); - QVERIFY(classA); + const auto classA = AbstractMetaClass::findClass(classes, u"A"); + QVERIFY(!classA.isNull()); const auto addedFunc = classA->findFunction(u"a"); QVERIFY(!addedFunc.isNull()); QCOMPARE(addedFunc->arguments().size(), 1); |