From 423eabd857f4ac91375ffcbc8c155078c208351f Mon Sep 17 00:00:00 2001
From: Evgeniy Alekseev <i@arcanis.me>
Date: Sun, 17 Dec 2017 04:29:23 +0300
Subject: [PATCH] fix battery tests

---
 sources/extsysmonsources/batterysource.cpp | 28 ++++++++++++----------
 sources/test/testbatterysource.cpp         |  9 ++++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/sources/extsysmonsources/batterysource.cpp b/sources/extsysmonsources/batterysource.cpp
index 4e9423f..7472db2 100644
--- a/sources/extsysmonsources/batterysource.cpp
+++ b/sources/extsysmonsources/batterysource.cpp
@@ -52,18 +52,22 @@ QStringList BatterySource::getSources()
     sources.append("battery/batrate");
     sources.append("battery/battotal");
 
-    m_batteriesCount
-        = QDir(m_acpiPath)
-              .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
-              .count();
-    qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
+    auto directory = QDir(m_acpiPath);
 
-    for (int i = 0; i < m_batteriesCount; i++) {
-        sources.append(QString("battery/bat%1").arg(i));
-        sources.append(QString("battery/batleft%1").arg(i));
-        sources.append(QString("battery/batnow%1").arg(i));
-        sources.append(QString("battery/batrate%1").arg(i));
-        sources.append(QString("battery/battotal%1").arg(i));
+    if (directory.exists()) {
+        m_batteriesCount
+            = directory
+                  .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
+                  .count();
+        qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
+
+        for (int i = 0; i < m_batteriesCount; i++) {
+            sources.append(QString("battery/bat%1").arg(i));
+            sources.append(QString("battery/batleft%1").arg(i));
+            sources.append(QString("battery/batnow%1").arg(i));
+            sources.append(QString("battery/batrate%1").arg(i));
+            sources.append(QString("battery/battotal%1").arg(i));
+        }
     }
 
     qCInfo(LOG_ESS) << "Sources list" << sources;
@@ -123,7 +127,7 @@ QVariantMap BatterySource::initialData(const QString &_source) const
         data["name"] = "Full battery capacity";
         data["type"] = "integer";
         data["units"] = "";
-    } else if (_source == "battery/batleft") {
+    } else if (_source.startsWith("battery/batleft")) {
         data["min"] = 0;
         data["max"] = 0;
         data["name"] = QString("Battery %1 discharge time").arg(index(_source));
diff --git a/sources/test/testbatterysource.cpp b/sources/test/testbatterysource.cpp
index 2ad11ad..893a00d 100644
--- a/sources/test/testbatterysource.cpp
+++ b/sources/test/testbatterysource.cpp
@@ -20,6 +20,8 @@
 
 #include <QtTest>
 
+#include <cmath>
+
 #include "awtestlibrary.h"
 #include "batterysource.h"
 
@@ -39,13 +41,14 @@ void TestBatterySource::cleanupTestCase()
 
 void TestBatterySource::test_sources()
 {
-    QVERIFY(source->sources().count() >= 2);
+    //
+    QVERIFY(source->sources().count() >= 6);
 }
 
 
 void TestBatterySource::test_battery()
 {
-    if (source->sources().count() == 2)
+    if (source->sources().count() == 6)
         QSKIP("No battery found, test will be skipped");
 
     QStringList batteries = source->sources();
@@ -54,7 +57,7 @@ void TestBatterySource::test_battery()
         if (bat == "battery/ac")
             QCOMPARE(value.type(), QVariant::Bool);
         else
-            QVERIFY((value.toFloat() >= battery.first) && (value.toFloat() <= battery.second));
+            QVERIFY((value.toFloat() >= battery.first) || (std::isnan(value.toFloat())));
     });
 }