diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 07:40:09 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-20 12:49:12 +0200 |
| commit | 201ca07ae23ab142ac2efcf2413adf6c243be7f7 (patch) | |
| tree | 6761b1bbd30680d585be4ba53e75eebba6581152 /tests | |
| parent | e4343bcfe85111042a38870704079329cfe49794 (diff) | |
| download | qt3d-201ca07ae23ab142ac2efcf2413adf6c243be7f7.tar.gz | |
Port from container::count() and length() to size() - V4
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8, but extended to
handle typedefs and accesses through pointers, too:
const std::string o = "object";
auto hasTypeIgnoringPointer = [](auto type) { return anyOf(hasType(type), hasType(pointsTo(type))); };
auto derivedFromAnyOfClasses = [&](ArrayRef<StringRef> classes) {
auto exprOfDeclaredType = [&](auto decl) {
return expr(hasTypeIgnoringPointer(hasUnqualifiedDesugaredType(recordType(hasDeclaration(decl))))).bind(o);
};
return exprOfDeclaredType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))));
};
auto renameMethod = [&] (ArrayRef<StringRef> classes,
StringRef from, StringRef to) {
return makeRule(cxxMemberCallExpr(on(derivedFromAnyOfClasses(classes)),
callee(cxxMethodDecl(hasName(from), parameterCountIs(0)))),
changeTo(cat(access(o, cat(to)), "()")),
cat("use '", to, "' instead of '", from, "'"));
};
renameMethod(<classes>, "count", "size");
renameMethod(<classes>, "length", "size");
a.k.a qt-port-to-std-compatible-api V4 with config Scope: 'Container'.
Change-Id: I3b040fa72968753048fd669c073ae80c3ba1bdad
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'tests')
66 files changed, 644 insertions, 644 deletions
diff --git a/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp index 49766f2da..22a0e9a27 100644 --- a/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp +++ b/tests/auto/animation/qabstractanimation/tst_qabstractanimation.cpp @@ -54,7 +54,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractAnimation.animationName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -62,7 +62,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractAnimation.animationName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -73,7 +73,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractAnimation.position(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -81,7 +81,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractAnimation.position(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp index 23ee27a7d..f31d65ce3 100644 --- a/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp +++ b/tests/auto/animation/qadditiveclipblend/tst_qadditiveclipblend.cpp @@ -45,7 +45,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(addBlend.additiveFactor(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QCOMPARE(addBlend.additiveFactor(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -65,7 +65,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(addBlend.baseClip(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -73,7 +73,7 @@ private Q_SLOTS: // THEN QCOMPARE(addBlend.baseClip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -85,7 +85,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(addBlend.additiveClip(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -93,7 +93,7 @@ private Q_SLOTS: // THEN QCOMPARE(addBlend.additiveClip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp b/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp index 8f9b07e8b..963268c34 100644 --- a/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp +++ b/tests/auto/animation/qanimationcliploader/tst_qanimationcliploader.cpp @@ -39,7 +39,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(clip.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -47,7 +47,7 @@ private Q_SLOTS: // THEN QCOMPARE(clip.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp index 65ff89d22..38f4ba651 100644 --- a/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp +++ b/tests/auto/animation/qanimationcontroller/tst_qanimationcontroller.cpp @@ -41,7 +41,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.activeAnimationGroup(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.activeAnimationGroup(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -60,7 +60,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.position(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.position(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -79,7 +79,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.positionScale(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.positionScale(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -98,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.positionOffset(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -106,7 +106,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.positionOffset(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.entity(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -126,7 +126,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.entity(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -137,7 +137,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.recursive(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -145,7 +145,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationController.recursive(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp index 0ce62ead7..f4664c181 100644 --- a/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp +++ b/tests/auto/animation/qanimationgroup/tst_qanimationgroup.cpp @@ -36,7 +36,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationGroup.name(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -44,7 +44,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationGroup.name(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -55,7 +55,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationGroup.position(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -63,7 +63,7 @@ private Q_SLOTS: // THEN QCOMPARE(animationGroup.position(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp index 7576a127c..94fe5dee2 100644 --- a/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp +++ b/tests/auto/animation/qblendedclipanimator/tst_qblendedclipanimator.cpp @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.blendTree(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -57,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.blendTree(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.channelMapper(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -76,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.channelMapper(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.isRunning(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -95,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.isRunning(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -107,7 +107,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.loopCount(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -115,7 +115,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.loopCount(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -127,7 +127,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.normalizedTime(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -135,7 +135,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.normalizedTime(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -148,7 +148,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(blendedClipAnimator.normalizedTime(), oldValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN spy.clear(); @@ -156,7 +156,7 @@ private Q_SLOTS: // THEN QCOMPARE(blendedClipAnimator.normalizedTime(), oldValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp index 6827d5281..e66c0241d 100644 --- a/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp +++ b/tests/auto/animation/qcallbackmapping/tst_qcallbackmapping.cpp @@ -44,7 +44,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mapping.channelName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -52,7 +52,7 @@ private Q_SLOTS: // THEN QCOMPARE(mapping.channelName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { diff --git a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp index 52eed5eab..6bedadb41 100644 --- a/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp +++ b/tests/auto/animation/qchannelmapping/tst_qchannelmapping.cpp @@ -88,7 +88,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mapping.channelName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -96,7 +96,7 @@ private Q_SLOTS: // THEN QCOMPARE(mapping.channelName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -109,7 +109,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(mapping.target(), newValue); QCOMPARE(newValue->parent(), &mapping); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -117,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(mapping.target(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -129,7 +129,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mapping.property(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -137,7 +137,7 @@ private Q_SLOTS: // THEN QCOMPARE(mapping.property(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp index 6cd306074..d10456908 100644 --- a/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp +++ b/tests/auto/animation/qclipanimator/tst_qclipanimator.cpp @@ -53,7 +53,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(animator.clip(), newValue); QCOMPARE(newValue->parent(), &animator); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -61,7 +61,7 @@ private Q_SLOTS: // THEN QCOMPARE(animator.clip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -74,7 +74,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(animator.channelMapper(), newValue); QCOMPARE(newValue->parent(), &animator); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -82,7 +82,7 @@ private Q_SLOTS: // THEN QCOMPARE(animator.channelMapper(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -95,7 +95,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(animator.clock(), clock); QCOMPARE(clock->parent(), &animator); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -103,7 +103,7 @@ private Q_SLOTS: // THEN QCOMPARE(animator.clock(), clock); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -115,7 +115,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(animator.loopCount(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -123,7 +123,7 @@ private Q_SLOTS: // THEN QCOMPARE(animator.loopCount(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp b/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp index 314acb9fb..8cadb1df8 100644 --- a/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp +++ b/tests/auto/animation/qclipblendvalue/tst_qclipblendvalue.cpp @@ -43,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(clipBlendNode.clip(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -51,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(clipBlendNode.clip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qclock/tst_qclock.cpp b/tests/auto/animation/qclock/tst_qclock.cpp index 8270b6ff3..da21bba67 100644 --- a/tests/auto/animation/qclock/tst_qclock.cpp +++ b/tests/auto/animation/qclock/tst_qclock.cpp @@ -41,7 +41,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(clock.playbackRate(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QCOMPARE(clock.playbackRate(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } void checkPropertyUpdate() diff --git a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp index 00c16f784..b9f4ad565 100644 --- a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp +++ b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp @@ -45,7 +45,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.target(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.target(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -64,7 +64,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.easing(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -72,7 +72,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.easing(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -83,7 +83,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -91,7 +91,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -104,7 +104,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.startMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -112,7 +112,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.startMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -125,7 +125,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.endMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -133,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(keyframeAnimation.endMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp b/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp index 34e953983..d8c67f8f1 100644 --- a/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp +++ b/tests/auto/animation/qlerpclipblend/tst_qlerpclipblend.cpp @@ -45,7 +45,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(lerpBlend.blendFactor(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QCOMPARE(lerpBlend.blendFactor(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -65,7 +65,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(lerpBlend.startClip(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -73,7 +73,7 @@ private Q_SLOTS: // THEN QCOMPARE(lerpBlend.startClip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -85,7 +85,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(lerpBlend.endClip(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -93,7 +93,7 @@ private Q_SLOTS: // THEN QCOMPARE(lerpBlend.endClip(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp index 2aac299f6..8cb22b145 100644 --- a/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp +++ b/tests/auto/animation/qmorphinganimation/tst_qmorphinganimation.cpp @@ -59,7 +59,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.target(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -67,7 +67,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.target(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -78,7 +78,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -86,7 +86,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -98,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.method(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -106,7 +106,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.method(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -117,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.easing(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -125,7 +125,7 @@ private Q_SLOTS: // THEN QCOMPARE(morphingAnimation.easing(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp b/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp index 9443259bc..76512f47a 100644 --- a/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp +++ b/tests/auto/animation/qskeletonmapping/tst_qskeletonmapping.cpp @@ -43,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mapping.skeleton(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -51,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(mapping.skeleton(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp index c1dc20ed9..f77a972ae 100644 --- a/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp +++ b/tests/auto/animation/qvertexblendanimation/tst_qvertexblendanimation.cpp @@ -38,7 +38,7 @@ private Q_SLOTS: // THEN QCOMPARE(vertexBlendAnimation.target(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -46,7 +46,7 @@ private Q_SLOTS: // THEN QCOMPARE(vertexBlendAnimation.target(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -57,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(vertexBlendAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -65,7 +65,7 @@ private Q_SLOTS: // THEN QCOMPARE(vertexBlendAnimation.targetName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 2601e7365..7c5868e11 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -591,7 +591,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneExplicitParenting() // THEN QVERIFY(child->parent() == node.data()); QVERIFY(child->parentNode() == node.data()); - QCOMPARE(node->children().count(), 1); + QCOMPARE(node->children().size(), 1); // Events are only sent when a scene is set on the root node QCOMPARE(arbiter.dirtyNodes().size(), 0); @@ -614,7 +614,7 @@ void tst_Nodes::appendSingleChildNodeToNodeNoSceneImplicitParenting() // THEN QVERIFY(child->parent() == node.data()); QVERIFY(child->parentNode() == node.data()); - QCOMPARE(node->children().count(), 1); + QCOMPARE(node->children().size(), 1); // Events are only sent when a scene is set on the root node QCOMPARE(arbiter.dirtyNodes().size(), 0); @@ -646,7 +646,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeNoScene() } // THEN - QCOMPARE(node->children().count(), 10); + QCOMPARE(node->children().size(), 10); // Events are only sent when a scene is set on the root node QCOMPARE(arbiter.dirtyNodes().size(), 0); @@ -680,7 +680,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneExplicitParenting() QVERIFY(child->parent() == node.data()); QVERIFY(child->parentNode() == node.data()); QCOMPARE(arbiter.dirtyNodes().size(), 1); // Child Added - QCOMPARE(node->children().count(), 1); + QCOMPARE(node->children().size(), 1); QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != nullptr); } @@ -707,7 +707,7 @@ void tst_Nodes::appendSingleChildNodeToNodeSceneImplicitParenting() QVERIFY(Qt3DCore::QNodePrivate::get(child.data())->scene() != nullptr); QCOMPARE(arbiter.dirtyNodes().size(), 1); - QCOMPARE(node->children().count(), 1); + QCOMPARE(node->children().size(), 1); } void tst_Nodes::appendMultipleChildNodesToNodeScene() @@ -742,7 +742,7 @@ void tst_Nodes::appendMultipleChildNodesToNodeScene() QVERIFY(Qt3DCore::QNodePrivate::get(child)->scene() == Qt3DCore::QNodePrivate::get(node.data())->m_scene); } // THEN - QCOMPARE(node->children().count(), 10); + QCOMPARE(node->children().size(), 10); // WHEN QCoreApplication::processEvents(); @@ -839,7 +839,7 @@ void tst_Nodes::checkParentChangeFromExistingBackendParentToNewlyCreatedParent() // Due to the way we create root, it has a backend QVERIFY(Qt3DCore::QNodePrivate::get(root.data())->m_hasBackendNode == true); - QCOMPARE(aspect->events.count(), 2); + QCOMPARE(aspect->events.size(), 2); QCOMPARE(aspect->events[0].type, TestAspect::Creation); QCOMPARE(aspect->events[0].nodeId, child->id()); QCOMPARE(aspect->events[1].type, TestAspect::Creation); @@ -932,7 +932,7 @@ void tst_Nodes::checkBackendNodesCreatedFromTopDown() child1->setNodeProperty(child2); // THEN - we should have no events because the new nodes have no backend yet - QCOMPARE(arbiter.dirtyNodes().count(), 0); + QCOMPARE(arbiter.dirtyNodes().size(), 0); // WHEN - create the backend nodes QCoreApplication::processEvents(); @@ -1018,7 +1018,7 @@ void tst_Nodes::removingSingleChildNodeFromNode() arbiter.clear(); // THEN - QVERIFY(root->children().count() == 1); + QVERIFY(root->children().size() == 1); QVERIFY(child->parentNode() == root.data()); // WHEN @@ -1026,7 +1026,7 @@ void tst_Nodes::removingSingleChildNodeFromNode() // THEN QVERIFY(child->parent() == nullptr); - QVERIFY(root->children().count() == 0); + QVERIFY(root->children().size() == 0); QCOMPARE(arbiter.dirtyNodes().size(), 1); } @@ -1048,7 +1048,7 @@ void tst_Nodes::checkAllBackendCreationDoneInSingleFrame() // THEN // Due to the way we create root, it has a backend QVERIFY(Qt3DCore::QNodePrivate::get(root.data())->m_hasBackendNode == true); - QCOMPARE(aspect->events.count(), 1); + QCOMPARE(aspect->events.size(), 1); QCOMPARE(aspect->events[0].type, TestAspect::Creation); QCOMPARE(aspect->events[0].nodeId, root->id()); @@ -1072,7 +1072,7 @@ void tst_Nodes::checkAllBackendCreationDoneInSingleFrame() engine.processFrame(); // THEN - both children have their backend nodes actually created. - QCOMPARE(aspect->events.count(), 2); + QCOMPARE(aspect->events.size(), 2); QCOMPARE(aspect->events[0].type, TestAspect::Creation); QCOMPARE(aspect->events[0].nodeId, child2->id()); QCOMPARE(aspect->events[1].type, TestAspect::Creation); @@ -1102,7 +1102,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode() QCoreApplication::processEvents(); // THEN - QCOMPARE(root->children().count(), 10); + QCOMPARE(root->children().size(), 10); QCOMPARE(arbiter.dirtyNodes().size(), 1); // WHEN @@ -1111,7 +1111,7 @@ void tst_Nodes::removingMultipleChildNodesFromNode() qDeleteAll(cl); // THEN - QVERIFY(root->children().count() == 0); + QVERIFY(root->children().size() == 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); // since all nodes are deleted, there's no backend to notify } @@ -1179,8 +1179,8 @@ void tst_Nodes::checkConstructionSetParentMix() // THEN QCoreApplication::processEvents(); - QCOMPARE(root->children().count(), 1); - QCOMPARE(subTreeRoot->children().count(), 100); + QCOMPARE(root->children().size(), 1); + QCOMPARE(subTreeRoot->children().size(), 100); QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added (subTree to root) // Ensure first event is subTreeRoot @@ -1244,7 +1244,7 @@ void tst_Nodes::checkConstructionWithParent() // THEN we should get one child added change QCoreApplication::processEvents(); - QCOMPARE(root->children().count(), 1); + QCOMPARE(root->children().size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added change QCOMPARE(arbiter.dirtyNodes().front(), root.data()); } @@ -1276,8 +1276,8 @@ void tst_Nodes::checkConstructionWithNonRootParent() // - and one property change event, // in that order. QCoreApplication::processEvents(); - QCOMPARE(root->children().count(), 1); - QCOMPARE(parent->children().count(), 1); + QCOMPARE(root->children().size(), 1); + QCOMPARE(parent->children().size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added changes QCOMPARE(arbiter.dirtyNodes().front(), root.data()); @@ -1305,7 +1305,7 @@ void tst_Nodes::checkConstructionAsListElement() // and one property change event, in that order. QCoreApplication::processEvents(); - QCOMPARE(root->children().count(), 1); + QCOMPARE(root->children().size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 property change } @@ -1338,8 +1338,8 @@ void tst_Nodes::checkSceneIsSetOnConstructionWithParent() // When cmp is full created, it will also send the creation change for its child entity } QCoreApplication::processEvents(); - QCOMPARE(root->children().count(), 1); - QCOMPARE(subTreeRoot->children().count(), 5); + QCOMPARE(root->children().size(), 1); + QCOMPARE(subTreeRoot->children().size(), 5); QCOMPARE(arbiter.dirtyNodes().size(), 1); // 1 child added (subTree to root) arbiter.clear(); @@ -1401,7 +1401,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithoutScene() // THEN QVERIFY(entity->parentNode() == nullptr); - QVERIFY(entity->children().count() == 0); + QVERIFY(entity->children().size() == 0); QVERIFY(entity->components().empty()); QVERIFY(comp->parentNode() == nullptr); @@ -1409,7 +1409,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithoutScene() entity->addComponent(comp); // THEN - QVERIFY(entity->components().count() == 1); + QVERIFY(entity->components().size() == 1); QVERIFY(entity->components().first() == comp); QVERIFY(comp->parentNode() == entity.data()); QCOMPARE(arbiter.dirtyNodes().size(), 1); @@ -1440,10 +1440,10 @@ void tst_Nodes::appendingParentlessComponentToNonRootEntity() // THEN QVERIFY(root->parentNode() == nullptr); - QVERIFY(root->children().count() == 1); + QVERIFY(root->children().size() == 1); QVERIFY(root->components().empty()); QVERIFY(entity->parentNode() == root.data()); - QVERIFY(entity->children().count() == 0); + QVERIFY(entity->children().size() == 0); QVERIFY(entity->components().empty()); QVERIFY(comp->parentNode() == nullptr); @@ -1452,7 +1452,7 @@ void tst_Nodes::appendingParentlessComponentToNonRootEntity() QCoreApplication::processEvents(); // THEN - QVERIFY(entity->components().count() == 1); + QVERIFY(entity->components().size() == 1); QVERIFY(entity->components().first() == comp); QVERIFY(comp->parentNode() == entity.data()); @@ -1482,7 +1482,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithScene() // THEN QVERIFY(entity->parentNode() == nullptr); - QVERIFY(entity->children().count() == 0); + QVERIFY(entity->children().size() == 0); QVERIFY(entity->components().empty()); QVERIFY(comp->parentNode() == nullptr); @@ -1491,7 +1491,7 @@ void tst_Nodes::appendingParentlessComponentToEntityWithScene() QCoreApplication::processEvents(); // THEN - QVERIFY(entity->components().count() == 1); + QVERIFY(entity->components().size() == 1); QVERIFY(entity->components().first() == comp); QVERIFY(comp->parentNode() == entity.data()); @@ -1513,7 +1513,7 @@ void tst_Nodes::appendingComponentToEntity() // THEN QVERIFY(entity->parentNode() == nullptr); - QVERIFY(entity->children().count() == 1); + QVERIFY(entity->children().size() == 1); QVERIFY(entity->components().empty()); QVERIFY(comp->parentNode() == entity.data()); @@ -1521,7 +1521,7 @@ void tst_Nodes::appendingComponentToEntity() entity->addComponent(comp); // THEN - QVERIFY(entity->components().count() == 1); + QVERIFY(entity->components().size() == 1); QVERIFY(entity->components().first() == comp); QVERIFY(comp->parentNode() == entity.data()); QCOMPARE(arbiter.dirtyNodes().size(), 1); @@ -1543,8 +1543,8 @@ void tst_Nodes::removingComponentFromEntity() entity->addComponent(comp); // THEN - QVERIFY(entity->components().count() == 1); - QCOMPARE(entity->children().count(), 1); + QVERIFY(entity->components().size() == 1); + QCOMPARE(entity->children().size(), 1); QVERIFY(comp->parent() == entity.data()); // WHEN @@ -1552,9 +1552,9 @@ void tst_Nodes::removingComponentFromEntity() entity->removeComponent(comp); // THEN - QVERIFY(entity->components().count() == 0); + QVERIFY(entity->components().size() == 0); QVERIFY(comp->parent() == entity.data()); - QVERIFY(entity->children().count() == 1); + QVERIFY(entity->children().size() == 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); } } @@ -1623,7 +1623,7 @@ void tst_Nodes::checkPropertyChanges() // THEN QVERIFY(spy.isValid()); QCOMPARE(node.parentNode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -1631,7 +1631,7 @@ void tst_Nodes::checkPropertyChanges() // THEN QCOMPARE(node.parentNode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -1642,7 +1642,7 @@ void tst_Nodes::checkPropertyChanges() // THEN QVERIFY(spy.isValid()); QCOMPARE(node.isEnabled(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -1650,7 +1650,7 @@ void tst_Nodes::checkPropertyChanges() // THEN QCOMPARE(node.isEnabled(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/core/qjoint/tst_qjoint.cpp b/tests/auto/core/qjoint/tst_qjoint.cpp index b816f7785..6c632dfab 100644 --- a/tests/auto/core/qjoint/tst_qjoint.cpp +++ b/tests/auto/core/qjoint/tst_qjoint.cpp @@ -45,7 +45,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(joint.scale(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QCOMPARE(joint.scale(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -66,7 +66,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(joint.rotation(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -74,7 +74,7 @@ private Q_SLOTS: // THEN QCOMPARE(joint.rotation(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(joint.translation(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -95,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(joint.translation(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -109,7 +109,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(joint.inverseBindMatrix(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -117,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(joint.inverseBindMatrix(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -134,8 +134,8 @@ private Q_SLOTS: QVERIFY(spyEuler.isValid()); QCOMPARE(joint.rotationX(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 1); - QCOMPARE(spyEuler.count(), 1); + QCOMPARE(spy.size(), 1); + QCOMPARE(spyEuler.size(), 1); // WHEN spy.clear(); @@ -145,8 +145,8 @@ private Q_SLOTS: // THEN QCOMPARE(joint.rotationX(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 0); - QCOMPARE(spyEuler.count(), 0); + QCOMPARE(spy.size(), 0); + QCOMPARE(spyEuler.size(), 0); joint.setRotationX(0.0f); } @@ -165,8 +165,8 @@ private Q_SLOTS: QVERIFY(spyEuler.isValid()); QCOMPARE(joint.rotationY(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 1); - QCOMPARE(spyEuler.count(), 1); + QCOMPARE(spy.size(), 1); + QCOMPARE(spyEuler.size(), 1); // WHEN spy.clear(); @@ -176,8 +176,8 @@ private Q_SLOTS: // THEN QCOMPARE(joint.rotationY(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 0); - QCOMPARE(spyEuler.count(), 0); + QCOMPARE(spy.size(), 0); + QCOMPARE(spyEuler.size(), 0); joint.setRotationY(0.0f); } @@ -196,8 +196,8 @@ private Q_SLOTS: QVERIFY(spyEuler.isValid()); QCOMPARE(joint.rotationZ(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 1); - QCOMPARE(spyEuler.count(), 1); + QCOMPARE(spy.size(), 1); + QCOMPARE(spyEuler.size(), 1); // WHEN spy.clear(); @@ -207,8 +207,8 @@ private Q_SLOTS: // THEN QCOMPARE(joint.rotationZ(), newValue); QCOMPARE(joint.rotation(), newValueAsQuaternion); - QCOMPARE(spy.count(), 0); - QCOMPARE(spyEuler.count(), 0); + QCOMPARE(spy.size(), 0); + QCOMPARE(spyEuler.size(), 0); joint.setRotationZ(0.0f); } diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index 4fd49ddbb..1dc512205 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -248,7 +248,7 @@ void tst_QScene::addEntityForComponent() // THEN for (int i = 0; i < 10; i++) { const QList<Qt3DCore::QNodeId> ids = scene->entitiesForComponent(components.at(i)->id()); - QCOMPARE(ids.count(), 10); + QCOMPARE(ids.size(), 10); } } @@ -283,7 +283,7 @@ void tst_QScene::removeEntityForComponent() Qt3DCore::QEntity *e = entities.at(i); for (int j = 0; j < 10; j++) { e->removeComponent(components.at(j)); - QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).count(), 10 - (i + 1)); + QCOMPARE(scene->entitiesForComponent(components.at(j)->id()).size(), 10 - (i + 1)); } } } diff --git a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp index 82bdc29f9..9324de2f4 100644 --- a/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp +++ b/tests/auto/core/qskeletonloader/tst_qskeletonloader.cpp @@ -42,7 +42,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(skeleton.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -50,7 +50,7 @@ private Q_SLOTS: // THEN QCOMPARE(skeleton.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -62,7 +62,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(skeleton.isCreateJointsEnabled(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -70,7 +70,7 @@ private Q_SLOTS: // THEN QCOMPARE(skeleton.isCreateJointsEnabled(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp index 3a0d08528..c7a5aa594 100644 --- a/tests/auto/core/qtransform/tst_qtransform.cpp +++ b/tests/auto/core/qtransform/tst_qtransform.cpp @@ -272,7 +272,7 @@ private Q_SLOTS: // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(t.worldMatrix(), newValue); @@ -281,7 +281,7 @@ private Q_SLOTS: dT->setWorldMatrix(newValue); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(t.worldMatrix(), newValue); } diff --git a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp index 57800053d..aec1e9315 100644 --- a/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp +++ b/tests/auto/extras/qtext2dentity/tst_qtext2dentity.cpp @@ -42,7 +42,7 @@ void tst_qtext2dentity::checkChangeArbiter() auto rootEntity = view.engine()->aspectEngine()->rootEntity(); QVERIFY(rootEntity != nullptr); auto atlases = lookupNodeByClassName(rootEntity.data(), "Qt3DExtras::QTextureAtlas"); - QVERIFY(atlases.length() == 1); + QVERIFY(atlases.size() == 1); auto atlas = atlases[0]; QTRY_VERIFY(Qt3DCore::QNodePrivate::get(atlas)->m_changeArbiter); } diff --git a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp index efb24df81..11f65e6ac 100644 --- a/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp +++ b/tests/auto/input/axisaccumulator/tst_axisaccumulator.cpp @@ -129,7 +129,7 @@ private Q_SLOTS: // THEN QCOMPARE(backendAxisAccumulator.value(), 0.0f); - QCOMPARE(arbiter.dirtyNodes().count(), 0); + QCOMPARE(arbiter.dirtyNodes().size(), 0); } void checkIntegration_data() diff --git a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp index 642372c96..26ffa2921 100644 --- a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp +++ b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp @@ -144,7 +144,7 @@ private Q_SLOTS: job.run(); // THEN -> PhysicalDeviceWrapper::setDevice should not have been called - QCOMPARE(arbiter.dirtyNodes().count(), 0); + QCOMPARE(arbiter.dirtyNodes().size(), 0); } } diff --git a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp index 93ca142c0..c91dc8e6b 100644 --- a/tests/auto/input/qmousedevice/tst_qmousedevice.cpp +++ b/tests/auto/input/qmousedevice/tst_qmousedevice.cpp @@ -60,7 +60,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mouseDevice.sensitivity(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QCOMPARE(mouseDevice.sensitivity(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -79,7 +79,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mouseDevice.updateAxesContinuously(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QCOMPARE(mouseDevice.updateAxesContinuously(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h index 4c9f50b8b..344175d80 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h +++ b/tests/auto/quick3d/quick3dnodeinstantiator/stringmodel.h @@ -38,7 +38,7 @@ public: int rowCount(const QModelIndex &) const override { - return items.count(); + return items.size(); } QHash<int, QByteArray> roleNames() const override @@ -73,7 +73,7 @@ public: QVariant data (const QModelIndex & index, int role) const override { int row = index.row(); - if ((row<0) || (row>=items.count())) + if ((row<0) || (row>=items.size())) return int(QMetaType::UnknownType); switch (role) { diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp index 1291720bd..e7037bce8 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp +++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp @@ -93,7 +93,7 @@ void tst_quick3dnodeinstantiator::createNested() QVERIFY(root != 0); auto instantiators = root->findChildren<Quick3DNodeInstantiator*>(); - QCOMPARE(instantiators.count(), 4); + QCOMPARE(instantiators.size(), 4); const auto outerInstantiator = instantiators.takeFirst(); QCOMPARE(outerInstantiator->isActive(), true); @@ -148,19 +148,19 @@ void tst_quick3dnodeinstantiator::activeProperty() QCOMPARE(instantiator->count(), 0); QVERIFY(instantiator->delegate()->isReady()); - QCOMPARE(activeSpy.count(), 0); - QCOMPARE(countSpy.count(), 0); - QCOMPARE(objectSpy.count(), 0); - QCOMPARE(modelSpy.count(), 0); + QCOMPARE(activeSpy.size(), 0); + QCOMPARE(countSpy.size(), 0); + QCOMPARE(objectSpy.size(), 0); + QCOMPARE(modelSpy.size(), 0); instantiator->setActive(true); QCOMPARE(instantiator->isActive(), true); QCOMPARE(instantiator->count(), 1); - QCOMPARE(activeSpy.count(), 1); - QCOMPARE(countSpy.count(), 1); - QCOMPARE(objectSpy.count(), 1); - QCOMPARE(modelSpy.count(), 0); + QCOMPARE(activeSpy.size(), 1); + QCOMPARE(countSpy.size(), 1); + QCOMPARE(objectSpy.size(), 1); + QCOMPARE(modelSpy.size(), 0); QObject *object = instantiator->object(); QVERIFY(object); @@ -183,18 +183,18 @@ void tst_quick3dnodeinstantiator::intModelChange() QSignalSpy modelSpy(instantiator, SIGNAL(modelChanged())); QCOMPARE(instantiator->count(), 10); - QCOMPARE(activeSpy.count(), 0); - QCOMPARE(countSpy.count(), 0); - QCOMPARE(objectSpy.count(), 0); - QCOMPARE(modelSpy.count(), 0); + QCOMPARE(activeSpy.size(), 0); + QCOMPARE(countSpy.size(), 0); + QCOMPARE(objectSpy.size(), 0); + QCOMPARE(modelSpy.size(), 0); instantiator->setModel(QVariant(2)); QCOMPARE(instantiator->count(), 2); - QCOMPARE(activeSpy.count(), 0); - QCOMPARE(countSpy.count(), 1); - QCOMPARE(objectSpy.count(), 2); - QCOMPARE(modelSpy.count(), 1); + QCOMPARE(activeSpy.size(), 0); + QCOMPARE(countSpy.size(), 1); + QCOMPARE(objectSpy.size(), 2); + QCOMPARE(modelSpy.size(), 1); for (int i = 0; i < 2; i++) { QObject *object = instantiator->objectAt(i); diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp index 4873a5441..1b18923db 100644 --- a/tests/auto/render/entity/tst_entity.cpp +++ b/tests/auto/render/entity/tst_entity.cpp @@ -212,8 +212,8 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == backendB); - QCOMPARE(backendA->childrenHandles().count(), 1); - QCOMPARE(backendB->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); + QCOMPARE(backendB->childrenHandles().size(), 1); QVERIFY(backendC->childrenHandles().isEmpty()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::AllDirty); @@ -244,7 +244,7 @@ private slots: QVERIFY(backendB->parent() == nullptr); QVERIFY(backendC->parent() == backendA); - QCOMPARE(backendA->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); QVERIFY(!backendA->childrenHandles().contains(backendB->handle())); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -281,7 +281,7 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == backendA); - QCOMPARE(backendA->childrenHandles().count(), 2); + QCOMPARE(backendA->childrenHandles().size(), 2); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -297,7 +297,7 @@ private slots: QVERIFY(backendB->parent() == backendA); QVERIFY(backendC->parent() == nullptr); - QCOMPARE(backendA->childrenHandles().count(), 1); + QCOMPARE(backendA->childrenHandles().size(), 1); QVERIFY(!backendA->childrenHandles().contains(backendC->handle())); QVERIFY(backendB->childrenHandles().isEmpty()); QVERIFY(backendC->childrenHandles().isEmpty()); @@ -558,8 +558,8 @@ private slots: const auto r2 = v2.apply(backendA); // THEN - QCOMPARE(r1.count(), 3); - QCOMPARE(r2.count(), 0); + QCOMPARE(r1.size(), 3); + QCOMPARE(r2.size(), 0); } private: diff --git a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp index 56e614c21..d99627de1 100644 --- a/tests/auto/render/framegraphnode/tst_framegraphnode.cpp +++ b/tests/auto/render/framegraphnode/tst_framegraphnode.cpp @@ -114,9 +114,9 @@ private Q_SLOTS: // THEN QCOMPARE(child->parentId(), parentId); QCOMPARE(child->parent(), parent1); - QCOMPARE(parent1->childrenIds().count(), 1); + QCOMPARE(parent1->childrenIds().size(), 1); QCOMPARE(parent1->childrenIds().first(), childId); - QCOMPARE(parent1->children().count(), parent1->childrenIds().count()); + QCOMPARE(parent1->children().size(), parent1->childrenIds().size()); QCOMPARE(parent1->children().first(), child); // WHEN @@ -125,8 +125,8 @@ private Q_SLOTS: // THEN QVERIFY(child->parentId().isNull()); QVERIFY(child->parent() == nullptr); - QCOMPARE(parent1->childrenIds().count(), 0); - QCOMPARE(parent1->children().count(), parent1->childrenIds().count()); + QCOMPARE(parent1->childrenIds().size(), 0); + QCOMPARE(parent1->children().size(), parent1->childrenIds().size()); } void checkSetParent() diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index 5b447010a..1e4d933fa 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -54,7 +54,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderGeometry.peerId(), geometry.id()); QCOMPARE(renderGeometry.isDirty(), true); - QCOMPARE(renderGeometry.attributes().count(), 4); + QCOMPARE(renderGeometry.attributes().size(), 4); QCOMPARE(renderGeometry.boundingPositionAttribute(), attr1.id()); Qt3DCore::QNodeIdVector attribs = Qt3DCore::qIdsForNodes(geometry.attributes()); @@ -134,7 +134,7 @@ private Q_SLOTS: renderGeometry.syncFromFrontEnd(&geometry, false); // THEN - QCOMPARE(renderGeometry.attributes().count(), 1); + QCOMPARE(renderGeometry.attributes().size(), 1); QVERIFY(renderGeometry.isDirty()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty); renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); @@ -147,7 +147,7 @@ private Q_SLOTS: renderGeometry.syncFromFrontEnd(&geometry, false); // THEN - QCOMPARE(renderGeometry.attributes().count(), 0); + QCOMPARE(renderGeometry.attributes().size(), 0); QVERIFY(renderGeometry.isDirty()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::GeometryDirty); renderer.clearDirtyBits(Qt3DRender::Render::AbstractRenderer::AllDirty); @@ -179,7 +179,7 @@ private Q_SLOTS: renderGeometry.updateExtent(QVector3D(-1.0f, -1.0f, -1.0f), QVector3D(1.0f, 1.0f, 1.0f)); // THEN - QCOMPARE(arbiter.dirtyNodes().count(), 0); + QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(renderGeometry.min(), QVector3D(-1.0f, -1.0f, -1.0f)); QCOMPARE(renderGeometry.max(), QVector3D(1.0f, 1.0f, 1.0f)); diff --git a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp index 3ae977fe8..a012e62a7 100644 --- a/tests/auto/render/geometryloaders/tst_geometryloaders.cpp +++ b/tests/auto/render/geometryloaders/tst_geometryloaders.cpp @@ -66,7 +66,7 @@ void tst_geometryloaders::testOBJLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: @@ -108,7 +108,7 @@ void tst_geometryloaders::testPLYLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: @@ -150,7 +150,7 @@ void tst_geometryloaders::testSTLLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { QCOMPARE(attr->count(), 36u); } @@ -182,7 +182,7 @@ void tst_geometryloaders::testGLTFLoader() if (!geometry) return; - QCOMPARE(geometry->attributes().count(), 3); + QCOMPARE(geometry->attributes().size(), 3); for (QAttribute *attr : geometry->attributes()) { switch (attr->attributeType()) { case QAttribute::IndexAttribute: diff --git a/tests/auto/render/material/tst_material.cpp b/tests/auto/render/material/tst_material.cpp index de8cbcbdb..33c6cb487 100644 --- a/tests/auto/render/material/tst_material.cpp +++ b/tests/auto/render/material/tst_material.cpp @@ -95,7 +95,7 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer() // THEN QVERIFY(backend.isEnabled() == frontendMaterial->isEnabled()); QCOMPARE(backend.effect(), frontendMaterial->effect() ? frontendMaterial->effect()->id() : QNodeId()); - QCOMPARE(backend.parameters().count(), frontendMaterial->parameters().count()); + QCOMPARE(backend.parameters().size(), frontendMaterial->parameters().size()); QVERIFY(renderer.dirtyBits() & Qt3DRender::Render::AbstractRenderer::MaterialDirty); int c = 0; @@ -122,7 +122,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange() backend.syncFromFrontEnd(&material, false); // THEN - QCOMPARE(backend.parameters().count(), 1); + QCOMPARE(backend.parameters().size(), 1); QCOMPARE(backend.parameters().first(), parameter->id()); QVERIFY(renderer.dirtyBits() != 0); diff --git a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp index e08e4b2c7..ea97071b1 100644 --- a/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp +++ b/tests/auto/render/opengl/renderviewutils/tst_renderviewutils.cpp @@ -437,7 +437,7 @@ void tst_RenderViewUtils::topLevelScalarValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -511,7 +511,7 @@ void tst_RenderViewUtils::topLevelTextureValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -552,7 +552,7 @@ void tst_RenderViewUtils::topLevelArrayValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 1); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 1); // WHEN Qt3DRender::Render::UniformBlockValueBuilderHash::const_iterator it = blockBuilder.activeUniformNamesToValue.begin(); @@ -622,7 +622,7 @@ void tst_RenderViewUtils::nestedShaderDataValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendArrayShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3); // WHEN auto it = blockBuilder.activeUniformNamesToValue.cbegin(); @@ -696,7 +696,7 @@ void tst_RenderViewUtils::topLevelStructValue() blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, blockName); // THEN - QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.count()), + QCOMPARE(size_t(blockBuilder.activeUniformNamesToValue.size()), shaderData->buildUniformMapNameIds(blockName).size()); // WHEN @@ -746,7 +746,7 @@ void tst_RenderViewUtils::topLevelDynamicProperties() // build name-value map blockBuilder.buildActiveUniformNameValueMapStructHelper(backendShaderData, QStringLiteral("MyBlock")); // THEN - QCOMPARE(blockBuilder.activeUniformNamesToValue.count(), 3); + QCOMPARE(blockBuilder.activeUniformNamesToValue.size(), 3); QCOMPARE(blockBuilder.activeUniformNamesToValue.value(Qt3DRender::Render::StringToInt::lookupId("MyBlock.scalar")), shaderData->property("scalar")); diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 2927489b0..e8e217c6e 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -831,10 +831,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } { @@ -849,10 +849,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } { @@ -867,10 +867,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), /*backAndFrontPicking ? 2 :*/ 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), /*backAndFrontPicking ? 2 :*/ 1); + QCOMPARE(mouseClickedSpy.size(), 1); } mouseButtonPressedSpy.clear(); @@ -893,9 +893,9 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); } } @@ -959,9 +959,9 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); } { @@ -976,9 +976,9 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); } mouseButtonPressedSpy.clear(); @@ -997,9 +997,9 @@ private Q_SLOTS: // THEN -> Should have received nothing QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); } } @@ -1070,8 +1070,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 0); } { @@ -1086,8 +1086,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 1); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 1); } mouseEntered.clear(); @@ -1108,8 +1108,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseEntered.count(), 1); - QCOMPARE(mouseExited.count(), 1); + QCOMPARE(mouseEntered.size(), 1); + QCOMPARE(mouseExited.size(), 1); } } @@ -1186,10 +1186,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } mouseButtonPressedSpy.clear(); @@ -1206,10 +1206,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); } mouseMovedSpy.clear(); @@ -1226,10 +1226,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(!picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 0); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), 0); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); + QCOMPARE(mouseClickedSpy.size(), 1); } // WHEN -> Release outside of object @@ -1251,10 +1251,10 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(!picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 1); - QCOMPARE(mouseClickedSpy.count(), 1); + QCOMPARE(mouseButtonPressedSpy.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 1); + QCOMPARE(mouseClickedSpy.size(), 1); } } @@ -1361,12 +1361,12 @@ private Q_SLOTS: QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); } { @@ -1382,20 +1382,20 @@ private Q_SLOTS: if (pickResultMode != Qt3DRender::QPickingSettings::AllPicks) { QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 1); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 1); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); } else { QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), backAndFrontPicking ? 2 : 1); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 1); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), backAndFrontPicking ? 2 : 1); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 1); + QCOMPARE(mouseExited2.size(), 0); } } } @@ -1460,12 +1460,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } void checkPickerAndViewports() @@ -1529,12 +1529,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } // WHEN reset -> Presset on object in vp2 @@ -1552,12 +1552,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } } @@ -1616,8 +1616,8 @@ private Q_SLOTS: QVERIFY(picker1->isPressed()); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(150., 300.), QPointF(150., 300.), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -1636,8 +1636,8 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker2->isPressed()); QVERIFY(picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); } } @@ -1729,11 +1729,11 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(200.0, 300.0), QPointF(200.0, 300.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -1761,11 +1761,11 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(541.0, 183.0), QPointF(541.0, 183.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -1793,11 +1793,11 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); } // WHEN -> Pressed on object3 in VP2 @@ -1820,11 +1820,11 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 0); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 0); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); } // WHEN -> Pressed on object4 in VP1 @@ -1847,11 +1847,11 @@ private Q_SLOTS: QVERIFY(picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 1); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 1); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(160.0, 431.0), QPointF(160.0, 431.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -1879,11 +1879,11 @@ private Q_SLOTS: QVERIFY(picker4->isPressed()); QVERIFY(!backendPicker5->isPressed()); QVERIFY(!picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 2); - QCOMPARE(mouseButtonPressedSpy5.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 2); + QCOMPARE(mouseButtonPressedSpy5.size(), 0); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(447.0, 472.0), QPointF(447.0, 472.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -1911,11 +1911,11 @@ private Q_SLOTS: QVERIFY(!picker4->isPressed()); QVERIFY(backendPicker5->isPressed()); QVERIFY(picker5->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseButtonPressedSpy3.count(), 0); - QCOMPARE(mouseButtonPressedSpy4.count(), 2); - QCOMPARE(mouseButtonPressedSpy5.count(), 1); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseButtonPressedSpy3.size(), 0); + QCOMPARE(mouseButtonPressedSpy4.size(), 2); + QCOMPARE(mouseButtonPressedSpy5.size(), 1); auto event2 = QMouseEvent(QMouseEvent::MouseButtonRelease, QPointF(153.0, 195.0), QPointF(153.0, 195.0), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); @@ -2011,12 +2011,12 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker->isPressed()); QVERIFY(picker->isPressed()); - QCOMPARE(mouseButtonPressedSpy.count(), 1); - QCOMPARE(mouseMovedSpy.count(), 0); - QCOMPARE(mouseButtonReleasedSpy.count(), 0); - QCOMPARE(mouseClickedSpy.count(), 0); - QCOMPARE(mouseEntered.count(), 0); - QCOMPARE(mouseExited.count(), 0); + QCOMPARE(mouseButtonPressedSpy.size(), 1); + QCOMPARE(mouseMovedSpy.size(), 0); + QCOMPARE(mouseButtonReleasedSpy.size(), 0); + QCOMPARE(mouseClickedSpy.size(), 0); + QCOMPARE(mouseEntered.size(), 0); + QCOMPARE(mouseExited.size(), 0); } void checkPriorityPicking() @@ -2098,21 +2098,21 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(backendPicker1->isPressed()); QVERIFY(picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } { @@ -2124,21 +2124,21 @@ private Q_SLOTS: QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 1); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 1); - QCOMPARE(mouseClickedSpy1.count(), 1); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 1); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 1); + QCOMPARE(mouseClickedSpy1.size(), 1); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 0); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 0); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } } @@ -2166,21 +2166,21 @@ private Q_SLOTS: QVERIFY(!earlyReturn); QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 0); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 0); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(backendPicker2->isPressed()); QVERIFY(picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 0); - QCOMPARE(mouseClickedSpy2.count(), 0); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 0); + QCOMPARE(mouseClickedSpy2.size(), 0); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } { @@ -2192,21 +2192,21 @@ private Q_SLOTS: QVERIFY(!backendPicker1->isPressed()); QVERIFY(!picker1->isPressed()); - QCOMPARE(mouseButtonPressedSpy1.count(), 0); - QCOMPARE(mouseMovedSpy1.count(), 0); - QCOMPARE(mouseButtonReleasedSpy1.count(), 0); - QCOMPARE(mouseClickedSpy1.count(), 0); - QCOMPARE(mouseEntered1.count(), 0); - QCOMPARE(mouseExited1.count(), 0); + QCOMPARE(mouseButtonPressedSpy1.size(), 0); + QCOMPARE(mouseMovedSpy1.size(), 0); + QCOMPARE(mouseButtonReleasedSpy1.size(), 0); + QCOMPARE(mouseClickedSpy1.size(), 0); + QCOMPARE(mouseEntered1.size(), 0); + QCOMPARE(mouseExited1.size(), 0); QVERIFY(!backendPicker2->isPressed()); QVERIFY(!picker2->isPressed()); - QCOMPARE(mouseButtonPressedSpy2.count(), 1); - QCOMPARE(mouseMovedSpy2.count(), 0); - QCOMPARE(mouseButtonReleasedSpy2.count(), 1); - QCOMPARE(mouseClickedSpy2.count(), 1); - QCOMPARE(mouseEntered2.count(), 0); - QCOMPARE(mouseExited2.count(), 0); + QCOMPARE(mouseButtonPressedSpy2.size(), 1); + QCOMPARE(mouseMovedSpy2.size(), 0); + QCOMPARE(mouseButtonReleasedSpy2.size(), 1); + QCOMPARE(mouseClickedSpy2.size(), 1); + QCOMPARE(mouseEntered2.size(), 0); + QCOMPARE(mouseExited2.size(), 0); } } } diff --git a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp index 3f259cf05..d72f72031 100644 --- a/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp +++ b/tests/auto/render/qabstracttexture/tst_qabstracttexture.cpp @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -95,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -106,7 +106,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.generateMipMaps(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -114,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.generateMipMaps(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -125,7 +125,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.width(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -133,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.width(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -144,7 +144,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.height(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -152,7 +152,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.height(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -163,7 +163,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.depth(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -171,7 +171,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.depth(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -182,7 +182,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.magnificationFilter(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -190,7 +190,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.magnificationFilter(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -201,7 +201,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.minificationFilter(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -209,7 +209,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.minificationFilter(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -220,7 +220,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.maximumAnisotropy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -228,7 +228,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.maximumAnisotropy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -239,7 +239,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.comparisonFunction(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -247,7 +247,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.comparisonFunction(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -258,7 +258,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.comparisonMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -266,7 +266,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.comparisonMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -277,7 +277,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.layers(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -285,7 +285,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.layers(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -296,7 +296,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.samples(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -304,7 +304,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.samples(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -315,7 +315,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTexture.mipLevels(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -323,7 +323,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTexture.mipLevels(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -756,7 +756,7 @@ private Q_SLOTS: dTexture->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.status(), newStatus); @@ -766,7 +766,7 @@ private Q_SLOTS: dTexture->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.status(), newStatus); } @@ -783,7 +783,7 @@ private Q_SLOTS: dTexture->setHandleType(newType); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handleType(), newType); @@ -793,7 +793,7 @@ private Q_SLOTS: dTexture->setHandleType(newType); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handleType(), newType); } @@ -809,7 +809,7 @@ private Q_SLOTS: dTexture->setHandle(QVariant(1)); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(abstractTexture.handle(), QVariant(1)); // WHEN @@ -818,7 +818,7 @@ private Q_SLOTS: dTexture->setHandle(QVariant(1)); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(abstractTexture.handle(), QVariant(1)); } diff --git a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp index 210b616c3..c8373962c 100644 --- a/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp +++ b/tests/auto/render/qabstracttextureimage/tst_qabstracttextureimage.cpp @@ -54,7 +54,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -62,7 +62,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -73,7 +73,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -81,7 +81,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -92,7 +92,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(abstractTextureImage.face(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -100,7 +100,7 @@ private Q_SLOTS: // THEN QCOMPARE(abstractTextureImage.face(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qcameralens/tst_qcameralens.cpp b/tests/auto/render/qcameralens/tst_qcameralens.cpp index 6211d3a12..2779284c8 100644 --- a/tests/auto/render/qcameralens/tst_qcameralens.cpp +++ b/tests/auto/render/qcameralens/tst_qcameralens.cpp @@ -52,7 +52,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.projectionType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -60,7 +60,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.projectionType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -71,7 +71,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.nearPlane(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -79,7 +79,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.nearPlane(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -90,7 +90,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.farPlane(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -98,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.farPlane(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -109,7 +109,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.fieldOfView(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -117,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.fieldOfView(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -128,7 +128,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.aspectRatio(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -136,7 +136,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.aspectRatio(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -147,7 +147,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.left(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -155,7 +155,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.left(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -166,7 +166,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.right(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -174,7 +174,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.right(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -185,7 +185,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.bottom(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -193,7 +193,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.bottom(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -204,7 +204,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.top(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -212,7 +212,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.top(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -223,7 +223,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(cameraLens.exposure(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().toFloat(), -2.0f); // WHEN @@ -232,7 +232,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.exposure(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -245,7 +245,7 @@ private Q_SLOTS: QVERIFY(spy.isValid()); QCOMPARE(cameraLens.projectionMatrix(), newValue); QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::CustomProjection); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -253,7 +253,7 @@ private Q_SLOTS: // THEN QCOMPARE(cameraLens.projectionMatrix(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -269,7 +269,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1 + QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::OrthographicProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); @@ -292,7 +292,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1 + QCOMPARE(spy.size(), 5); // Triggered for each property being set (- projectionTye which is the default value) + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::PerspectiveProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); @@ -313,7 +313,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 8); // Triggered for each property being set + 1 + QCOMPARE(spy.size(), 8); // Triggered for each property being set + 1 QCOMPARE(cameraLens.projectionType(), Qt3DRender::QCameraLens::FrustumProjection); QCOMPARE(cameraLens.nearPlane(), 0.5f); QCOMPARE(cameraLens.farPlane(), 50.0f); diff --git a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp index d7f801a12..cd752932c 100644 --- a/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp +++ b/tests/auto/render/qcomputecommand/tst_qcomputecommand.cpp @@ -41,7 +41,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupX(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupX(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -60,7 +60,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupY(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupY(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -79,7 +79,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.workGroupZ(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.workGroupZ(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -98,7 +98,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(computeCommand.runType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -106,7 +106,7 @@ private Q_SLOTS: // THEN QCOMPARE(computeCommand.runType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp index 70a6b1b01..21165f370 100644 --- a/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp +++ b/tests/auto/render/qdispatchcompute/tst_qdispatchcompute.cpp @@ -40,7 +40,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupX(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -48,7 +48,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupX(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -59,7 +59,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupY(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -67,7 +67,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupY(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -78,7 +78,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(dispatchCompute.workGroupZ(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -86,7 +86,7 @@ private Q_SLOTS: // THEN QCOMPARE(dispatchCompute.workGroupZ(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp index 76549ff8b..88b1ac104 100644 --- a/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp +++ b/tests/auto/render/qenvironmentlight/tst_qenvironmentlight.cpp @@ -77,7 +77,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -86,7 +86,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN light.setIrradiance(nullptr); @@ -94,7 +94,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -107,7 +107,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -116,7 +116,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -129,7 +129,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), texture); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -138,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -153,7 +153,7 @@ private Q_SLOTS: QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), texture); QCOMPARE(shaderData->property("irradianceSize").value<QVector3D>(), QVector3D(texture->width(), texture->height(), texture->depth())); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -183,7 +183,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.irradiance(), nullptr); QCOMPARE(shaderData->property("irradiance").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); // THEN @@ -200,7 +200,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -209,7 +209,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN light.setSpecular(nullptr); @@ -217,7 +217,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -230,7 +230,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -239,7 +239,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -252,7 +252,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), texture); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -261,7 +261,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); } { @@ -276,7 +276,7 @@ private Q_SLOTS: QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), texture); QCOMPARE(shaderData->property("specularSize").value<QVector3D>(), QVector3D(texture->width(), texture->height(), texture->depth())); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), texture); // WHEN @@ -306,7 +306,7 @@ private Q_SLOTS: // THEN QCOMPARE(light.specular(), nullptr); QCOMPARE(shaderData->property("specular").value<Qt3DRender::QAbstractTexture*>(), nullptr); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.takeFirst().first().value<Qt3DRender::QAbstractTexture*>(), nullptr); // THEN diff --git a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp index 3560bbfd6..2c9f7b36f 100644 --- a/tests/auto/render/qfilterkey/tst_qfilterkey.cpp +++ b/tests/auto/render/qfilterkey/tst_qfilterkey.cpp @@ -39,7 +39,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(filterKey.value(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -47,7 +47,7 @@ private Q_SLOTS: // THEN QCOMPARE(filterKey.value(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -58,7 +58,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(filterKey.name(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -66,7 +66,7 @@ private Q_SLOTS: // THEN QCOMPARE(filterKey.name(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index 7371b78fb..43aa915d7 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -115,8 +115,8 @@ private Q_SLOTS: dNode->setExtent(minExt, maxExt); // THEN - QCOMPARE(spyMinExtent.count(), 1); - QCOMPARE(spyMaxExtent.count(), 1); + QCOMPARE(spyMinExtent.size(), 1); + QCOMPARE(spyMaxExtent.size(), 1); QCOMPARE(geometry->minExtent(), minExt); QCOMPARE(geometry->maxExtent(), maxExt); @@ -127,8 +127,8 @@ private Q_SLOTS: dNode->setExtent(minExt, maxExt); // THEN - QCOMPARE(spyMinExtent.count(), 0); - QCOMPARE(spyMaxExtent.count(), 0); + QCOMPARE(spyMinExtent.size(), 0); + QCOMPARE(spyMaxExtent.size(), 0); } }; diff --git a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp index 31b8d55f2..f7240eb7f 100644 --- a/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp +++ b/tests/auto/render/qgraphicsapifilter/tst_qgraphicsapifilter.cpp @@ -59,7 +59,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -69,7 +69,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.majorVersion(), 4); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -79,7 +79,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.minorVersion(), 5); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -90,7 +90,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.extensions(), extensions); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } { @@ -101,7 +101,7 @@ private Q_SLOTS: // THEN QCOMPARE(apiFilter.vendor(), vendor); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } } diff --git a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp index ba6ad0758..71e74d785 100644 --- a/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp +++ b/tests/auto/render/qmemorybarrier/tst_qmemorybarrier.cpp @@ -43,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(memoryBarrier.waitOperations(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -51,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(memoryBarrier.waitOperations(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qmesh/tst_qmesh.cpp b/tests/auto/render/qmesh/tst_qmesh.cpp index 63af32182..6dad93483 100644 --- a/tests/auto/render/qmesh/tst_qmesh.cpp +++ b/tests/auto/render/qmesh/tst_qmesh.cpp @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mesh.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -61,7 +61,7 @@ private Q_SLOTS: // THEN QCOMPARE(mesh.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -72,7 +72,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(mesh.meshName(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -80,7 +80,7 @@ private Q_SLOTS: // THEN QCOMPARE(mesh.meshName(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qparameter/tst_qparameter.cpp b/tests/auto/render/qparameter/tst_qparameter.cpp index 7aff50ad2..5511cc7ad 100644 --- a/tests/auto/render/qparameter/tst_qparameter.cpp +++ b/tests/auto/render/qparameter/tst_qparameter.cpp @@ -39,7 +39,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(parameter.name(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -47,7 +47,7 @@ private Q_SLOTS: // THEN QCOMPARE(parameter.name(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -58,7 +58,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(parameter.value(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -66,7 +66,7 @@ private Q_SLOTS: // THEN QCOMPARE(parameter.value(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -169,13 +169,13 @@ private Q_SLOTS: parameter.setValue(QVariant::fromValue(node.data())); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(parameter.value(), QVariant::fromValue(node.data())); spy.clear(); } // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(parameter.value(), QVariant()); } diff --git a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp index 95bca8722..b47d1de1f 100644 --- a/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp +++ b/tests/auto/render/qproximityfilter/tst_qproximityfilter.cpp @@ -47,7 +47,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(proximityFilter.entity(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -55,7 +55,7 @@ private Q_SLOTS: // THEN QCOMPARE(proximityFilter.entity(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -66,7 +66,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(proximityFilter.distanceThreshold(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -74,7 +74,7 @@ private Q_SLOTS: // THEN QCOMPARE(proximityFilter.distanceThreshold(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qraycaster/tst_qraycaster.cpp b/tests/auto/render/qraycaster/tst_qraycaster.cpp index cc2307025..9cb4521b3 100644 --- a/tests/auto/render/qraycaster/tst_qraycaster.cpp +++ b/tests/auto/render/qraycaster/tst_qraycaster.cpp @@ -168,7 +168,7 @@ private Q_SLOTS: // THEN // Check that the QRayCaster triggers the expected signal - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } }; diff --git a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp index bf7e211d7..65613ec59 100644 --- a/tests/auto/render/qrenderpass/tst_qrenderpass.cpp +++ b/tests/auto/render/qrenderpass/tst_qrenderpass.cpp @@ -50,7 +50,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderPass.shaderProgram(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -58,7 +58,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderPass.shaderProgram(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp index 11ae269df..e4a6cc600 100644 --- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp +++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp @@ -23,8 +23,8 @@ private Q_SLOTS: { QScopedPointer<Qt3DRender::QRenderPassFilter> defaultRenderPassFilter(new Qt3DRender::QRenderPassFilter); - QCOMPARE(defaultRenderPassFilter->matchAny().count(), 0); - QCOMPARE(defaultRenderPassFilter->parameters().count(), 0); + QCOMPARE(defaultRenderPassFilter->matchAny().size(), 0); + QCOMPARE(defaultRenderPassFilter->parameters().size(), 0); } void checkPropertyUpdates() diff --git a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp index b9b85355a..5d2109dd0 100644 --- a/tests/auto/render/qrendersettings/tst_qrendersettings.cpp +++ b/tests/auto/render/qrendersettings/tst_qrendersettings.cpp @@ -54,7 +54,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSettings.renderPolicy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -62,7 +62,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSettings.renderPolicy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -74,7 +74,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSettings.activeFrameGraph(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -82,7 +82,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSettings.activeFrameGraph(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -93,7 +93,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->pickMethod(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -101,7 +101,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->pickMethod(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -112,7 +112,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->pickResultMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -120,7 +120,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->pickResultMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -131,7 +131,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -139,7 +139,7 @@ private Q_SLOTS: // THEN QCOMPARE(pickingSettings->faceOrientationPickingMode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp index 5f6eed85d..565c31b86 100644 --- a/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp +++ b/tests/auto/render/qrendersurfaceselector/tst_qrendersurfaceselector.cpp @@ -103,7 +103,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.surface(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -111,7 +111,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.surface(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // Prevents crashes with temporary window being destroyed renderSurfaceSelector.setSurface(nullptr); @@ -126,7 +126,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -134,7 +134,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.externalRenderTargetSize(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -145,7 +145,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -153,7 +153,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderSurfaceSelector.surfacePixelRatio(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp index fb0ad4524..c54ef1a6c 100644 --- a/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp +++ b/tests/auto/render/qrendertargetoutput/tst_qrendertargetoutput.cpp @@ -50,7 +50,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.attachmentPoint(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -58,7 +58,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.attachmentPoint(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -70,7 +70,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.texture(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -78,7 +78,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.texture(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -90,7 +90,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -98,7 +98,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -110,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -130,7 +130,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(renderTargetOutput.face(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -138,7 +138,7 @@ private Q_SLOTS: // THEN QCOMPARE(renderTargetOutput.face(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qscene2d/tst_qscene2d.cpp b/tests/auto/render/qscene2d/tst_qscene2d.cpp index ff1e7e4a4..f39f1e983 100644 --- a/tests/auto/render/qscene2d/tst_qscene2d.cpp +++ b/tests/auto/render/qscene2d/tst_qscene2d.cpp @@ -51,7 +51,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.output(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -59,7 +59,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.output(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -70,7 +70,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.renderPolicy(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -78,7 +78,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.renderPolicy(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -89,7 +89,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.item(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -97,7 +97,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.item(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -109,7 +109,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(scene2d.isMouseEnabled(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -117,7 +117,7 @@ private Q_SLOTS: // THEN QCOMPARE(scene2d.isMouseEnabled(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qsetfence/tst_qsetfence.cpp b/tests/auto/render/qsetfence/tst_qsetfence.cpp index e7a1cf11e..7160478b6 100644 --- a/tests/auto/render/qsetfence/tst_qsetfence.cpp +++ b/tests/auto/render/qsetfence/tst_qsetfence.cpp @@ -56,14 +56,14 @@ private Q_SLOTS: // THEN QCOMPARE(setFence.handleType(), Qt3DRender::QSetFence::OpenGLFenceId); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); dNode->setHandleType(Qt3DRender::QSetFence::OpenGLFenceId); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { @@ -79,14 +79,14 @@ private Q_SLOTS: // THEN QCOMPARE(setFence.handle(),QVariant(984)); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); dNode->setHandle(QVariant(984)); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } }; diff --git a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp index 982ce93a4..3b19aa588 100644 --- a/tests/auto/render/qshaderimage/tst_qshaderimage.cpp +++ b/tests/auto/render/qshaderimage/tst_qshaderimage.cpp @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -57,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.texture(), &newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -76,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layered(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -87,7 +87,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -95,7 +95,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.mipLevel(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -106,7 +106,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -114,7 +114,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.layer(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -125,7 +125,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -133,7 +133,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.access(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -144,7 +144,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -152,7 +152,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderImage.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -351,13 +351,13 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderImage.texture(), &tex); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); } // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QVERIFY(shaderImage.texture() == nullptr); } diff --git a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp index 8927ec73f..1db1b51e5 100644 --- a/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp +++ b/tests/auto/render/qshaderprogram/tst_qshaderprogram.cpp @@ -53,7 +53,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.vertexShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -61,7 +61,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.vertexShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -72,7 +72,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -80,7 +80,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.tessellationControlShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -91,7 +91,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -99,7 +99,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.tessellationEvaluationShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -110,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.geometryShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -118,7 +118,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.geometryShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -129,7 +129,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.fragmentShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -137,7 +137,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.fragmentShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -148,7 +148,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.computeShaderCode(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -156,7 +156,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.computeShaderCode(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -167,7 +167,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(shaderProgram.format(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -175,7 +175,7 @@ private Q_SLOTS: // THEN QCOMPARE(shaderProgram.format(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -375,7 +375,7 @@ private Q_SLOTS: dNode->setLog(logValue); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(log(), logValue); @@ -384,7 +384,7 @@ private Q_SLOTS: dNode->setLog(logValue); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(log(), logValue); @@ -409,7 +409,7 @@ private Q_SLOTS: dNode->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(status(), newStatus); @@ -418,7 +418,7 @@ private Q_SLOTS: dNode->setStatus(newStatus); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 0); QCOMPARE(status(), newStatus); @@ -463,7 +463,7 @@ private Q_SLOTS: QCoreApplication::processEvents(); // THEN - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(arbiter.dirtyNodes().size(), 1); spy.clear(); @@ -475,7 +475,7 @@ private Q_SLOTS: QCoreApplication::processEvents(); // THEN - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); QCOMPARE(arbiter.dirtyNodes().size(), 1); } } diff --git a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp index 085f670c4..eef50d510 100644 --- a/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp +++ b/tests/auto/render/qshaderprogrambuilder/tst_qshaderprogrambuilder.cpp @@ -57,7 +57,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.shaderProgram(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -65,7 +65,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.shaderProgram(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -76,7 +76,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.enabledLayers(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -84,7 +84,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.enabledLayers(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -95,7 +95,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.vertexShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -103,7 +103,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.vertexShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -114,7 +114,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.tessellationControlShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -122,7 +122,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.tessellationControlShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -133,7 +133,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -141,7 +141,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.tessellationEvaluationShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -152,7 +152,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.geometryShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -160,7 +160,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.geometryShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -171,7 +171,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.fragmentShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -179,7 +179,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.fragmentShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -190,7 +190,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(builder.computeShaderGraph(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -198,7 +198,7 @@ private Q_SLOTS: // THEN QCOMPARE(builder.computeShaderGraph(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -485,7 +485,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(vertexShaderCode(), QByteArrayLiteral("vertex")); } { @@ -495,7 +495,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(fragmentShaderCode(), QByteArrayLiteral("fragment")); } { @@ -505,7 +505,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(geometryShaderCode(), QByteArrayLiteral("geometry")); } { @@ -516,7 +516,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(computeShaderCode(), QByteArrayLiteral("compute")); } { @@ -526,7 +526,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(tessellationControlShaderCode(), QByteArrayLiteral("control")); } { @@ -536,7 +536,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(tessellationEvaluationShaderCode(), QByteArrayLiteral("eval")); } } diff --git a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp index 0d55642af..153f7d32d 100644 --- a/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp +++ b/tests/auto/render/qsharedgltexture/tst_qsharedgltexture.cpp @@ -42,7 +42,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(glTexture.textureId(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -50,7 +50,7 @@ private Q_SLOTS: // THEN QCOMPARE(glTexture.textureId(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qtechnique/tst_qtechnique.cpp b/tests/auto/render/qtechnique/tst_qtechnique.cpp index d702c094e..0b04e668e 100644 --- a/tests/auto/render/qtechnique/tst_qtechnique.cpp +++ b/tests/auto/render/qtechnique/tst_qtechnique.cpp @@ -110,7 +110,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -118,14 +118,14 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->majorVersion(), 3); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN technique.graphicsApiFilter()->setMinorVersion(2); // THEN QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -133,14 +133,14 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->minorVersion(), 2); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); // WHEN technique.graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::CoreProfile); // THEN QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -148,7 +148,7 @@ private Q_SLOTS: // THEN QCOMPARE(technique.graphicsApiFilter()->profile(), Qt3DRender::QGraphicsApiFilter::CoreProfile); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index 828d1a9c0..fd6d5ebb9 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -23,8 +23,8 @@ private Q_SLOTS: { QScopedPointer<Qt3DRender::QTechniqueFilter> defaulttechniqueFilter(new Qt3DRender::QTechniqueFilter); - QCOMPARE(defaulttechniqueFilter->matchAll().count(), 0); - QCOMPARE(defaulttechniqueFilter->parameters().count(), 0); + QCOMPARE(defaulttechniqueFilter->matchAll().size(), 0); + QCOMPARE(defaulttechniqueFilter->parameters().size(), 0); } void checkPropertyUpdates() diff --git a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp index f6bc9a2e1..76705de6f 100644 --- a/tests/auto/render/qtextureimage/tst_qtextureimage.cpp +++ b/tests/auto/render/qtextureimage/tst_qtextureimage.cpp @@ -43,7 +43,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureImage.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -51,7 +51,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureImage.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -62,7 +62,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureImage.isMirrored(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -70,7 +70,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureImage.isMirrored(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp index 0495f4517..6d41a0e0c 100644 --- a/tests/auto/render/qtextureloader/tst_qtextureloader.cpp +++ b/tests/auto/render/qtextureloader/tst_qtextureloader.cpp @@ -49,7 +49,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureLoader.source(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -57,7 +57,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureLoader.source(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -68,7 +68,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(textureLoader.isMirrored(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -76,7 +76,7 @@ private Q_SLOTS: // THEN QCOMPARE(textureLoader.isMirrored(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp index 2a9b0be98..f52141626 100644 --- a/tests/auto/render/qwaitfence/tst_qwaitfence.cpp +++ b/tests/auto/render/qwaitfence/tst_qwaitfence.cpp @@ -46,7 +46,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.handleType(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -54,7 +54,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.handleType(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -65,7 +65,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.handle(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -73,7 +73,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.handle(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -84,7 +84,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.waitOnCPU(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -92,7 +92,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.waitOnCPU(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } { // WHEN @@ -103,7 +103,7 @@ private Q_SLOTS: // THEN QVERIFY(spy.isValid()); QCOMPARE(waitFence.timeout(), newValue); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // WHEN spy.clear(); @@ -111,7 +111,7 @@ private Q_SLOTS: // THEN QCOMPARE(waitFence.timeout(), newValue); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } diff --git a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp index ad33cda9c..8bf581271 100644 --- a/tests/auto/render/raycastingjob/tst_raycastingjob.cpp +++ b/tests/auto/render/raycastingjob/tst_raycastingjob.cpp @@ -294,7 +294,7 @@ private Q_SLOTS: QVERIFY(!rayCaster->isEnabled()); auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes(); qDebug() << dirtyNodes; - QCOMPARE(dirtyNodes.count(), 1); // hits & disable + QCOMPARE(dirtyNodes.size(), 1); // hits & disable QCOMPARE(rayCaster->hits().size(), numIntersections); if (numIntersections) @@ -356,7 +356,7 @@ private Q_SLOTS: QVERIFY(!backendRayCaster->isEnabled()); QVERIFY(!rayCaster->isEnabled()); auto dirtyNodes = test->arbiter()->takeDirtyFrontEndNodes(); - QCOMPARE(dirtyNodes.count(), 1); // hits & disable + QCOMPARE(dirtyNodes.size(), 1); // hits & disable QCOMPARE(rayCaster->hits().size(), numIntersections); if (numIntersections) diff --git a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp index 66552300f..6c03fcb62 100644 --- a/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp +++ b/tests/auto/render/shaderbuilder/tst_shaderbuilder.cpp @@ -622,10 +622,10 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); - QCOMPARE(hashKey.length(), 40); + QCOMPARE(hashKey.size(), 40); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); @@ -639,7 +639,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); } @@ -653,7 +653,7 @@ private slots: QByteArray gl2HashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 2); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 2); QVERIFY(gl2HashKey != hashKey); } } @@ -691,10 +691,10 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); const QByteArray hashKey = b.hashKeyForShaderGraph(Qt3DRender::QShaderProgram::Vertex); - QCOMPARE(hashKey.length(), 40); + QCOMPARE(hashKey.size(), 40); QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).first(), QString::fromUtf8(hashKey) + QLatin1String(".qt3d")); @@ -740,7 +740,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 0); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 0); } void checkForceRebuildCache() @@ -776,7 +776,7 @@ private slots: b.generateCode(Qt3DRender::QShaderProgram::Vertex); // THEN -> We have rebuilt the shader file (even if we don't use it) - QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).count(), 1); + QCOMPARE(QDir(cacheDir.path()).entryList(QDir::Files).size(), 1); } }; |