Skip to content

Commit fdccce5

Browse files
Test that the soft button listeners got called correctly
1 parent 9e382aa commit fdccce5

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
public class SoftButtonManagerTests extends AndroidTestCase2 {
5252

5353
private SoftButtonManager softButtonManager;
54-
private boolean fileManagerUploadArtworksGotCalled;
55-
private boolean internalInterfaceSendRPCGotCalled;
54+
private int fileManagerUploadArtworksListenerCalledCounter;
55+
private int internalInterfaceSendRPCListenerCalledCounter;
5656
private int softButtonObject1Id = 1000, softButtonObject2Id = 2000;
5757
private SoftButtonObject softButtonObject1, softButtonObject2;
5858
private SoftButtonState softButtonState1, softButtonState2, softButtonState3, softButtonState4;
@@ -108,7 +108,7 @@ public Void answer(InvocationOnMock invocation) {
108108
Answer<Void> onFileManagerUploadAnswer = new Answer<Void>() {
109109
@Override
110110
public Void answer(InvocationOnMock invocation) {
111-
fileManagerUploadArtworksGotCalled = true;
111+
fileManagerUploadArtworksListenerCalledCounter++;
112112
Object[] args = invocation.getArguments();
113113
MultipleFileCompletionListener multipleFileCompletionListener = (MultipleFileCompletionListener) args[1];
114114
multipleFileCompletionListener.onComplete(null);
@@ -131,7 +131,7 @@ public Void answer(InvocationOnMock invocation) {
131131
Answer<Void> onSendShowRPCAnswer = new Answer<Void>() {
132132
@Override
133133
public Void answer(InvocationOnMock invocation) {
134-
internalInterfaceSendRPCGotCalled = true;
134+
internalInterfaceSendRPCListenerCalledCounter++;
135135
Object[] args = invocation.getArguments();
136136
Show show = (Show) args[0];
137137

@@ -172,8 +172,8 @@ private void sleep() {
172172

173173
public void testSoftButtonManagerUpdate() {
174174
// Reset the boolean variables
175-
fileManagerUploadArtworksGotCalled = false;
176-
internalInterfaceSendRPCGotCalled = false;
175+
fileManagerUploadArtworksListenerCalledCounter = 0;
176+
internalInterfaceSendRPCListenerCalledCounter = 0;
177177

178178

179179
// Test batch update
@@ -193,8 +193,8 @@ public void testSoftButtonManagerUpdate() {
193193

194194

195195
// Check that everything got called as expected
196-
assertTrue("FileManager.uploadArtworks() did not get called", fileManagerUploadArtworksGotCalled);
197-
assertTrue("InternalInterface.sendRPC() did not get called", internalInterfaceSendRPCGotCalled);
196+
assertEquals("FileManager.uploadArtworks() did not get called correctly", 1, fileManagerUploadArtworksListenerCalledCounter);
197+
assertEquals("InternalInterface.sendRPC() did not get called correctly",2, internalInterfaceSendRPCListenerCalledCounter);
198198

199199

200200
// Test getSoftButtonObjects

0 commit comments

Comments
 (0)