device-bezel: Fix incorrect parameter of vibration state getter/setter

Those getter/setter should have had parameter type of
hal_device_bezel_vib_state_e, but it had hal_device_bezel_state_e.
Fixed it to the correct type and also fixed related haltest accordingly.

Change-Id: I0fe531b273bba5a8641d91cbca0e9244b8969c87
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/haltest/bezel.cpp b/haltest/bezel.cpp
index 0518ef2820dc05f004672964a685663701ea658d..c5a947fb0b42d11905c668bec5629b3fcdc6ac53 100644 (file)
--- a/haltest/bezel.cpp
+++ b/haltest/bezel.cpp
@@ -184,7 +184,7 @@ TEST_F(BEZEL, SetSwStateP)
 TEST_F(BEZEL, GetVibStateP)
 {
        int ret_val;
-       hal_device_bezel_state_e vstate;
+       hal_device_bezel_vib_state_e vstate;
 
        if (!BEZEL::supported) {
                SKIP_MESSAGE("Bezel not supported");
@@ -202,15 +202,15 @@ TEST_F(BEZEL, GetVibStateP)
 TEST_F(BEZEL, SetVibStateP)
 {
        int ret_val;
-       hal_device_bezel_state_e vstate;
+       hal_device_bezel_vib_state_e vstate;
 
        if (!BEZEL::supported) {
                SKIP_MESSAGE("Bezel not supported");
                return;
        }
 
-       // test HAL_DEVICE_BEZEL_TURNOFF
-       ret_val = hal_device_bezel_set_vib_state(HAL_DEVICE_BEZEL_TURNOFF);
+       // test HAL_DEVICE_BEZEL_VIB_LIGHT
+       ret_val = hal_device_bezel_set_vib_state(HAL_DEVICE_BEZEL_VIB_LIGHT);
        if (ret_val == -ENODEV) {
                SKIP_MESSAGE("Not supported HAL");
                return;
@@ -223,10 +223,26 @@ TEST_F(BEZEL, SetVibStateP)
                return;
        }
        EXPECT_EQ(ret_val, 0) << strerr("Failed to get vibartion state", ret_val);
-       EXPECT_EQ(vstate, HAL_DEVICE_BEZEL_TURNOFF) << "Failed to set vibration state";
+       EXPECT_EQ(vstate, HAL_DEVICE_BEZEL_VIB_LIGHT) << "Failed to set vibration state";
 
-       // test HAL_DEVICE_BEZEL_TURNON
-       ret_val = hal_device_bezel_set_vib_state(HAL_DEVICE_BEZEL_TURNON);
+       // test HAL_DEVICE_BEZEL_VIB_MEDIUM
+       ret_val = hal_device_bezel_set_vib_state(HAL_DEVICE_BEZEL_VIB_MEDIUM);
+       if (ret_val == -ENODEV) {
+               SKIP_MESSAGE("Not supported HAL");
+               return;
+       }
+       EXPECT_EQ(ret_val, 0) << strerr("Failed to set vibration state", ret_val);
+
+       ret_val = hal_device_bezel_get_vib_state(&vstate);
+       if (ret_val == -ENODEV) {
+               SKIP_MESSAGE("Not supported HAL");
+               return;
+       }
+       EXPECT_EQ(ret_val, 0) << strerr("Failed to get vibartion state", ret_val);
+       EXPECT_EQ(vstate, HAL_DEVICE_BEZEL_VIB_MEDIUM) << "Failed to set vibration state";
+
+       // test HAL_DEVICE_BEZEL_VIB_STRONG
+       ret_val = hal_device_bezel_set_vib_state(HAL_DEVICE_BEZEL_VIB_STRONG);
        if (ret_val == -ENODEV) {
                SKIP_MESSAGE("Not supported HAL");
                return;
@@ -239,9 +255,9 @@ TEST_F(BEZEL, SetVibStateP)
                return;
        }
        EXPECT_EQ(ret_val, 0) << strerr("Failed to get vibartion state", ret_val);
-       EXPECT_EQ(vstate, HAL_DEVICE_BEZEL_TURNON) << "Failed to set vibration state";
+       EXPECT_EQ(vstate, HAL_DEVICE_BEZEL_VIB_STRONG) << "Failed to set vibration state";
 
        // restore
        if (BEZEL::orig_vib_state != -1)
-               hal_device_bezel_set_vib_state((hal_device_bezel_state_e)BEZEL::orig_vib_state);
+               hal_device_bezel_set_vib_state((hal_device_bezel_vib_state_e)BEZEL::orig_vib_state);
 }

diff --git a/include/hal-device-bezel.h b/include/hal-device-bezel.h
index c785b7e58c0e3b6c807b44d3f4218478deac3b19..7fb6d7c7cf270e9d553be859a06bdefd67a66cec 100644 (file)
--- a/include/hal-device-bezel.h
+++ b/include/hal-device-bezel.h
@@ -30,8 +30,8 @@ int hal_device_bezel_get_state(hal_device_bezel_state_e *state);
 int hal_device_bezel_set_state(hal_device_bezel_state_e state);
 int hal_device_bezel_get_sw_state(hal_device_bezel_state_e *state);
 int hal_device_bezel_set_sw_state(hal_device_bezel_state_e state);
-int hal_device_bezel_get_vib_state(hal_device_bezel_state_e *state);
-int hal_device_bezel_set_vib_state(hal_device_bezel_state_e state);
+int hal_device_bezel_get_vib_state(hal_device_bezel_vib_state_e *state);
+int hal_device_bezel_set_vib_state(hal_device_bezel_vib_state_e state);
 
 #ifdef __cplusplus
 }