ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix libgui tests." into mnc-dev

Browse Source
This commit is contained in:
Michael Lentine 2015-05-22 20:16:01 +00:00 committed by Android (Google) Code Review
commit 01f9e920b0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gui/tests/IGraphicBufferProducer_test.cpp
View File

@ -299,7 +299,7 @@ TEST_F(IGraphicBufferProducerTest, Query_ReturnsError) {
ASSERT_NO_FATAL_FAILURE(ConnectProducer()); ASSERT_NO_FATAL_FAILURE(ConnectProducer());
// One past the end of the last 'query' enum value. Update this if we add more enums. // One past the end of the last 'query' enum value. Update this if we add more enums.
const int NATIVE_WINDOW_QUERY_LAST_OFF_BY_ONE = NATIVE_WINDOW_DEFAULT_DATASPACE + 1; const int NATIVE_WINDOW_QUERY_LAST_OFF_BY_ONE = NATIVE_WINDOW_BUFFER_AGE + 1;
int value; int value;
// What was out of range // What was out of range

19
libs/gui/tests/SurfaceTextureGLToGL_test.cpp
View File

@ -188,10 +188,10 @@ TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceUnrefsBuffers) {
// This test should have the only reference to buffer 0. // This test should have the only reference to buffer 0.
EXPECT_EQ(1, buffers[0]->getStrongCount()); EXPECT_EQ(1, buffers[0]->getStrongCount());
// The GLConsumer should hold a single reference to buffer 1 in its // The GLConsumer should hold one reference to buffer 1 in its
// mCurrentBuffer member. All of the references in the slots should have // mCurrentTextureImage member and another reference in mEglSlots. The third
// been released. // reference is in this test.
EXPECT_EQ(2, buffers[1]->getStrongCount()); EXPECT_EQ(3, buffers[1]->getStrongCount());
} }
TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceAfterAbandonUnrefsBuffers) { TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceAfterAbandonUnrefsBuffers) {
@ -235,14 +235,19 @@ TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceAfterAbandonUnrefsBuffers) {
ASSERT_EQ(EGL_SUCCESS, eglGetError()); ASSERT_EQ(EGL_SUCCESS, eglGetError());
mProducerEglSurface = EGL_NO_SURFACE; mProducerEglSurface = EGL_NO_SURFACE;
EXPECT_EQ(1, buffers[0]->getStrongCount());
EXPECT_EQ(1, buffers[1]->getStrongCount()); EXPECT_EQ(1, buffers[1]->getStrongCount());
// Depending on how lazily the GL driver dequeues buffers, we may end up // Depending on how lazily the GL driver dequeues buffers, we may end up
// with either two or three total buffers. If there are three, make sure // with either two or three total buffers. If there are three, each entry
// the last one was properly down-ref'd. // of the buffers array will be unique and there should only be one
// reference (the one in this test). If there are two the first and last
// element in the array will be equal meaning that buffer representing both
// 0 and 2 will have two references (one for 0 and one for 2).
if (buffers[2] != buffers[0]) { if (buffers[2] != buffers[0]) {
EXPECT_EQ(1, buffers[0]->getStrongCount());
EXPECT_EQ(1, buffers[2]->getStrongCount()); EXPECT_EQ(1, buffers[2]->getStrongCount());
} else {
EXPECT_EQ(2, buffers[0]->getStrongCount());
} }
} }