let's separate Android from not Android

This commit is contained in:
rusefillc 2022-10-15 20:24:03 -04:00
parent 73b9a067c4
commit c2d02faa85
6 changed files with 3 additions and 4 deletions

View File

@ -15,7 +15,6 @@ dependencies {
implementation files('../lib/dfu/IntelHexParser.jar')
testImplementation global_libs.mockito
testImplementation project(':proxy_server')
testImplementation testFixtures(project(':ecu_io'))
}

View File

@ -56,7 +56,7 @@ public class LocalApplicationProxyTest {
assertLatch(backendCreated);
SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
CountDownLatch disconnected = new CountDownLatch(1);
LocalApplicationProxy.startAndRun(context, applicationRequest, -1, (String message) -> disconnected.countDown(), LocalApplicationProxy.ConnectionListener.VOID);
@ -72,7 +72,7 @@ public class LocalApplicationProxyTest {
try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) {
SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
try (ServerSocketReference ignored2 = LocalApplicationProxy.startAndRun(context, applicationRequest, -1, TcpIoStream.DisconnectListener.VOID, LocalApplicationProxy.ConnectionListener.VOID)) {
TcpIoStream applicationConnection = new TcpIoStream("mock application ", new Socket(LOCALHOST, context.authenticatorPort()));
@ -113,7 +113,7 @@ public class LocalApplicationProxyTest {
try (ServerSocketReference ignored1 = createMockBackend(context, gaugePokes)) {
SessionDetails sessionDetails = TestHelper.createTestSession(TEST_TOKEN_1, Fields.TS_SIGNATURE);
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, createTestUserResolver().apply(TEST_TOKEN_1));
ApplicationRequest applicationRequest = new ApplicationRequest(sessionDetails, BackendTestHelper.createTestUserResolver().apply(TEST_TOKEN_1));
CountDownLatch disconnected = new CountDownLatch(1);