From aecd17a4461da0566aa5245f2aa6aebbfdb31759 Mon Sep 17 00:00:00 2001 From: Samuel Carlsson Date: Thu, 20 Mar 2014 17:01:56 +0100 Subject: [PATCH] Refactor: Moving server code into Jadb from the test package. --- src/se/vidstige/jadb/server/AdbDeviceResponder.java | 7 +++++++ .../se/vidstige/jadb/server}/AdbProtocolHandler.java | 2 +- src/se/vidstige/jadb/server/AdbResponder.java | 7 +++++++ .../fakes => src/se/vidstige/jadb/server}/AdbServer.java | 2 +- .../se/vidstige/jadb/server}/SocketServer.java | 2 +- test/se/vidstige/jadb/test/MockedTestCases.java | 4 ++-- 6 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 src/se/vidstige/jadb/server/AdbDeviceResponder.java rename {test/se/vidstige/jadb/test/fakes => src/se/vidstige/jadb/server}/AdbProtocolHandler.java (98%) create mode 100644 src/se/vidstige/jadb/server/AdbResponder.java rename {test/se/vidstige/jadb/test/fakes => src/se/vidstige/jadb/server}/AdbServer.java (93%) rename {test/se/vidstige/jadb/test/fakes => src/se/vidstige/jadb/server}/SocketServer.java (97%) diff --git a/src/se/vidstige/jadb/server/AdbDeviceResponder.java b/src/se/vidstige/jadb/server/AdbDeviceResponder.java new file mode 100644 index 0000000..5598072 --- /dev/null +++ b/src/se/vidstige/jadb/server/AdbDeviceResponder.java @@ -0,0 +1,7 @@ +package se.vidstige.jadb.server; + +/** + * Created by vidstige on 20/03/14. + */ +public interface AdbDeviceResponder { +} diff --git a/test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java b/src/se/vidstige/jadb/server/AdbProtocolHandler.java similarity index 98% rename from test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java rename to src/se/vidstige/jadb/server/AdbProtocolHandler.java index b8ee61b..4e09844 100644 --- a/test/se/vidstige/jadb/test/fakes/AdbProtocolHandler.java +++ b/src/se/vidstige/jadb/server/AdbProtocolHandler.java @@ -1,4 +1,4 @@ -package se.vidstige.jadb.test.fakes; +package se.vidstige.jadb.server; import java.io.DataInput; import java.io.DataInputStream; diff --git a/src/se/vidstige/jadb/server/AdbResponder.java b/src/se/vidstige/jadb/server/AdbResponder.java new file mode 100644 index 0000000..6ab9547 --- /dev/null +++ b/src/se/vidstige/jadb/server/AdbResponder.java @@ -0,0 +1,7 @@ +package se.vidstige.jadb.server; + +/** + * Created by vidstige on 20/03/14. + */ +public interface AdbResponder { +} diff --git a/test/se/vidstige/jadb/test/fakes/AdbServer.java b/src/se/vidstige/jadb/server/AdbServer.java similarity index 93% rename from test/se/vidstige/jadb/test/fakes/AdbServer.java rename to src/se/vidstige/jadb/server/AdbServer.java index 2e49a93..f9f4db1 100644 --- a/test/se/vidstige/jadb/test/fakes/AdbServer.java +++ b/src/se/vidstige/jadb/server/AdbServer.java @@ -1,4 +1,4 @@ -package se.vidstige.jadb.test.fakes; +package se.vidstige.jadb.server; import java.net.Socket; diff --git a/test/se/vidstige/jadb/test/fakes/SocketServer.java b/src/se/vidstige/jadb/server/SocketServer.java similarity index 97% rename from test/se/vidstige/jadb/test/fakes/SocketServer.java rename to src/se/vidstige/jadb/server/SocketServer.java index 8633c11..28a9b20 100644 --- a/test/se/vidstige/jadb/test/fakes/SocketServer.java +++ b/src/se/vidstige/jadb/server/SocketServer.java @@ -1,4 +1,4 @@ -package se.vidstige.jadb.test.fakes; +package se.vidstige.jadb.server; import java.io.IOException; import java.net.ServerSocket; diff --git a/test/se/vidstige/jadb/test/MockedTestCases.java b/test/se/vidstige/jadb/test/MockedTestCases.java index 3318c15..fc24220 100644 --- a/test/se/vidstige/jadb/test/MockedTestCases.java +++ b/test/se/vidstige/jadb/test/MockedTestCases.java @@ -6,8 +6,8 @@ import org.junit.Before; import org.junit.Test; import se.vidstige.jadb.JadbConnection; import se.vidstige.jadb.JadbDevice; -import se.vidstige.jadb.test.fakes.AdbServer; -import se.vidstige.jadb.test.fakes.SocketServer; +import se.vidstige.jadb.server.AdbServer; +import se.vidstige.jadb.server.SocketServer; import java.util.List;