diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-25 08:57:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-04-25 12:13:49 +0200 |
commit | 0ca1c4ba6ecc604c70353ab50008a1295ca49959 (patch) | |
tree | 34ae34e9c6c8fb8520c1b0a637785b81a354cc90 /sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp | |
parent | da43cf70a9d125576f3795d7088e0100a4035ce5 (diff) |
shiboken6: Refactor AbstractMetaClass::findClass() to use QStringView
UTF-16 string literals can then be passed as search strings.
Pick-to: 6.3 6.2
Task-number: QTBUG-98434
Change-Id: I2ce9f3b44b704a24c01249c60e8e7a5a01ab38ba
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp')
-rw-r--r-- | sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp index 9d780ed95..5889088b7 100644 --- a/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp +++ b/sources/shiboken6/ApiExtractor/tests/testabstractmetaclass.cpp @@ -130,10 +130,10 @@ public: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 4); - AbstractMetaClass* a = AbstractMetaClass::findClass(classes, QLatin1String("A")); - AbstractMetaClass* b = AbstractMetaClass::findClass(classes, QLatin1String("B")); - AbstractMetaClass* c = AbstractMetaClass::findClass(classes, QLatin1String("C")); - const AbstractMetaClass *f = AbstractMetaClass::findClass(classes, QLatin1String("F")); + AbstractMetaClass* a = AbstractMetaClass::findClass(classes, u"A"); + AbstractMetaClass* b = AbstractMetaClass::findClass(classes, u"B"); + AbstractMetaClass* c = AbstractMetaClass::findClass(classes, u"C"); + const AbstractMetaClass *f = AbstractMetaClass::findClass(classes, u"F"); QVERIFY(f); AbstractMetaClass* no_class = nullptr; @@ -215,10 +215,10 @@ class Derived : public Base {}; QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto base = AbstractMetaClass::findClass(classes, QLatin1String("Base")); + auto base = AbstractMetaClass::findClass(classes, u"Base"); QVERIFY(base); QVERIFY(base->isPolymorphic()); - auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived")); + auto derived = AbstractMetaClass::findClass(classes, u"Derived"); QVERIFY(derived); QVERIFY(derived->isPolymorphic()); } @@ -240,7 +240,7 @@ void TestAbstractMetaClass::testDefaultValues() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); const auto candidates = classA->queryFunctionsByName(u"method"_qs); QCOMPARE(candidates.size(), 1); const auto &method = candidates.constFirst(); @@ -270,7 +270,7 @@ void TestAbstractMetaClass::testModifiedDefaultValues() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); const auto methodMatches = classA->queryFunctionsByName(QLatin1String("method")); QCOMPARE(methodMatches.size(), 1); const auto method = methodMatches.constFirst(); @@ -296,10 +296,10 @@ void TestAbstractMetaClass::testInnerClassOfAPolymorphicOne() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); QVERIFY(classA->isPolymorphic()); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("A::B")); + const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"A::B"); QVERIFY(classB); QVERIFY(!classB->isPolymorphic()); } @@ -324,9 +324,9 @@ void TestAbstractMetaClass::testForwardDeclaredInnerClass() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("A::B")); + const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"A::B"); QVERIFY(classB); const auto fooF = classB->findFunction(QLatin1String("foo")); QVERIFY(!fooF.isNull()); @@ -356,7 +356,7 @@ void TestAbstractMetaClass::testSpecialFunctions() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); @@ -367,7 +367,7 @@ void TestAbstractMetaClass::testSpecialFunctions() QCOMPARE(assigmentOps.constFirst()->functionType(), AbstractMetaFunction::AssignmentOperatorFunction); - const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); + const AbstractMetaClass *classB = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(classB); ctors = classB->queryFunctions(FunctionQueryOption::AnyConstructor); QCOMPARE(ctors.size(), 2); @@ -422,7 +422,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors() AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 6); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); QCOMPARE(classA->functions().size(), 2); @@ -436,28 +436,28 @@ void TestAbstractMetaClass::testClassDefaultConstructors() QCOMPARE(ctors[1]->arguments().size(), 1); QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); - AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); + AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(classB); QCOMPARE(classB->functions().size(), 2); QCOMPARE(classB->functions().constFirst()->minimalSignature(), u"B()"); - AbstractMetaClass* classC = AbstractMetaClass::findClass(classes, QLatin1String("C")); + AbstractMetaClass* classC = AbstractMetaClass::findClass(classes, u"C"); QVERIFY(classC); QCOMPARE(classC->functions().size(), 1); QCOMPARE(classC->functions().constFirst()->minimalSignature(), u"C(C)"); - AbstractMetaClass* classD = AbstractMetaClass::findClass(classes, QLatin1String("D")); + AbstractMetaClass* classD = AbstractMetaClass::findClass(classes, u"D"); QVERIFY(classD); QCOMPARE(classD->functions().size(), 1); QCOMPARE(classD->functions().constFirst()->minimalSignature(), u"D(D)"); QVERIFY(classD->functions().constFirst()->isPrivate()); - AbstractMetaClass* classE = AbstractMetaClass::findClass(classes, QLatin1String("E")); + AbstractMetaClass* classE = AbstractMetaClass::findClass(classes, u"E"); QVERIFY(classE); QVERIFY(classE->hasPrivateDestructor()); QCOMPARE(classE->functions().size(), 0); - AbstractMetaClass* classF = AbstractMetaClass::findClass(classes, QLatin1String("F")); + AbstractMetaClass* classF = AbstractMetaClass::findClass(classes, u"F"); QVERIFY(classF); ctors = classF->queryFunctions(FunctionQueryOption::AnyConstructor); @@ -490,7 +490,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); auto ctors = classA->queryFunctions(FunctionQueryOption::AnyConstructor); @@ -504,7 +504,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors() QCOMPARE(ctors[1]->minimalSignature(), u"A(A)"); QVERIFY(ctors[1]->isPrivate()); - AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); + AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(classB); ctors = classB->queryFunctions(FunctionQueryOption::Constructors); @@ -528,7 +528,7 @@ void TestAbstractMetaClass::testAbstractClassDefaultConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); @@ -549,7 +549,7 @@ void TestAbstractMetaClass::testObjectTypesMustNotHaveCopyConstructors() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 1); - AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* classA = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(classA); const auto ctors = classA->queryFunctions(FunctionQueryOption::Constructors); @@ -585,10 +585,10 @@ void TestAbstractMetaClass::testIsPolymorphic() QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - AbstractMetaClass* b = AbstractMetaClass::findClass(classes, QLatin1String("A")); + AbstractMetaClass* b = AbstractMetaClass::findClass(classes, u"A"); QVERIFY(!b->isPolymorphic()); - AbstractMetaClass* a = AbstractMetaClass::findClass(classes, QLatin1String("B")); + AbstractMetaClass* a = AbstractMetaClass::findClass(classes, u"B"); QVERIFY(!a->isPolymorphic()); } @@ -615,9 +615,9 @@ class Derived : public BaseAlias2 { QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto base = AbstractMetaClass::findClass(classes, QLatin1String("Base")); + auto base = AbstractMetaClass::findClass(classes, u"Base"); QVERIFY(base); - auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived")); + auto derived = AbstractMetaClass::findClass(classes, u"Derived"); QVERIFY(derived); QCOMPARE(derived->baseClasses().value(0), base); } @@ -700,9 +700,9 @@ public: QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); QCOMPARE(classes.size(), 2); - auto base = AbstractMetaClass::findClass(classes, QLatin1String("Base")); + auto base = AbstractMetaClass::findClass(classes, u"Base"); QVERIFY(base); - auto derived = AbstractMetaClass::findClass(classes, QLatin1String("Derived")); + auto derived = AbstractMetaClass::findClass(classes, u"Derived"); QVERIFY(derived); const auto usingMembers = derived->usingMembers(); QCOMPARE(usingMembers.size(), 2); @@ -754,7 +754,7 @@ void TestAbstractMetaClass::testUsingTemplateMembers() QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(code.constData(), xmlCode)); QVERIFY(!builder.isNull()); AbstractMetaClassList classes = builder->classes(); - auto valueList = AbstractMetaClass::findClass(classes, QLatin1String("ValueList")); + auto valueList = AbstractMetaClass::findClass(classes, u"ValueList"); QVERIFY(valueList); auto list = valueList->templateBaseClass(); QVERIFY(valueList->isUsingMember(list, QLatin1String("append"), Access::Public)); |