diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-30 12:19:19 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-09-30 12:19:19 -0700 |
| commit | 160c39080317e74de1154cd9acbef686e348eba7 (patch) | |
| tree | 452ec996b386e61611f5b917b1ac62e5de6ad325 | |
| parent | 50451ad7539603a3fcf5a835b5ba010bf4b71e52 (diff) | |
| download | android_system_media-160c39080317e74de1154cd9acbef686e348eba7.tar.gz android_system_media-160c39080317e74de1154cd9acbef686e348eba7.tar.bz2 android_system_media-160c39080317e74de1154cd9acbef686e348eba7.zip | |
camera_metadata: Update CameraCharactericsTest to check #getKeys()
Bug: 11007040
Change-Id: If934f861db61cd23af029104d8120a08e52a27ae
| -rw-r--r-- | camera/docs/CameraCharacteristicsTest.mako | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/camera/docs/CameraCharacteristicsTest.mako b/camera/docs/CameraCharacteristicsTest.mako index cb0f9956..2c6c8693 100644 --- a/camera/docs/CameraCharacteristicsTest.mako +++ b/camera/docs/CameraCharacteristicsTest.mako @@ -28,13 +28,18 @@ package android.hardware.camera2.cts; import android.content.Context; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; +import android.hardware.camera2.CameraMetadata.Key; import android.test.AndroidTestCase; +import android.util.Log; + +import java.util.List; /** * Auto-generated CTS test for CameraCharacteristics fields. */ public class CameraCharacteristicsTest extends AndroidTestCase { private CameraManager mCameraManager; + private static final String TAG = "CameraCharacteristicsTest"; @Override public void setContext(Context context) { @@ -64,6 +69,12 @@ public class CameraCharacteristicsTest extends AndroidTestCase { props); assertNotNull("Invalid property: ${entry.name}", props.get(CameraCharacteristics.${jkey_identifier(entry.name)})); + + List<Key<?>> allKeys = props.getKeys(); + assertNotNull(String.format("Can't get camera characteristics keys from: ID %s", ids[i], + props)); + assertTrue("Key not in keys list: ${entry.name}", + allKeys.contains(CameraCharacteristics.${jkey_identifier(entry.name)})); } } % endif |