feat: update tests to include plug mini (#36)

feat: update commands for per device

Author: bigboxer23

README.md

@@ -27,14 +27,32 @@ System.out.println("" + status.getBattery());
 ```
 SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
 instance.getDeviceApi().getDevices().stream()
-        .filter(device -> "Curtain".equals(device.getDeviceType()))
+        .filter(device -> IDeviceTypes.CURTAIN.equals(device.getDeviceType()))
         .filter(Device::isMaster)
         .findAny()
         .ifPresent(curtain -> {
             try {
                 instance.getDeviceApi()
                         .sendDeviceControlCommands(
-                                curtain.getDeviceId(), new DeviceCommand("turnOff", "default"));
+                                curtain.getDeviceId(), IDeviceCommands.CURTAIN_CLOSE);
+            } catch (IOException theE) {
+                theE.printStackTrace();
+            }
+            });
+```
+
+4. Send command to turn on a plug mini
+
+```
+SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
+instance.getDeviceApi().getDevices().stream()
+        .filter(device -> IDeviceTypes.PLUG_MINI.equals(device.getDeviceType()))
+        .findAny()
+        .ifPresent(plug -> {
+            try {
+                instance.getDeviceApi()
+                        .sendDeviceControlCommands(
+                                plug.getDeviceId(), IDeviceCommands.PLUG_MINI_ON);
             } catch (IOException theE) {
                 theE.printStackTrace();
             }

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.bigboxer23</groupId>
   <artifactId>switchbotapi-java</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
 
   <name>switchbotapi-java</name>
   <url>https://github.com/bigboxer23/switchbotapi-java</url>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.bigboxer23</groupId>
       <artifactId>utils</artifactId>
-      <version>2.0.19</version>
+      <version>2.0.23</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>

src/main/java/com/bigboxer23/switch_bot/IDeviceCommands.java

@@ -8,7 +8,11 @@ public interface IDeviceCommands {
 
 	String TURN_ON = "turnOn";
 
-	DeviceCommand CLOSE_CURTAIN = new DeviceCommand(TURN_OFF, "default");
+	DeviceCommand CURTAIN_CLOSE = new DeviceCommand(TURN_OFF, "default");
 
-	DeviceCommand OPEN_CURTAIN = new DeviceCommand(TURN_ON, "default");
+	DeviceCommand CURTAIN_OPEN = new DeviceCommand(TURN_ON, "default");
+
+	DeviceCommand PLUG_MINI_OFF = new DeviceCommand(TURN_OFF, "default");
+
+	DeviceCommand PLUG_MINI_ON = new DeviceCommand(TURN_ON, "default");
 }

src/main/java/com/bigboxer23/switch_bot/SwitchBotApi.java

@@ -3,7 +3,6 @@
 import com.bigboxer23.switch_bot.data.IApiResponse;
 import com.bigboxer23.utils.http.RequestBuilderCallback;
 import com.squareup.moshi.Moshi;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -36,10 +35,10 @@ private SwitchBotApi(String token, String secret) {
 		deviceApi = new SwitchBotDeviceApi(this);
 	}
 
-	public static SwitchBotApi getInstance(String token, String secret) throws IOException {
+	public static SwitchBotApi getInstance(String token, String secret) {
 		if (token == null || secret == null) {
 			logger.error("need to define token and secret values.");
-			throw new IOException("need to define token and secret values.");
+			throw new RuntimeException("need to define token and secret values.");
 		}
 		return Optional.ofNullable(instance).orElseGet(() -> {
 			instance = new SwitchBotApi(token, secret);

src/main/java/com/bigboxer23/switch_bot/data/Device.java

@@ -24,7 +24,7 @@ public class Device {
 
 	private boolean group;
 
-	private int moving;
+	private boolean moving;
 
 	private int slidePosition;
 
@@ -40,4 +40,8 @@ public class Device {
 	private int electricityOfDay;
 
 	private float electricCurrent; // amps / 10
+
+	public boolean isPowerOn() {
+		return "on".equalsIgnoreCase(getPower());
+	}
 }

src/test/java/com/bigboxer23/switch_bot/SwitchBotApiTest.java

@@ -3,28 +3,29 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.bigboxer23.switch_bot.data.Device;
+import com.bigboxer23.utils.command.Command;
+import com.bigboxer23.utils.properties.PropertyUtils;
 import java.io.IOException;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
 /** Need to define environment variables for SwitchBotToken/SwitchBotSecret to run tests */
 public class SwitchBotApiTest {
-	private final String token = System.getenv("SwitchBotToken");
+	private static final String token = PropertyUtils.getProperty("switchbot_token");
 
-	private final String secret = System.getenv("SwitchBotSecret");
+	private static final String secret = PropertyUtils.getProperty("switchbot_secret");
+
+	private static final SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
 
 	@Test
 	public void testGetDevices() throws IOException {
-		SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
 		List<Device> devices = instance.getDeviceApi().getDevices();
 		assertFalse(devices.isEmpty());
 		assertNotNull(devices.get(0).getDeviceId());
 	}
 
 	@Test
 	public void testDeviceStatus() throws IOException {
-		SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
-
 		try {
 			instance.getDeviceApi().getDeviceStatus("123");
 			fail();
@@ -45,7 +46,7 @@ public void testDeviceStatus() throws IOException {
 				}
 				case IDeviceTypes.CURTAIN -> {
 					assertTrue(status.getSlidePosition() >= 0);
-					assertTrue(status.getMoving() >= 0);
+					assertTrue(status.isMoving());
 					assertTrue(status.getBattery() >= 0);
 				}
 				case IDeviceTypes.PLUG_MINI -> {
@@ -60,15 +61,59 @@ public void testDeviceStatus() throws IOException {
 	}
 
 	@Test
-	public void testDeviceCommands() throws IOException {
-		SwitchBotApi instance = SwitchBotApi.getInstance(token, secret);
+	public void testCurtainDeviceCommands() throws IOException, InterruptedException {
 		Device curtain = instance.getDeviceApi().getDevices().stream()
 				.filter(device -> IDeviceTypes.CURTAIN.equals(device.getDeviceType()))
 				.filter(Device::isMaster)
 				.findAny()
 				.orElse(null);
 		assertNotNull(curtain);
 		assertNotNull(curtain.getDeviceId());
-		instance.getDeviceApi().sendDeviceControlCommands(curtain.getDeviceId(), IDeviceCommands.CLOSE_CURTAIN);
+		System.out.println("slide position "
+				+ instance.getDeviceApi().getDeviceStatus(curtain.getDeviceId()).getSlidePosition());
+
+		instance.getDeviceApi().sendDeviceControlCommands(curtain.getDeviceId(), IDeviceCommands.CURTAIN_CLOSE);
+		pollForStatus(() -> {
+			int slidePosition = instance.getDeviceApi()
+					.getDeviceStatus(curtain.getDeviceId())
+					.getSlidePosition();
+			System.out.println("slide position " + slidePosition);
+			return slidePosition >= 90;
+		});
+		instance.getDeviceApi().sendDeviceControlCommands(curtain.getDeviceId(), IDeviceCommands.CURTAIN_OPEN);
+		pollForStatus(() -> {
+			int slidePosition = instance.getDeviceApi()
+					.getDeviceStatus(curtain.getDeviceId())
+					.getSlidePosition();
+			System.out.println("slide position " + slidePosition);
+			return slidePosition == 0;
+		});
+	}
+
+	@Test
+	public void testPlugDeviceCommands() throws IOException, InterruptedException {
+		Device plug = instance.getDeviceApi().getDevices().stream()
+				.filter(device -> IDeviceTypes.PLUG_MINI.equals(device.getDeviceType()))
+				.findAny()
+				.orElse(null);
+		assertNotNull(plug);
+
+		instance.getDeviceApi().sendDeviceControlCommands(plug.getDeviceId(), IDeviceCommands.PLUG_MINI_OFF);
+		pollForStatus(() ->
+				!instance.getDeviceApi().getDeviceStatus(plug.getDeviceId()).isPowerOn());
+
+		instance.getDeviceApi().sendDeviceControlCommands(plug.getDeviceId(), IDeviceCommands.PLUG_MINI_ON);
+		pollForStatus(() ->
+				instance.getDeviceApi().getDeviceStatus(plug.getDeviceId()).isPowerOn());
+	}
+
+	private void pollForStatus(Command<Boolean> command) throws IOException, InterruptedException {
+		boolean result = command.execute();
+		for (int ai = 0; ai < 10 && !result; ai++) {
+			System.out.println("sleeping " + ai);
+			Thread.sleep(2000);
+			result = command.execute();
+		}
+		assertTrue(result);
 	}
 }