Fix unit testsfeature/issue_1455_remove_onerror

5 files changed, 27 insertions, 33 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 b33c4f494..f7978a704 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
@@ -404,10 +404,6 @@ public class SdlManagerTests {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
 			}
 		};
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index dccd7c10b..8908346d2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -72,10 +72,9 @@ public class FileManagerTests {
 			RPCRequest message = (RPCRequest) args[0];
 			if (message instanceof PutFile) {
 				int correlationId = message.getCorrelationID();
-				Result resultCode = Result.REJECTED;
-				PutFileResponse putFileResponse = new PutFileResponse();
-				putFileResponse.setSuccess(false);
-				message.getOnRPCResponseListener().onError(correlationId, resultCode, "Binary data empty");
+				PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+				putFileResponse.setInfo("Binary data empty");
+				message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
 			}
 			return null;
 		}
@@ -88,13 +87,12 @@ public class FileManagerTests {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof PutFile) {
-				Result resultCode = Result.REJECTED;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
 					listener.addCorrelationId(correlationId);
-					PutFileResponse putFileResponse = new PutFileResponse();
-					putFileResponse.setSuccess(true);
-					listener.onError(correlationId, resultCode, "Binary data empty");
+					PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+					putFileResponse.setInfo("Binary data empty");
+					listener.onResponse(correlationId, putFileResponse);
 				}
 				listener.onFinished();
 			}
@@ -197,13 +195,12 @@ public class FileManagerTests {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof DeleteFile) {
-				Result resultCode = Result.REJECTED;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
 					listener.addCorrelationId(correlationId);
-					DeleteFileResponse deleteFileResponse = new DeleteFileResponse();
-					deleteFileResponse.setSuccess(true);
-					listener.onError(correlationId, resultCode, "Binary data empty");
+					DeleteFileResponse deleteFileResponse = new DeleteFileResponse(false, Result.REJECTED);
+					deleteFileResponse.setInfo("Binary data empty");
+					listener.onResponse(correlationId, deleteFileResponse);
 				}
 				listener.onFinished();
 			}
@@ -218,7 +215,6 @@ public class FileManagerTests {
 			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
 			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
 			if (rpcs.get(0) instanceof PutFile) {
-				Result resultCode = Result.REJECTED;
 				boolean flip = false;
 				for (RPCRequest message : rpcs) {
 					int correlationId = message.getCorrelationID();
@@ -231,7 +227,9 @@ public class FileManagerTests {
 					} else {
 						flip = true;
 						putFileResponse.setSuccess(false);
-						listener.onError(correlationId, resultCode, "Binary data empty");
+						putFileResponse.setResultCode(Result.REJECTED);
+						putFileResponse.setInfo("Binary data empty");
+						listener.onResponse(correlationId, putFileResponse);
 					}
 				}
 				listener.onFinished();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
index 8e16c3ed0..b16889934 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
@@ -61,9 +61,9 @@ public class SubscribeButtonManagerTest {
             Object[] args = invocation.getArguments();
             RPCRequest message = (RPCRequest) args[0];
             if(message instanceof SubscribeButton){
-                SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse();
-                subscribeButtonResponse.setSuccess(false);
-                message.getOnRPCResponseListener().onError(message.getCorrelationID(), Result.GENERIC_ERROR, "Fail");
+                SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse(false, Result.GENERIC_ERROR);
+                subscribeButtonResponse.setInfo("Fail");
+                message.getOnRPCResponseListener().onResponse(message.getCorrelationID(), subscribeButtonResponse);
             }
             return null;
         }
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 da8b48d8c..92670c7d4 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
@@ -15,6 +15,7 @@ import com.smartdevicelink.proxy.SdlProxyBase;
 import com.smartdevicelink.proxy.SdlProxyBuilder;
 import com.smartdevicelink.proxy.SdlProxyConfigurationResources;
 import com.smartdevicelink.proxy.interfaces.IProxyListenerALM;
+import com.smartdevicelink.proxy.rpc.GenericResponse;
 import com.smartdevicelink.proxy.rpc.Show;
 import com.smartdevicelink.proxy.rpc.ShowResponse;
 import com.smartdevicelink.proxy.rpc.Speak;
@@ -229,15 +230,14 @@ public class SdlProxyBaseTests {
             }
 
             @Override
-            public void onError(int correlationId, Result resultCode, String info) {
-                onErrorListenerCounter++;
-                remainingRequestsExpected--;
-            }
-
-            @Override
             public void onResponse(int correlationId, RPCResponse response) {
-                onResponseListenerCounter++;
-                remainingRequestsExpected--;
+                if (response.getSuccess()) {
+                    onResponseListenerCounter++;
+                    remainingRequestsExpected--;
+                } else {
+                    onErrorListenerCounter++;
+                    remainingRequestsExpected--;
+                }
             }
         };
         try {
@@ -280,7 +280,7 @@ public class SdlProxyBaseTests {
                 while (rpcsTempList.size() != 0){
                     RPCRequest request = rpcsTempList.remove(0);
                     if (request instanceof Speak) {
-                        requestsMap.get(request).onError(request.getCorrelationID(), Result.DISALLOWED, "ERROR");
+                        requestsMap.get(request).onResponse(request.getCorrelationID(), new GenericResponse(false, Result.DISALLOWED));
                     } else if (request instanceof Show) {
                         requestsMap.get(request).onResponse(request.getCorrelationID(), new ShowResponse(true, Result.SUCCESS));
                     }
diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
index 1cb380023..6056cdbf6 100644
--- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
@@ -358,9 +358,9 @@ abstract class BaseFileManager extends BaseSubManager {
 	 */
 	private boolean shouldReUploadFile(String fileName, FileType fileType) {
 		if (!failedFileUploadsIndex.containsKey(fileName)) {
-			if (fileType.equals(FileType.GRAPHIC_JPEG) ||
-					fileType.equals(FileType.GRAPHIC_BMP) ||
-					fileType.equals(FileType.GRAPHIC_PNG)) {
+			if (FileType.GRAPHIC_JPEG.equals(fileType) ||
+					FileType.GRAPHIC_BMP.equals(fileType) ||
+					FileType.GRAPHIC_PNG.equals(fileType)) {
 				failedFileUploadsIndex.put(fileName, fileManagerConfig.getArtworkRetryCount());
 			} else {
 				failedFileUploadsIndex.put(fileName, fileManagerConfig.getFileRetryCount());