From f28be646347d8a78ff7c4d0312fa5e73582b81d6 Mon Sep 17 00:00:00 2001 From: Bilal Alsharifi Date: Thu, 16 May 2019 16:45:52 -0400 Subject: Update sendRPCs & sendSequentialRPCs tests --- .../java/com/smartdevicelink/managers/SdlManagerTests.java | 13 +++---------- .../com/smartdevicelink/test/proxy/SdlProxyBaseTests.java | 4 ++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java index 15ea98328..1c465c382 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java @@ -344,8 +344,6 @@ public class SdlManagerTests extends AndroidTestCase2 { private void testSendMultipleRPCs(boolean sequentialSend){ listenerCalledCounter = 0; - final List rpcsList = Arrays.asList(new GetVehicleData(), new Show()); - // When sdlProxyBase.sendRPCRequests() is called, call listener.onFinished() to fake the response final Answer answer = new Answer() { @@ -353,10 +351,6 @@ public class SdlManagerTests extends AndroidTestCase2 { public Void answer(InvocationOnMock invocation) { Object[] args = invocation.getArguments(); OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1]; - int rpcsCount = rpcsList.size(); - while (rpcsCount != 0) { - listener.onUpdate(--rpcsCount); - } listener.onFinished(); return null; } @@ -374,11 +368,10 @@ public class SdlManagerTests extends AndroidTestCase2 { // Test send RPC requests + List rpcsList = Arrays.asList(new GetVehicleData(), new Show(), new OnAppServiceData(), new GetAppServiceDataResponse()); OnMultipleRequestListener onMultipleRequestListener = new OnMultipleRequestListener() { @Override - public void onUpdate(int remainingRequests) { - listenerCalledCounter++; - } + public void onUpdate(int remainingRequests) { } @Override public void onFinished() { @@ -399,7 +392,7 @@ public class SdlManagerTests extends AndroidTestCase2 { // Make sure the listener is called exactly once - assertEquals("Listener was not called or called more/less frequently than expected", listenerCalledCounter, rpcsList.size() + 1); + assertEquals("Listener was not called or called more/less frequently than expected", listenerCalledCounter, 1); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java index b3971b29f..281e110c5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SdlProxyBaseTests.java @@ -148,7 +148,7 @@ public class SdlProxyBaseTests extends AndroidTestCase2 { testSendMultipleRPCs(false, 1); } - public void testSendRPCsSomeFails(){ + public void testSendRPCsSomeFail(){ testSendMultipleRPCs(false, 2); } @@ -156,7 +156,7 @@ public class SdlProxyBaseTests extends AndroidTestCase2 { testSendMultipleRPCs(true, 1); } - public void testSendSequentialRPCsSomeFails(){ + public void testSendSequentialRPCsSomeFail(){ testSendMultipleRPCs(true, 2); } -- cgit v1.2.1