[ITC][device][Non-ACR][Fix battery get property issue]
authorperforce <perforce@perforce.(none)>
Thu, 30 Jun 2016 07:46:43 +0000 (16:46 +0900)
committerperforce <perforce@perforce.(none)>
Thu, 30 Jun 2016 07:46:43 +0000 (16:46 +0900)
Change-Id: I0b2d609febc0a9dbeab854dfc898bf8bce0eb57f
Signed-off-by: perforce <perforce@perforce.(none)>
src/itc/device/ITs-device_battery.c

index 153dd0b..fff7747 100755 (executable)
@@ -264,6 +264,7 @@ int ITc_device_battery_get_property_p(void)
 {
        START_TEST;
 
+       device_battery_status_e eDeviceBatteryStatus = -1;
        device_battery_property_e eDeviceBatteryProperty[] = {DEVICE_BATTERY_PROPERTY_CAPACITY, DEVICE_BATTERY_PROPERTY_CURRENT_NOW, DEVICE_BATTERY_PROPERTY_CURRENT_AVERAGE};
        int nDeviceBatteryPropertyArraySize = sizeof(eDeviceBatteryProperty) / sizeof(eDeviceBatteryProperty[0]);
        int nValue;
@@ -274,11 +275,16 @@ int ITc_device_battery_get_property_p(void)
                nValue = -1;
                nRet = device_battery_get_property(eDeviceBatteryProperty[nLoopCount], &nValue);
                PRINT_RESULT(DEVICE_ERROR_NONE, nRet, "device_battery_get_property", DeviceGetError(nRet));
-               if (nValue < 0)
+               
+               device_battery_get_status(&eDeviceBatteryStatus);
+               PRINT_RESULT(DEVICE_ERROR_NONE, nRet, "device_battery_get_status", DeviceGetError(nRet));
+
+               if ( eDeviceBatteryStatus == DEVICE_BATTERY_STATUS_CHARGING && nValue < 0 )
                {
-                       FPRINTF("[Line : %d][%s] device_battery_get_property failed with invalid value\\n", __LINE__, API_NAMESPACE);
+                       FPRINTF("[Line : %d][%s]  device_battery_get_property failed with invalid value\\n", __LINE__, API_NAMESPACE);
                        return 1;
                }
+
        }
 
        return 0;
@@ -319,4 +325,4 @@ int ITc_device_battery_get_status_p(void)
        return 0;
 }
 /** @} */
-/** @} */
\ No newline at end of file
+/** @} */