From 634a51509ee50475f3e9f8ccf897e90fc72ded31 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Wed, 20 Feb 2013 17:15:11 -0800 Subject: Camera: Add ProCamera private binder interface for an API2-light functionality Change-Id: I2af7a807c99df75ea659e6e6acc9c4fca6a56274 --- camera/tests/Android.mk | 1 + camera/tests/ProCameraTests.cpp | 68 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 camera/tests/ProCameraTests.cpp (limited to 'camera/tests') diff --git a/camera/tests/Android.mk b/camera/tests/Android.mk index 586e814..5d386c4 100644 --- a/camera/tests/Android.mk +++ b/camera/tests/Android.mk @@ -3,6 +3,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ main.cpp \ + ProCameraTests.cpp \ LOCAL_SHARED_LIBRARIES := \ libutils \ diff --git a/camera/tests/ProCameraTests.cpp b/camera/tests/ProCameraTests.cpp new file mode 100644 index 0000000..4de9c10 --- /dev/null +++ b/camera/tests/ProCameraTests.cpp @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "Camera.h" +#include "ProCamera.h" + +namespace android { +namespace camera2 { +namespace tests { +namespace client { + +#define CAMERA_ID 0 +#define TEST_DEBUGGING 0 + +#if TEST_DEBUGGING +#define dout std::cerr +#else +#define dout if (0) std::cerr +#endif + +class ProCameraTest : public ::testing::Test { + + virtual void SetUp() { + mCamera = ProCamera::connect(CAMERA_ID); + ASSERT_NE((void*)NULL, mCamera.get()); + } + + virtual void TearDown() { + ASSERT_NE((void*)NULL, mCamera.get()); + mCamera->disconnect(); + } + +protected: + sp mCamera; +}; + +TEST_F(ProCameraTest, Locking) { + + if (HasFatalFailure()) { + return; + } + + status_t res = mCamera->exclusiveTryLock(); + + EXPECT_EQ(OK, res); +} + +} +} +} +} + -- cgit v1.1