From d1af94d2572deccf6adc052d8c8df00681a1c880 Mon Sep 17 00:00:00 2001 From: Giemsa Date: Fri, 9 Dec 2016 02:46:03 +0900 Subject: [PATCH] minor changes to some API --- src/se/vidstige/jadb/JadbConnection.java | 9 +++++---- test/se/vidstige/jadb/test/unit/MockedTestCases.java | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/se/vidstige/jadb/JadbConnection.java b/src/se/vidstige/jadb/JadbConnection.java index 9658a61..7a76ec1 100644 --- a/src/se/vidstige/jadb/JadbConnection.java +++ b/src/se/vidstige/jadb/JadbConnection.java @@ -12,11 +12,11 @@ public class JadbConnection implements ITransportFactory { private static final int DEFAULTPORT = 5037; - public JadbConnection() throws IOException { + public JadbConnection() { this("localhost", DEFAULTPORT); } - public JadbConnection(String host, int port) throws IOException { + public JadbConnection(String host, int port) { this.host = host; this.port = port; } @@ -25,16 +25,17 @@ public class JadbConnection implements ITransportFactory { return new Transport(new Socket(host, port)); } - public void getHostVersion() throws IOException, JadbException { + public String getHostVersion() throws IOException, JadbException { Transport main = createTransport(); main.send("host:version"); main.verifyResponse(); + String version = main.readString(); main.close(); + return version; } public List getDevices() throws IOException, JadbException { Transport devices = createTransport(); - devices.send("host:devices"); devices.verifyResponse(); String body = devices.readString(); diff --git a/test/se/vidstige/jadb/test/unit/MockedTestCases.java b/test/se/vidstige/jadb/test/unit/MockedTestCases.java index 14dbbf9..a529baf 100644 --- a/test/se/vidstige/jadb/test/unit/MockedTestCases.java +++ b/test/se/vidstige/jadb/test/unit/MockedTestCases.java @@ -36,6 +36,11 @@ public class MockedTestCases { server.verifyExpectations(); } + @Test + public void testGetHostVersion() throws Exception { + Assert.assertEquals("001f", connection.getHostVersion()); + } + @Test public void testListDevices() throws Exception { server.add("serial-123");