diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-24 15:49:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-07-24 21:23:34 +0000 |
| commit | 424e6386c642f1936ab751717623ccb6b7e24722 (patch) | |
| tree | cc9bfa80f7850c2cedb61cf88a18859ed235d1a6 /tests/auto/opengl/qglfunctions | |
| parent | 831c557cc5c2e06d41bfe815450d50cb8be18354 (diff) | |
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 <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'tests/auto/opengl/qglfunctions')
| -rw-r--r-- | tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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. |