Fix borken SoftButton tests

1 files changed, 15 insertions, 11 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index 144057c36..4c7da604a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -39,8 +39,9 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
 
     private SoftButtonManager softButtonManager;
     private boolean fileManagerUploadArtworksGotCalled;
-    private boolean internalInterfaceSendRPCRequestGotCalled;
+    private boolean internalInterfaceSendRPCGotCalled;
     private boolean softButtonMangerUpdateCompleted;
+    private int softButtonObject1Id = 1000, softButtonObject2Id = 2000;
     private SoftButtonObject softButtonObject1, softButtonObject2;
     private SoftButtonState softButtonState1, softButtonState2, softButtonState3, softButtonState4;
 
@@ -86,13 +87,13 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
         softButtonManager = new SoftButtonManager(internalInterface, fileManager);
 
 
-        // When internalInterface.sendRPCRequest() is called inside SoftButtonManager:
+        // When internalInterface.sendRPC() is called inside SoftButtonManager:
         // 1) respond with a fake onResponse() callback to let the SoftButtonManager continue working
         // 2) assert that the Show RPC values (ie: MainField1 & SoftButtons) that are created by the SoftButtonManager, match the ones that are provided by the developer
         Answer<Void> onSendShowRPCAnswer = new Answer<Void>() {
             @Override
             public Void answer(InvocationOnMock invocation) {
-                internalInterfaceSendRPCRequestGotCalled = true;
+                internalInterfaceSendRPCGotCalled = true;
                 Object[] args = invocation.getArguments();
                 Show show = (Show) args[0];
 
@@ -104,16 +105,18 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
                 return null;
             }
         };
-        doAnswer(onSendShowRPCAnswer).when(internalInterface).sendRPCRequest(any(Show.class));
+        doAnswer(onSendShowRPCAnswer).when(internalInterface).sendRPC(any(Show.class));
 
 
         // Create soft button objects
         softButtonState1 = new SoftButtonState("object1-state1", "o1s1", new SdlArtwork("image1", FileType.GRAPHIC_PNG, 1, true));
         softButtonState2 = new SoftButtonState("object1-state2", "o1s2", new SdlArtwork(StaticIconName.ALBUM));
         softButtonObject1 = new SoftButtonObject("object1", Arrays.asList(softButtonState1, softButtonState2), softButtonState1.getName(), null);
+        softButtonObject1.setButtonId(softButtonObject1Id);
         softButtonState3 = new SoftButtonState("object2-state1", "o2s1", null);
         softButtonState4 = new SoftButtonState("object2-state2", "o2s2", new SdlArtwork("image3", FileType.GRAPHIC_PNG, 3, true));
         softButtonObject2 = new SoftButtonObject("object2", Arrays.asList(softButtonState3, softButtonState4), softButtonState3.getName(), null);
+        softButtonObject2.setButtonId(softButtonObject2Id);
     }
 
     @Override
@@ -124,7 +127,7 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
     public void testSoftButtonManagerUpdate() {
         // Reset the boolean variables
         fileManagerUploadArtworksGotCalled = false;
-        internalInterfaceSendRPCRequestGotCalled = false;
+        internalInterfaceSendRPCGotCalled = false;
         softButtonMangerUpdateCompleted = false;
 
 
@@ -148,7 +151,7 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
 
         // Check that everything got called as expected
         assertTrue("FileManager.uploadArtworks() did not get called", fileManagerUploadArtworksGotCalled);
-        assertTrue("InternalInterface.sendRPCRequest() did not get called", internalInterfaceSendRPCRequestGotCalled);
+        assertTrue("InternalInterface.sendRPC() did not get called", internalInterfaceSendRPCGotCalled);
         assertTrue("SoftButtonManger update onComplete() did not get called", softButtonMangerUpdateCompleted);
 
 
@@ -169,11 +172,11 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
 
 
         // Test get by valid id
-        assertEquals("Returned SoftButtonObject doesn't match the expected value", softButtonObject2, softButtonManager.getSoftButtonObjectById(100));
+        assertEquals("Returned SoftButtonObject doesn't match the expected value", softButtonObject2, softButtonManager.getSoftButtonObjectById(softButtonObject2Id));
 
 
         // Test get by invalid id
-        assertNull("Returned SoftButtonObject doesn't match the expected value", softButtonManager.getSoftButtonObjectById(500));
+        assertNull("Returned SoftButtonObject doesn't match the expected value", softButtonManager.getSoftButtonObjectById(5555));
     }
 
     public void testSoftButtonState(){
@@ -190,9 +193,10 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
 
 
         // Test SoftButtonState.getSoftButton()
-        SoftButton softButtonExpectedValue = new SoftButton(SoftButtonType.SBT_BOTH, 0);
+        SoftButton softButtonExpectedValue = new SoftButton(SoftButtonType.SBT_BOTH, SoftButtonObject.SOFT_BUTTON_ID_NOT_SET_VALUE);
         softButtonExpectedValue.setText("o1s1");
         softButtonExpectedValue.setImage(new Image(artworkExpectedValue.getName(), ImageType.DYNAMIC));
+        SoftButton actual = softButtonState1.getSoftButton();
         assertTrue("Returned SoftButton doesn't match the expected value", Validator.validateSoftButton(softButtonExpectedValue, softButtonState1.getSoftButton()));
     }
 
@@ -210,11 +214,11 @@ public class SoftButtonManagerTests extends AndroidTestCase2 {
 
 
         // Test SoftButtonObject.getButtonId()
-        assertEquals("Returned button Id doesn't match the expected value", 0, softButtonObject1.getButtonId());
+        assertEquals("Returned button Id doesn't match the expected value", softButtonObject1Id, softButtonObject1.getButtonId());
 
 
         // Test SoftButtonObject.getCurrentStateSoftButton()
-        SoftButton softButtonExpectedValue = new SoftButton(SoftButtonType.SBT_TEXT, 0);
+        SoftButton softButtonExpectedValue = new SoftButton(SoftButtonType.SBT_TEXT, softButtonObject2Id);
         softButtonExpectedValue.setText("o2s1");
         assertTrue("Returned current state SoftButton doesn't match the expected value", Validator.validateSoftButton(softButtonExpectedValue, softButtonObject2.getCurrentStateSoftButton()));