Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4e5b2f2 authored by Igor Murashkin's avatar Igor Murashkin
Browse files

Camera: Add unit test infrastructure for libcameraclient 

Change-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c
parent 53779919

camera/Android.mk

+5 −2
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

CAMERA_CLIENT_LOCAL_PATH:= $(call my-dir)

include $(call all-subdir-makefiles)

include $(CLEAR_VARS)



LOCAL_PATH := $(CAMERA_CLIENT_LOCAL_PATH)



LOCAL_SRC_FILES:= \

	Camera.cpp \

	CameraMetadata.cpp \
@@ -21,7 +24,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libcamera_metadata \



LOCAL_C_INCLUDES += \

    system/media/camera/include

	system/media/camera/include \



LOCAL_MODULE:= libcamera_client

camera/tests/Android.mk

0 → 100644
+36 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	main.cpp \



LOCAL_SHARED_LIBRARIES := \

	libutils \

	libcutils \

	libstlport \

	libcamera_metadata \

	libcamera_client \

	libgui \

	libsync \

	libui \

	libdl



LOCAL_STATIC_LIBRARIES := \

	libgtest



LOCAL_C_INCLUDES += \

	bionic \

	bionic/libstdc++/include \

	external/gtest/include \

	external/stlport/stlport \

	system/media/camera/include \

	frameworks/av/services/camera/libcameraservice \

	frameworks/av/include/camera \

	frameworks/native/include \



LOCAL_CFLAGS += -Wall -Wextra



LOCAL_MODULE:= camera_client_test

LOCAL_MODULE_TAGS := tests



include $(BUILD_EXECUTABLE)

camera/tests/main.cpp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * 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 <gtest/gtest.h>





int main(int argc, char **argv) {



    ::testing::InitGoogleTest(&argc, argv);



    int ret = RUN_ALL_TESTS();



    return ret;

}

include/camera/Camera.h

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public: 
        sp<Camera>         mCamera;

    };



private:

protected:

                        Camera();

                        Camera(const Camera&);

                        Camera& operator=(const Camera);

services/camera/libcameraservice/CameraService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ sp<ICamera> CameraService::connect( 
                     callingPid);

                return client;

            } else {

                // TODOSC: need to support 1 regular client, multiple shared clients here

                ALOGW("CameraService::connect X (pid %d) rejected (existing client).",

                      callingPid);

                return NULL;