From d1dee471862a0bcabaf39f348658d254c449e7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Wed, 4 Oct 2023 21:58:41 +0100 Subject: [PATCH] Fix tests --- .../devices/test/TestDeviceCoordinator.java | 4 +++- .../gadgetbridge/model/DeviceTypeTest.java | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java index 941e06890..d0df667a9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/test/TestDeviceCoordinator.java @@ -76,7 +76,7 @@ public class TestDeviceCoordinator extends AbstractDeviceCoordinator { @Override public String getManufacturer() { - return null; + return "Test"; } @Override @@ -110,6 +110,8 @@ public class TestDeviceCoordinator extends AbstractDeviceCoordinator { return UnknownDeviceSupport.class; } + + @Override public int getDeviceNameResource() { return R.string.devicetype_test; diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java index 6b05c9d31..a3ad7c8dc 100644 --- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java +++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceTypeTest.java @@ -25,7 +25,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -public class DeviceTypeTest { +import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; +import nodomain.freeyourgadget.gadgetbridge.test.TestBase; + +public class DeviceTypeTest extends TestBase { @Test public void ensureNoDuplicateKeys() { final Set knownKeys = new HashSet<>(); @@ -37,4 +40,16 @@ public class DeviceTypeTest { Assert.assertTrue("There are duplicated device keys: " + duplicateKeys, duplicateKeys.isEmpty()); } + + @Test + public void ensureNoMissingDeviceInfo() { + // Check that all coordinators for all device types declare valid device names, icons and manufacturer + for (final DeviceType deviceType : DeviceType.values()) { + final DeviceCoordinator coordinator = deviceType.getDeviceCoordinator(); + Assert.assertNotEquals("Device name for " + deviceType + " is 0", 0, coordinator.getDeviceNameResource()); + Assert.assertNotEquals("Device icon for " + deviceType + " is 0", 0, coordinator.getDefaultIconResource()); + Assert.assertNotEquals("Disabled device icon for " + deviceType + " is 0", 0, coordinator.getDisabledIconResource()); + Assert.assertNotEquals("Manufacturer for " + deviceType + " is null", null, coordinator.getManufacturer()); + } + } }