XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completed tests for upower command

pull/1080/head
Nils Winkler 2017-10-23 07:39:08 +02:00
parent d39d14b140
commit b7b8a0afe0
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/available/battery.plugin.bash
View File

@ -55,8 +55,8 @@ battery_percentage(){
if _command_exists upower;
then
local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage | tail --bytes 5)
echo ${UPOWER_OUTPUT: : -1}
local UPOWER_OUTPUT=$(upower --show-info $(upower --enumerate | grep BAT) | grep percentage | grep -o "[0-9]\+" | head -1)
echo ${UPOWER_OUTPUT:--1}
elif _command_exists acpi;
then
local ACPI_OUTPUT=$(acpi -b)

17
test/plugins/battery.plugin.bats
View File

@ -129,14 +129,14 @@ function setup_upower {
percent="$1"
function upower {
echo "-InternalBattery-0 (id=12345) ""${percent}""; discharging; 16:00 remaining present: true"
printf "voltage: 12.191 V\n time to full: 57.3 minutes\n percentage: %s\n capacity: 84.6964" "${percent}"
}
}
@test 'plugins battery: battery-percentage with upower, 100%' {
setup_command_exists "upower"
setup_upower "100%"
setup_upower "100.00%"
run battery_percentage
assert_output "100"
@ -145,7 +145,7 @@ function setup_upower {
@test 'plugins battery: battery-percentage with upower, 98%' {
setup_command_exists "upower"
setup_upower "98%"
setup_upower "98.4567%"
run battery_percentage
assert_output "98"
@ -163,12 +163,21 @@ function setup_upower {
@test 'plugins battery: battery-percentage with upower, 4%' {
setup_command_exists "upower"
setup_upower "4%"
setup_upower "4.2345%"
run battery_percentage
assert_output "4"
}
@test 'plugins battery: battery-percentage with upower, no output' {
setup_command_exists "upower"
setup_upower ""
run battery_percentage
assert_output "-1"
}
#######################
#
# ioreg