[ITC][camera][ACR-1768] New TCs added for new focus APIs

Change-Id: I5178559720ef1568537bcea0471748d5182f9d41
Signed-off-by: Shobhit Verma <shobhit.v@samsung.com>

diff --git a/src/itc/camera/ITs-camera-attribute.c b/src/itc/camera/ITs-camera-attribute.c
index 8550ecb0c10051edffa889271f8e192659e70097..676537ad23715638dd8ff3fa8b824b7d445c0097 100755 (executable)
--- a/src/itc/camera/ITs-camera-attribute.c
+++ b/src/itc/camera/ITs-camera-attribute.c
@@ -3221,5 +3221,87 @@ int ITc_camera_attr_set_whitebalance_temperature_step_p(void)
 
        return 0;
 }
+
+//& purpose: To get focus level range (min and max supported values)
+//& type: auto
+/**
+* @testcase                    ITc_camera_attr_get_focus_level_range_p
+* @since_tizen                         8.0
+* @author                              SRID(shobhit.v)
+* @reviewer                            SRID(utk.tiwari)
+* @type                                auto
+* @description                 Get focus level min and max range
+* @scenario                            Get focus level min and max range
+* @apicovered                  camera_attr_get_focus_level_range, camera_attr_set_focus_level_range
+* @passcase                            When camera_attr_get_focus_level_range is successful
+* @failcase                            If target API camera_attr_get_focus_level_range fails
+* @precondition                        Camera handle must be created
+* @postcondition               Camera handle must be released
+*/
+int ITc_camera_attr_get_focus_level_range_p(void)
+{
+       START_TEST;
+
+       int nMin = -1;
+       int nMax = -1;
+
+       int nRet = camera_attr_get_focus_level_range(g_camera, &nMin, &nMax);
+       CHECK_UNSUPPORTED_ERROR_RETURN(g_bFeatureCamera, "camera_attr_get_focus_level_range");
+       PRINT_RESULT(CAMERA_ERROR_NONE, nRet, "camera_attr_get_focus_level_range", CameraGetError(nRet));
+       FPRINTF("[Line : %d][%s] Supported Min and Max focus levels are: Min=%d, Max=%d\\n", __LINE__, API_NAMESPACE,nMin, nMax);
+
+       return 0;
+}
+
+//& purpose: To check Set focus level withon valid range and get
+//& type: auto
+/**
+* @testcase                    ITc_camera_attr_set_get_focus_level_p
+* @since_tizen                         8.0
+* @author                              SRID(shobhit.v)
+* @reviewer                            SRID(utk.tiwari)
+* @type                                auto
+* @description                 Set focus level within valid range and Get focus level within valid range
+* @scenario                            Set focus level and get the same. Should not be mismatch in set and get values
+* @apicovered                  camera_attr_get_focus_level_range, camera_attr_set_focus_level_range
+* @passcase                            When camera_attr_get_focus_level_range and camera_attr_set_focus_level_range are successful and set/get values are matched.
+* @failcase                            If target API camera_attr_get_focus_level_range or camera_attr_set_focus_level_range fails or set/get values are unmatched.
+* @precondition                        Camera handle must be created
+* @postcondition               Camera handle must be released
+*/
+int ITc_camera_attr_set_get_focus_level_p(void)
+{
+       START_TEST;
+
+       int nGetVal;
+       int nMin = -1;
+       int nMax = -1;
+
+       int nRet = camera_attr_get_focus_level_range(g_camera, &nMin, &nMax);
+       CHECK_UNSUPPORTED_ERROR_RETURN(g_bFeatureCamera, "camera_attr_get_focus_level_range");
+       PRINT_RESULT(CAMERA_ERROR_NONE, nRet, "camera_attr_get_focus_level_range", CameraGetError(nRet));
+       FPRINTF("[Line : %d][%s] Supported Min and Max focus levels are: Min=%d, Max=%d\\n", __LINE__, API_NAMESPACE,nMin, nMax);
+
+       if (nMin > nMax)
+       {
+               FPRINTF("[Line : %d][%s] Focus level is not supported.\\n", __LINE__, API_NAMESPACE);
+               return 0;
+       }
+
+       nRet = camera_attr_set_focus_level(g_camera, nMax);
+       CHECK_UNSUPPORTED_ERROR_RETURN(g_bFeatureCamera, "camera_attr_set_focus_level");
+       PRINT_RESULT(CAMERA_ERROR_NONE, nRet, "camera_attr_set_focus_level", CameraGetError(nRet));
+
+       nRet = camera_attr_get_focus_level(g_camera, &nGetVal);
+       CHECK_UNSUPPORTED_ERROR_RETURN(g_bFeatureCamera, "camera_attr_get_focus_level");
+       PRINT_RESULT(CAMERA_ERROR_NONE, nRet, "camera_attr_get_focus_level", CameraGetError(nRet));
+
+       if ( nGetVal != nMax )
+       {
+               FPRINTF("[Line : %d][%s] Set/Get values mismatch\\n", __LINE__, API_NAMESPACE);
+               return 1;
+       }
+       return 0;
+}
 /** @} */
 /** @} */

