11 files changed, 45 insertions, 2 deletions
diff --git a/testcases/001-battery/expected_output.txt b/testcases/001-battery/expected_output.txt
index 6e1898b..ab4bc9f 100644
--- a/testcases/001-battery/expected_output.txt
+++ b/testcases/001-battery/expected_output.txt
@@ -1 +1 @@
-BAT 30.64% 02:09:32
+BAT 30.64% 02:09
diff --git a/testcases/015-battery-capacity/expected_output.txt b/testcases/015-battery-capacity/expected_output.txt
index 663a593..fb37af8 100644
--- a/testcases/015-battery-capacity/expected_output.txt
+++ b/testcases/015-battery-capacity/expected_output.txt
@@ -1 +1 @@
-Touchpad: 30.64% BAT 02:09:32
+Touchpad: 30.64% BAT 02:09
diff --git a/testcases/018-battery-capacity/1/uevent b/testcases/018-battery-capacity/1/uevent
new file mode 100644
index 0000000..00b1148
--- /dev/null
+++ b/testcases/018-battery-capacity/1/uevent
@@ -0,0 +1,2 @@
+POWER_SUPPLY_CHARGE_FULL=100
+POWER_SUPPLY_CHARGE_NOW=50
diff --git a/testcases/018-battery-capacity/expected_output.txt b/testcases/018-battery-capacity/expected_output.txt
new file mode 100644
index 0000000..ab07d0a
--- /dev/null
+++ b/testcases/018-battery-capacity/expected_output.txt
@@ -0,0 +1 @@
+50.00%
diff --git a/testcases/018-battery-capacity/i3status.conf b/testcases/018-battery-capacity/i3status.conf
new file mode 100644
index 0000000..7a3443c
--- /dev/null
+++ b/testcases/018-battery-capacity/i3status.conf
@@ -0,0 +1,10 @@
+general {
+        output_format = "none"
+}
+
+order += "battery all"
+
+battery all {
+        format = "%percentage"
+        path = "testcases/018-battery-capacity/%d/uevent"
+}
diff --git a/testcases/019-battery-capacity/1/uevent b/testcases/019-battery-capacity/1/uevent
new file mode 100644
index 0000000..d004bf1
--- /dev/null
+++ b/testcases/019-battery-capacity/1/uevent
@@ -0,0 +1,2 @@
+POWER_SUPPLY_CHARGE_FULL_DESIGN=100
+POWER_SUPPLY_CHARGE_NOW=50
diff --git a/testcases/019-battery-capacity/expected_output.txt b/testcases/019-battery-capacity/expected_output.txt
new file mode 100644
index 0000000..ab07d0a
--- /dev/null
+++ b/testcases/019-battery-capacity/expected_output.txt
@@ -0,0 +1 @@
+50.00%
diff --git a/testcases/019-battery-capacity/i3status.conf b/testcases/019-battery-capacity/i3status.conf
new file mode 100644
index 0000000..8152d44
--- /dev/null
+++ b/testcases/019-battery-capacity/i3status.conf
@@ -0,0 +1,11 @@
+general {
+        output_format = "none"
+}
+
+order += "battery all"
+
+battery all {
+        format = "%percentage"
+        path = "testcases/019-battery-capacity/%d/uevent"
+        last_full_capacity = true
+}
diff --git a/testcases/021-battery-second/BAT0_uevent b/testcases/021-battery-second/BAT0_uevent
new file mode 100644
index 0000000..b994324
--- /dev/null
+++ b/testcases/021-battery-second/BAT0_uevent
@@ -0,0 +1,4 @@
+POWER_SUPPLY_STATUS=Discharging
+POWER_SUPPLY_CURRENT_NOW=1107000
+POWER_SUPPLY_CHARGE_FULL_DESIGN=7800000
+POWER_SUPPLY_CHARGE_NOW=2390000
diff --git a/testcases/021-battery-second/expected_output.txt b/testcases/021-battery-second/expected_output.txt
new file mode 100644
index 0000000..6e1898b
--- /dev/null
+++ b/testcases/021-battery-second/expected_output.txt
@@ -0,0 +1 @@
+BAT 30.64% 02:09:32
diff --git a/testcases/021-battery-second/i3status.conf b/testcases/021-battery-second/i3status.conf
new file mode 100644
index 0000000..3aa2262
--- /dev/null
+++ b/testcases/021-battery-second/i3status.conf
@@ -0,0 +1,11 @@
+general {
+        output_format = "none"
+}
+
+order += "battery all"
+
+battery all {
+        format = "%status %percentage %remaining"
+        path = "testcases/021-battery-second/BAT%d_uevent"
+        hide_seconds = false
+}