diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-04-25 19:39:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-25 19:39:10 +0000 |
| commit | 5b6ebd716c2bae657898562997ebb3b7d7b8a575 (patch) | |
| tree | 9ddbc3e1ef0e420b6ccb881b93017c1517f9cec4 | |
| parent | 3cf12f4112167cb3372cbdba2b66d48a5d56dc4b (diff) | |
| parent | ea2d942ddaea11ca5f136e27e0ab8bcd72bb0644 (diff) | |
| download | frameworks_native-5b6ebd716c2bae657898562997ebb3b7d7b8a575.tar.gz frameworks_native-5b6ebd716c2bae657898562997ebb3b7d7b8a575.tar.bz2 frameworks_native-5b6ebd716c2bae657898562997ebb3b7d7b8a575.zip | |
Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
| -rw-r--r-- | libs/gui/tests/SurfaceTexture_test.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index 47f6df7b3..dd6c43551 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -463,19 +463,12 @@ TEST_F(MultiTextureConsumerTest, EGLImageTargetWorks) { glVertexPointer(2, GL_FLOAT, 0, vertices); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - ASSERT_EQ( glGetError(), GL_NO_ERROR ); + ASSERT_EQ(GLenum(GL_NO_ERROR), glGetError()); } - ASSERT_TRUE( eglSwapBuffers(mEglDisplay, mEglSurface) ); - - uint32_t* pixels = new uint32_t[8*16*16]; - glReadPixels(0, 0, 8*16, 16, GL_RGBA, GL_UNSIGNED_BYTE, pixels); for (int i=0 ; i<8 ; i++) { - uint32_t p = pixels[i*16 + 8 + 8*(8*16)]; // center of each square - EXPECT_EQ(p, (i&7) * 0x10101010); + EXPECT_TRUE(checkPixel(i*16 + 8, 8, i*16, i*16, i*16, i*16, 0)); } - - delete [] pixels; } |