commit 8072711307aa98ee5ee6f7369860ae38c3e19656
author Mathias Agopian <mathias@google.com> Mon May 02 19:51:12 2011 -0700
committer Mathias Agopian <mathias@google.com> Wed May 11 18:01:51 2011 -0700
tree 5c9e85291c9c76367fbfad2d7f3ef36b361d3d1f
parent 7a5b22c4e33928f81c2e8a3d85050c35bd44b1e0

Implement {Surface|SurfaceTextureClient}::setSwapInterval()

Change-Id: I8382e346ddaa2c4c8ff56ac3ffd7f0109572f188

libs/gui/tests/SurfaceTextureClient_test.cpp

diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp
index e9c3411..59a4cc5 100644
--- a/libs/gui/tests/SurfaceTextureClient_test.cpp
+++ b/libs/gui/tests/SurfaceTextureClient_test.cpp
@@ -259,6 +259,7 @@
     sp<ANativeWindow> anw(mSTC);
     sp<SurfaceTexture> st(mST);
     ANativeWindowBuffer* buf[2];
+    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 4));
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0]));
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[1]));
     EXPECT_NE(buf[0], buf[1]);
@@ -280,6 +281,7 @@
     sp<ANativeWindow> anw(mSTC);
     sp<SurfaceTexture> st(mST);
     ANativeWindowBuffer* buf[2];
+    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 4));
     EXPECT_EQ(OK, st->setDefaultBufferSize(16, 8));
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0]));
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[1]));
@@ -307,7 +309,7 @@
     sp<SurfaceTexture> st(mST);
     android_native_buffer_t* buf[3];
     ASSERT_EQ(OK, st->setSynchronousMode(false));
-    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 3));
+    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 4));
 
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0]));
     ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[0]));
@@ -315,7 +317,7 @@
     EXPECT_EQ(OK, st->updateTexImage());
 
     ASSERT_EQ(OK, st->setSynchronousMode(true));
-    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 2));
+    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 3));
 
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0]));
     ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[0]));
@@ -421,15 +423,6 @@
     EXPECT_EQ(firstBuf, buf[2]);
 }
 
-TEST_F(SurfaceTextureClientTest, SurfaceTextureSyncModeTwoBuffers) {
-    sp<ANativeWindow> anw(mSTC);
-    sp<SurfaceTexture> st(mST);
-    ASSERT_EQ(OK, st->setSynchronousMode(true));
-    EXPECT_EQ(OK, native_window_set_buffer_count(anw.get(), 3));
-    EXPECT_EQ(OK, native_window_set_buffer_count(anw.get(), 2));
-    EXPECT_NE(OK, native_window_set_buffer_count(anw.get(), 1));
-}
-
 TEST_F(SurfaceTextureClientTest, SurfaceTextureSyncModeMinUndequeued) {
     sp<ANativeWindow> anw(mSTC);
     sp<SurfaceTexture> st(mST);
@@ -490,7 +483,7 @@
 
     android_native_buffer_t* buf[3];
     ASSERT_EQ(OK, st->setSynchronousMode(true));
-    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 2));
+    ASSERT_EQ(OK, native_window_set_buffer_count(anw.get(), 3));
     // dequeue/queue/update so we have a current buffer
     ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0]));
     ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[0]));