From 424e6386c642f1936ab751717623ccb6b7e24722 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Jul 2015 15:49:08 +0200 Subject: tests/auto/opengl: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). - Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer). - Replace Q[TRY]_VERIFY(smartPointer == 0) by Q[TRY]_VERIFY(smartPointer.isNull()). - Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b) and add casts where necessary. The values will then be logged should a test fail. Change-Id: I7add5b7afeba83895acdcbed110e8275dc76864a Reviewed-by: Laszlo Agocs --- tests/auto/gui/qopengl/tst_qopengl.cpp | 12 +-- tests/auto/opengl/qgl/tst_qgl.cpp | 116 ++++++++++----------- tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp | 10 +- .../auto/opengl/qglfunctions/tst_qglfunctions.cpp | 4 +- 4 files changed, 71 insertions(+), 71 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index 8c6c28b492..7a47b69a26 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -514,7 +514,7 @@ void tst_QOpenGL::fboTextureOwnership() // pull out the texture GLuint texture = fbo->takeTexture(); QVERIFY(texture != 0); - QVERIFY(fbo->texture() == 0); + QCOMPARE(fbo->texture(), GLuint(0)); // verify that the next bind() creates a new texture fbo->bind(); @@ -1174,18 +1174,18 @@ void tst_QOpenGL::textureblitterPartTargetRectTransform() void tst_QOpenGL::defaultSurfaceFormat() { QSurfaceFormat fmt; - QVERIFY(QSurfaceFormat::defaultFormat() == fmt); + QCOMPARE(QSurfaceFormat::defaultFormat(), fmt); fmt.setDepthBufferSize(16); QSurfaceFormat::setDefaultFormat(fmt); - QVERIFY(QSurfaceFormat::defaultFormat() == fmt); + QCOMPARE(QSurfaceFormat::defaultFormat(), fmt); QCOMPARE(QSurfaceFormat::defaultFormat().depthBufferSize(), 16); QScopedPointer window(new QWindow); - QVERIFY(window->requestedFormat() == fmt); + QCOMPARE(window->requestedFormat(), fmt); QScopedPointer context(new QOpenGLContext); - QVERIFY(context->format() == fmt); + QCOMPARE(context->format(), fmt); } #ifdef USE_GLX @@ -1214,7 +1214,7 @@ void tst_QOpenGL::glxContextWrap() QOpenGLContext *ctx = new QOpenGLContext; ctx->setNativeHandle(QVariant::fromValue(QGLXNativeContext(context))); QVERIFY(ctx->create()); - QVERIFY(ctx->nativeHandle().value().context() == context); + QCOMPARE(ctx->nativeHandle().value().context(), context); QVERIFY(nativeIf->nativeResourceForContext(QByteArrayLiteral("glxcontext"), ctx) == (void *) context); QVERIFY(ctx->makeCurrent(window)); diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index 5a65719380..7970725355 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -459,113 +459,113 @@ void tst_QGL::getSetCheck() QGLFormat format1; QGLFormat format2; - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setDoubleBuffer(false); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setDoubleBuffer(false); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setDepthBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setDepthBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setAccumBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setAccumBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setRedBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setRedBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setGreenBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setGreenBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setBlueBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setBlueBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setAlphaBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setAlphaBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setStencilBufferSize(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setStencilBufferSize(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setSamples(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setSamples(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setSwapInterval(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setSwapInterval(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setPlane(8); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setPlane(8); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setVersion(3, 2); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setVersion(3, 2); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setProfile(QGLFormat::CoreProfile); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setProfile(QGLFormat::CoreProfile); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); format1.setOption(QGL::NoDeprecatedFunctions); QVERIFY(!(format1 == format2)); QVERIFY(format1 != format2); format2.setOption(QGL::NoDeprecatedFunctions); - QVERIFY(format1 == format2); + QCOMPARE(format1, format2); QVERIFY(!(format1 != format2)); // Copy constructor and assignment for QGLFormat. QGLFormat format3(format1); QGLFormat format4; - QVERIFY(format1 == format3); + QCOMPARE(format1, format3); QVERIFY(format1 != format4); format4 = format1; - QVERIFY(format1 == format4); + QCOMPARE(format1, format4); // Check that modifying a copy doesn't affect the original. format3.setRedBufferSize(16); @@ -584,15 +584,15 @@ void tst_QGL::getSetCheck() QCOMPARE(format5.plane(), 3); // The default format should be the same as QGLFormat(). - QVERIFY(QGLFormat::defaultFormat() == QGLFormat()); + QCOMPARE(QGLFormat::defaultFormat(), QGLFormat()); // Modify the default format and check that it was changed. QGLFormat::setDefaultFormat(format1); - QVERIFY(QGLFormat::defaultFormat() == format1); + QCOMPARE(QGLFormat::defaultFormat(), format1); // Restore the default format. QGLFormat::setDefaultFormat(QGLFormat()); - QVERIFY(QGLFormat::defaultFormat() == QGLFormat()); + QCOMPARE(QGLFormat::defaultFormat(), QGLFormat()); // Check the default overlay format's expected values. QGLFormat overlay(QGLFormat::defaultOverlayFormat()); @@ -618,11 +618,11 @@ void tst_QGL::getSetCheck() // Modify the default overlay format and check that it was changed. QGLFormat::setDefaultOverlayFormat(format1); - QVERIFY(QGLFormat::defaultOverlayFormat() == format1); + QCOMPARE(QGLFormat::defaultOverlayFormat(), format1); // Restore the default overlay format. QGLFormat::setDefaultOverlayFormat(overlay); - QVERIFY(QGLFormat::defaultOverlayFormat() == overlay); + QCOMPARE(QGLFormat::defaultOverlayFormat(), overlay); MyGLContext obj2(obj1); // bool QGLContext::windowCreated() @@ -1512,9 +1512,9 @@ void tst_QGL::colormap() QGLColormap cmap1; QVERIFY(cmap1.isEmpty()); QCOMPARE(cmap1.size(), 0); - QVERIFY(cmap1.entryRgb(0) == 0); - QVERIFY(cmap1.entryRgb(-1) == 0); - QVERIFY(cmap1.entryRgb(100) == 0); + QCOMPARE(cmap1.entryRgb(0), QRgb(0)); + QCOMPARE(cmap1.entryRgb(-1), QRgb(0)); + QCOMPARE(cmap1.entryRgb(100), QRgb(0)); QVERIFY(!cmap1.entryColor(0).isValid()); QVERIFY(!cmap1.entryColor(-1).isValid()); QVERIFY(!cmap1.entryColor(100).isValid()); @@ -1529,7 +1529,7 @@ void tst_QGL::colormap() // not to detect when it is empty! QVERIFY(cmap1.isEmpty()); QCOMPARE(cmap1.size(), 256); - QVERIFY(cmap1.entryRgb(0) == 0); + QCOMPARE(cmap1.entryRgb(0), QRgb(0)); QVERIFY(cmap1.entryColor(0) == QColor(0, 0, 0, 255)); QVERIFY(cmap1.entryRgb(56) == qRgb(255, 0, 0)); QVERIFY(cmap1.entryColor(56) == QColor(255, 0, 0, 255)); @@ -1611,7 +1611,7 @@ void tst_QGL::colormap() QVERIFY(cmap4.isEmpty()); QCOMPARE(cmap4.size(), 256); cmap4.setHandle(Qt::HANDLE(42)); - QVERIFY(cmap4.handle() == Qt::HANDLE(42)); + QCOMPARE(cmap4.handle(), Qt::HANDLE(42)); QVERIFY(!cmap4.isEmpty()); QCOMPARE(cmap4.size(), 256); } @@ -1629,7 +1629,7 @@ void tst_QGL::fboFormat() // Check the initial conditions. QGLFramebufferObjectFormat format1; QCOMPARE(format1.samples(), 0); - QVERIFY(format1.attachment() == QGLFramebufferObject::NoAttachment); + QCOMPARE(format1.attachment(), QGLFramebufferObject::NoAttachment); QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_2D)); int expectedFormat = #ifdef QT_OPENGL_ES_2 @@ -1645,7 +1645,7 @@ void tst_QGL::fboFormat() format1.setTextureTarget(GL_TEXTURE_3D); format1.setInternalTextureFormat(GL_RGB16); QCOMPARE(format1.samples(), 8); - QVERIFY(format1.attachment() == QGLFramebufferObject::CombinedDepthStencil); + QCOMPARE(format1.attachment(), QGLFramebufferObject::CombinedDepthStencil); QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_3D)); QCOMPARE(int(format1.internalTextureFormat()), int(GL_RGB16)); @@ -1653,12 +1653,12 @@ void tst_QGL::fboFormat() QGLFramebufferObjectFormat format2(format1); QGLFramebufferObjectFormat format3; QCOMPARE(format2.samples(), 8); - QVERIFY(format2.attachment() == QGLFramebufferObject::CombinedDepthStencil); + QCOMPARE(format2.attachment(), QGLFramebufferObject::CombinedDepthStencil); QCOMPARE(int(format2.textureTarget()), int(GL_TEXTURE_3D)); QCOMPARE(int(format2.internalTextureFormat()), int(GL_RGB16)); format3 = format1; QCOMPARE(format3.samples(), 8); - QVERIFY(format3.attachment() == QGLFramebufferObject::CombinedDepthStencil); + QCOMPARE(format3.attachment(), QGLFramebufferObject::CombinedDepthStencil); QCOMPARE(int(format3.textureTarget()), int(GL_TEXTURE_3D)); QCOMPARE(int(format3.internalTextureFormat()), int(GL_RGB16)); @@ -1666,7 +1666,7 @@ void tst_QGL::fboFormat() format2.setSamples(9); format3.setTextureTarget(GL_TEXTURE_2D); QCOMPARE(format1.samples(), 8); - QVERIFY(format1.attachment() == QGLFramebufferObject::CombinedDepthStencil); + QCOMPARE(format1.attachment(), QGLFramebufferObject::CombinedDepthStencil); QCOMPARE(int(format1.textureTarget()), int(GL_TEXTURE_3D)); QCOMPARE(int(format1.internalTextureFormat()), int(GL_RGB16)); @@ -1674,39 +1674,39 @@ void tst_QGL::fboFormat() QGLFramebufferObjectFormat format1c; QGLFramebufferObjectFormat format2c; - QVERIFY(format1c == format2c); + QCOMPARE(format1c, format2c); QVERIFY(!(format1c != format2c)); format1c.setSamples(8); QVERIFY(!(format1c == format2c)); QVERIFY(format1c != format2c); format2c.setSamples(8); - QVERIFY(format1c == format2c); + QCOMPARE(format1c, format2c); QVERIFY(!(format1c != format2c)); format1c.setAttachment(QGLFramebufferObject::CombinedDepthStencil); QVERIFY(!(format1c == format2c)); QVERIFY(format1c != format2c); format2c.setAttachment(QGLFramebufferObject::CombinedDepthStencil); - QVERIFY(format1c == format2c); + QCOMPARE(format1c, format2c); QVERIFY(!(format1c != format2c)); format1c.setTextureTarget(GL_TEXTURE_3D); QVERIFY(!(format1c == format2c)); QVERIFY(format1c != format2c); format2c.setTextureTarget(GL_TEXTURE_3D); - QVERIFY(format1c == format2c); + QCOMPARE(format1c, format2c); QVERIFY(!(format1c != format2c)); format1c.setInternalTextureFormat(GL_RGB16); QVERIFY(!(format1c == format2c)); QVERIFY(format1c != format2c); format2c.setInternalTextureFormat(GL_RGB16); - QVERIFY(format1c == format2c); + QCOMPARE(format1c, format2c); QVERIFY(!(format1c != format2c)); QGLFramebufferObjectFormat format3c(format1c); QGLFramebufferObjectFormat format4c; - QVERIFY(format1c == format3c); + QCOMPARE(format1c, format3c); QVERIFY(!(format1c != format3c)); format3c.setInternalTextureFormat( #ifdef QT_OPENGL_ES_2 @@ -1719,7 +1719,7 @@ void tst_QGL::fboFormat() QVERIFY(format1c != format3c); format4c = format1c; - QVERIFY(format1c == format4c); + QCOMPARE(format1c, format4c); QVERIFY(!(format1c != format4c)); format4c.setInternalTextureFormat( #ifdef QT_OPENGL_ES_2 @@ -1947,7 +1947,7 @@ void tst_QGL::destroyFBOAfterContext() delete glw; // The handle should now be zero. - QVERIFY(fbo->handle() == 0); + QVERIFY(!fbo->handle()); QVERIFY(!fbo->isValid()); delete fbo; @@ -1984,14 +1984,14 @@ void tst_QGL::shareRegister() // Create a guard for the first context. QOpenGLSharedResourceGuard guard(glw1->context()->contextHandle()); - QVERIFY(guard.id() == 0); + QCOMPARE(guard.id(), 0); guard.setId(3); - QVERIFY(guard.id() == 3); + QCOMPARE(guard.id(), 3); // Request a tst_QGLResource object for the first context. tst_QGLResource *res1 = qt_shared_test()->value(glw1->context()->contextHandle()); QVERIFY(res1); - QVERIFY(qt_shared_test()->value(glw1->context()->contextHandle()) == res1); + QCOMPARE(qt_shared_test()->value(glw1->context()->contextHandle()), res1); // Create another context that shares with the first. QVERIFY(!glw1->isSharing()); @@ -2005,12 +2005,12 @@ void tst_QGL::shareRegister() QVERIFY(glw1->context() != glw2->context()); // Check that the first context's resource is also on the second. - QVERIFY(qt_shared_test()->value(glw1->context()) == res1); - QVERIFY(qt_shared_test()->value(glw2->context()) == res1); + QCOMPARE(qt_shared_test()->value(glw1->context()), res1); + QCOMPARE(qt_shared_test()->value(glw2->context()), res1); // Guard should still be the same. - QVERIFY(guard.context() == glw1->context()); - QVERIFY(guard.id() == 3); + QCOMPARE(guard.context(), glw1->context()); + QCOMPARE(guard.id(), 3); // Check the sharing relationships. QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context())); @@ -2032,9 +2032,9 @@ void tst_QGL::shareRegister() // Request a resource to the third context. tst_QGLResource *res3 = qt_shared_test()->value(glw3->context()); QVERIFY(res3); - QVERIFY(qt_shared_test()->value(glw1->context()) == res1); - QVERIFY(qt_shared_test()->value(glw2->context()) == res1); - QVERIFY(qt_shared_test()->value(glw3->context()) == res3); + QCOMPARE(qt_shared_test()->value(glw1->context()), res1); + QCOMPARE(qt_shared_test()->value(glw2->context()), res1); + QCOMPARE(qt_shared_test()->value(glw3->context()), res3); // Check the sharing relationships again. QVERIFY(QGLContext::areSharing(glw1->context(), glw1->context())); @@ -2053,8 +2053,8 @@ void tst_QGL::shareRegister() QVERIFY(!QGLContext::areSharing(0, 0)); // Shared guard should still be the same. - QVERIFY(guard.context() == glw1->context()); - QVERIFY(guard.id() == 3); + QCOMPARE(guard.context(), glw1->context()); + QCOMPARE(guard.id(), 3); // Delete the first context. delete glw1; @@ -2064,14 +2064,14 @@ void tst_QGL::shareRegister() // The first context's resource should transfer to the second context. QCOMPARE(tst_QGLResource::deletions, 0); - QVERIFY(qt_shared_test()->value(glw2->context()) == res1); - QVERIFY(qt_shared_test()->value(glw3->context()) == res3); + QCOMPARE(qt_shared_test()->value(glw2->context()), res1); + QCOMPARE(qt_shared_test()->value(glw3->context()), res3); // Shared guard should now be the second context, with the id the same. - QVERIFY(guard.context() == glw2->context()); - QVERIFY(guard.id() == 3); - QVERIFY(guard3.context() == glw3->context()); - QVERIFY(guard3.id() == 5); + QCOMPARE(guard.context(), glw2->context()); + QCOMPARE(guard.id(), 3); + QCOMPARE(guard3.context(), glw3->context()); + QCOMPARE(guard3.id(), 5); // Clean up and check that the resources are properly deleted. delete glw2; diff --git a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp index b0409d46d0..f96e3514a7 100644 --- a/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp +++ b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp @@ -86,14 +86,14 @@ void tst_QGLBuffer::testBuffer(QGLBuffer::Type type) // Create the local object, but not the buffer in the server. QGLBuffer buffer(type); - QVERIFY(buffer.usagePattern() == QGLBuffer::StaticDraw); + QCOMPARE(buffer.usagePattern(), QGLBuffer::StaticDraw); buffer.setUsagePattern(QGLBuffer::UsagePattern(usagePattern)); // Check the initial state. - QVERIFY(buffer.type() == type); + QCOMPARE(buffer.type(), type); QVERIFY(!buffer.isCreated()); - QVERIFY(buffer.bufferId() == 0); - QVERIFY(buffer.usagePattern() == QGLBuffer::UsagePattern(usagePattern)); + QCOMPARE(buffer.bufferId(), GLuint(0)); + QCOMPARE(buffer.usagePattern(), QGLBuffer::UsagePattern(usagePattern)); QCOMPARE(buffer.size(), -1); // Should not be able to bind it yet because it isn't created. @@ -253,7 +253,7 @@ void tst_QGLBuffer::bufferSharing() delete w2; // The buffer should now be invalid. - QVERIFY(buffer.bufferId() == 0); + QCOMPARE(buffer.bufferId(), GLuint(0)); QVERIFY(!buffer.isCreated()); } diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp index 866cd57381..07fdba4664 100644 --- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp +++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp @@ -200,13 +200,13 @@ void tst_QGLFunctions::multitexture() GLint active = 0; funcs.glGetIntegerv(GL_ACTIVE_TEXTURE, &active); - QVERIFY(active == GL_TEXTURE1); + QCOMPARE(active, GL_TEXTURE1); funcs.glActiveTexture(GL_TEXTURE0); active = 0; funcs.glGetIntegerv(GL_ACTIVE_TEXTURE, &active); - QVERIFY(active == GL_TEXTURE0); + QCOMPARE(active, GL_TEXTURE0); } // Verify that the glBlendColor() function appears to resolve and work. -- cgit v1.2.3