diff --git a/src/itc/camera/ITs-camera-common.h b/src/itc/camera/ITs-camera-common.h
index 5d2184eb14f17966f840725e1717332fb79d4a02..59c7bc4898d342d3430a85c59353dbf83c3540dc 100755 (executable)
--- a/src/itc/camera/ITs-camera-common.h
+++ b/src/itc/camera/ITs-camera-common.h
@@ -75,7 +75,7 @@ typedef struct Resolution{
 #define CHECK_UNSUPPORTED_ERROR_RETURN(bSupported, szApi)\
        if ( !bSupported )\
 {\
-       if ( nRet != TIZEN_ERROR_NOT_SUPPORTED )\
+       if ( nRet != CAMERA_ERROR_NOT_SUPPORTED )\
 {\
        FPRINTF("[Line : %d][%s] %s returned %s for unsupported feature\\n", __LINE__, API_NAMESPACE, szApi, CameraGetError(nRet));\
        return 1;\

diff --git a/src/itc/camera/tct-camera-native_mobile.h b/src/itc/camera/tct-camera-native_mobile.h
index eedf77abb19b5314a0208251d993b5e67ea72711..0b3c5fc04603200a59f07a6efe22a404a2018422 100755 (executable)
--- a/src/itc/camera/tct-camera-native_mobile.h
+++ b/src/itc/camera/tct-camera-native_mobile.h
@@ -72,6 +72,8 @@ extern int ITc_camera_attr_foreach_supported_ptz_type_p(void);
 extern int ITc_camera_attr_set_get_display_roi_area_p(void);
 extern int ITc_camera_attr_set_get_hue_p(void);
 extern int ITc_camera_attr_get_hue_range_p(void);
+extern int ITc_camera_attr_get_focus_level_range_p(void);
+extern int ITc_camera_attr_set_get_focus_level_p(void);
 extern int ITc_camera_is_supported_continuous_capture_p(void);
 extern int ITc_camera_foreach_supported_preview_resolution_p(void);
 extern int ITc_camera_foreach_supported_capture_resolution_p(void);
@@ -187,6 +189,8 @@ testcase tc_array[] = {
        {"ITc_camera_attr_set_get_display_roi_area_p",ITc_camera_attr_set_get_display_roi_area_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_set_get_hue_p",ITc_camera_attr_set_get_hue_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_get_hue_range_p",ITc_camera_attr_get_hue_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_get_focus_level_range_p",ITc_camera_attr_get_focus_level_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_set_get_focus_level_p",ITc_camera_attr_set_get_focus_level_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_is_supported_continuous_capture_p",ITc_camera_is_supported_continuous_capture_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_preview_resolution_p",ITc_camera_foreach_supported_preview_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_capture_resolution_p",ITc_camera_foreach_supported_capture_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},

diff --git a/src/itc/camera/tct-camera-native_tizeniot.h b/src/itc/camera/tct-camera-native_tizeniot.h
index 362a50f1c841595eeae9b6fb94e923b83d060e66..dc2f4f4b47e468eeadd4eabde29ab645943e5743 100755 (executable)
--- a/src/itc/camera/tct-camera-native_tizeniot.h
+++ b/src/itc/camera/tct-camera-native_tizeniot.h
@@ -72,6 +72,8 @@ extern int ITc_camera_attr_foreach_supported_ptz_type_p(void);
 extern int ITc_camera_attr_set_get_display_roi_area_p(void);
 extern int ITc_camera_attr_set_get_hue_p(void);
 extern int ITc_camera_attr_get_hue_range_p(void);
+extern int ITc_camera_attr_get_focus_level_range_p(void);
+extern int ITc_camera_attr_set_get_focus_level_p(void);
 extern int ITc_camera_is_supported_continuous_capture_p(void);
 extern int ITc_camera_foreach_supported_preview_resolution_p(void);
 extern int ITc_camera_foreach_supported_capture_resolution_p(void);
@@ -187,6 +189,8 @@ testcase tc_array[] = {
        {"ITc_camera_attr_set_get_display_roi_area_p",ITc_camera_attr_set_get_display_roi_area_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_set_get_hue_p",ITc_camera_attr_set_get_hue_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_get_hue_range_p",ITc_camera_attr_get_hue_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_get_focus_level_range_p",ITc_camera_attr_get_focus_level_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_set_get_focus_level_p",ITc_camera_attr_set_get_focus_level_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_is_supported_continuous_capture_p",ITc_camera_is_supported_continuous_capture_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_preview_resolution_p",ITc_camera_foreach_supported_preview_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_capture_resolution_p",ITc_camera_foreach_supported_capture_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},

diff --git a/src/itc/camera/tct-camera-native_tv.h b/src/itc/camera/tct-camera-native_tv.h
index 4cb2bb16fee5ab0d48484af86dd8d58ab1019e45..c4b427f79c37727afa20b8017052533f29fbf76e 100755 (executable)
--- a/src/itc/camera/tct-camera-native_tv.h
+++ b/src/itc/camera/tct-camera-native_tv.h
@@ -72,6 +72,8 @@ extern int ITc_camera_attr_foreach_supported_ptz_type_p(void);
 extern int ITc_camera_attr_set_get_display_roi_area_p(void);
 extern int ITc_camera_attr_set_get_hue_p(void);
 extern int ITc_camera_attr_get_hue_range_p(void);
+extern int ITc_camera_attr_get_focus_level_range_p(void);
+extern int ITc_camera_attr_set_get_focus_level_p(void);
 extern int ITc_camera_is_supported_continuous_capture_p(void);
 extern int ITc_camera_foreach_supported_preview_resolution_p(void);
 extern int ITc_camera_foreach_supported_capture_resolution_p(void);
@@ -188,6 +190,8 @@ testcase tc_array[] = {
        {"ITc_camera_attr_set_get_display_roi_area_p",ITc_camera_attr_set_get_display_roi_area_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_set_get_hue_p",ITc_camera_attr_set_get_hue_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_get_hue_range_p",ITc_camera_attr_get_hue_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_get_focus_level_range_p",ITc_camera_attr_get_focus_level_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_set_get_focus_level_p",ITc_camera_attr_set_get_focus_level_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},      
        {"ITc_camera_is_supported_continuous_capture_p",ITc_camera_is_supported_continuous_capture_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_preview_resolution_p",ITc_camera_foreach_supported_preview_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_foreach_supported_capture_resolution_p",ITc_camera_foreach_supported_capture_resolution_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},

diff --git a/src/itc/camera/tct-camera-native_wearable.h b/src/itc/camera/tct-camera-native_wearable.h
index b7a84f768778e5d0c1bfe85841e8afa5982c33af..9d4840c144b855653f11e31ac5551d812c84c838 100755 (executable)
--- a/src/itc/camera/tct-camera-native_wearable.h
+++ b/src/itc/camera/tct-camera-native_wearable.h
@@ -72,6 +72,8 @@ extern int ITc_camera_attr_foreach_supported_ptz_type_p(void);
 extern int ITc_camera_attr_set_get_display_roi_area_p(void);
 extern int ITc_camera_attr_set_get_hue_p(void);
 extern int ITc_camera_attr_get_hue_range_p(void);
+extern int ITc_camera_attr_get_focus_level_range_p(void);
+extern int ITc_camera_attr_set_get_focus_level_p(void);
 extern int ITc_camera_is_supported_continuous_capture_p(void);
 extern int ITc_camera_foreach_supported_preview_resolution_p(void);
 extern int ITc_camera_foreach_supported_capture_resolution_p(void);
@@ -214,6 +216,8 @@ testcase tc_array[] = {
        {"ITc_camera_attr_is_supported_auto_contrast_p",ITc_camera_attr_is_supported_auto_contrast_p,ITs_camera_capability_startup,ITs_camera_capability_cleanup},
        {"ITc_camera_attr_set_get_hue_p",ITc_camera_attr_set_get_hue_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
        {"ITc_camera_attr_get_hue_range_p",ITc_camera_attr_get_hue_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_get_focus_level_range_p",ITc_camera_attr_get_focus_level_range_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},
+       {"ITc_camera_attr_set_get_focus_level_p",ITc_camera_attr_set_get_focus_level_p,ITs_camera_attribute_startup,ITs_camera_attribute_cleanup},      
        {"ITc_camera_set_get_display_rotation_p",ITc_camera_set_get_display_rotation_p,ITs_camera_display_startup,ITs_camera_display_cleanup},
        {"ITc_camera_set_get_display_flip_p",ITc_camera_set_get_display_flip_p,ITs_camera_display_startup,ITs_camera_display_cleanup},
        {"ITc_camera_set_display_isvisible_display_p",ITc_camera_set_display_isvisible_display_p,ITs_camera_display_startup,ITs_camera_display_cleanup},