commit d12addc68a80f0501660929039a7a54208b83ac2
author Wu-cheng Li <wuchengli@google.com> Tue Dec 15 16:50:43 2009 +0800
committer Wu-cheng Li <wuchengli@google.com> Wed Dec 16 11:58:37 2009 +0800
tree 47e5408080ae2f1be3ed9d032e40b4ed57a090b2
parent a117ea3fdb64fba54e23127fb1bb77382a534ccb

Add camera tests for setPreviewDisplay (do not merge).

Our camera app calls startPreview before setPreviewDisplay.
We need to make sure camera drivers all support this.

Cherry-pick from fef2b490c25e26a332eb6e67848a22f912a12b48.

tests/tests/hardware/src/android/hardware/cts/CameraTest.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 3b4c5ed..593ffdb 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -221,14 +221,7 @@
         Thread.sleep(WAIT_LONG);
     }
 
-    private void checkPreviewCallback() throws Exception {
-        SurfaceHolder mSurfaceHolder;
-
-        mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
-        mCamera.setPreviewDisplay(mSurfaceHolder);
-        if (LOGV)
-            Log.v(TAG, "check preview callback");
-        mCamera.startPreview();
+    private void waitForPreviewDone() {
         synchronized (mPreviewDone) {
             try {
                 mPreviewDone.wait(WAIT_FOR_COMMAND_TO_COMPLETE);
@@ -239,6 +232,16 @@
                     Log.v(TAG, "wait was interrupted.");
             }
         }
+    }
+
+    private void checkPreviewCallback() throws Exception {
+        SurfaceHolder mSurfaceHolder;
+
+        mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
+        mCamera.setPreviewDisplay(mSurfaceHolder);
+        if (LOGV) Log.v(TAG, "check preview callback");
+        mCamera.startPreview();
+        waitForPreviewDone();
         mCamera.setPreviewCallback(null);
     }
 
@@ -372,6 +375,48 @@
         assertFalse(mRawPreviewCallbackResult);
     }
 
+    @TestTargetNew(
+        level = TestLevel.COMPLETE,
+        method = "setPreviewDisplay",
+        args = {SurfaceHolder.class}
+    )
+    public void testSetPreviewDisplay() throws Exception {
+        SurfaceHolder mSurfaceHolder;
+        mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
+        initializeMessageLooper();
+        syncLock();
+
+        // Check the order: startPreview->setPreviewDisplay.
+        mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
+        mCamera.startPreview();
+        mCamera.setPreviewDisplay(mSurfaceHolder);
+        waitForPreviewDone();
+        terminateMessageLooper();
+        assertTrue(mRawPreviewCallbackResult);
+
+        // Check the order: setPreviewDisplay->startPreview.
+        initializeMessageLooper();
+        syncLock();
+        mRawPreviewCallbackResult = false;
+        mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
+        mCamera.setPreviewDisplay(mSurfaceHolder);
+        mCamera.startPreview();
+        waitForPreviewDone();
+        mCamera.stopPreview();
+        assertTrue(mRawPreviewCallbackResult);
+
+        // Check the order: setting preview display to null->startPreview->
+        // setPreviewDisplay.
+        mRawPreviewCallbackResult = false;
+        mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
+        mCamera.setPreviewDisplay(null);
+        mCamera.startPreview();
+        mCamera.setPreviewDisplay(mSurfaceHolder);
+        waitForPreviewDone();
+        terminateMessageLooper();
+        assertTrue(mRawPreviewCallbackResult);
+    }
+
     @TestTargets({
         @TestTargetNew(
             level = TestLevel.COMPLETE,