Fixed Unit test

4 files changed, 19 insertions, 24 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index 33d164740..11d8472c2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -99,7 +98,11 @@ public class ScreenManagerTests {
 		screenManager.setPrimaryGraphic(testArtwork);
 		assertEquals(screenManager.getPrimaryGraphic(), testArtwork);
 	}
-
+	@Test
+	public void testSetPrimaryGraphicWithBlankImage() {
+		screenManager.setPrimaryGraphic(null);
+		assertNull(screenManager.getPrimaryGraphic());
+	}
 	@Test
 	public void testSetSecondaryGraphic() {
 		screenManager.setSecondaryGraphic(testArtwork);
@@ -107,6 +110,12 @@ public class ScreenManagerTests {
 	}
 
 	@Test
+	public void testSetSecondaryGraphicWithBlankImage() {
+		screenManager.setSecondaryGraphic(null);
+		assertNull(screenManager.getSecondaryGraphic());
+	}
+
+	@Test
 	public void testAlignment() {
 		screenManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
 		assertEquals(screenManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 646e26ded..2bb0164fb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -7,7 +7,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.livio.taskmaster.Task;
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.BaseSubManager;
-import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
@@ -15,21 +14,16 @@ import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
-import com.smartdevicelink.proxy.rpc.MetadataTags;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
-import com.smartdevicelink.proxy.rpc.Show;
-import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
 import com.smartdevicelink.proxy.rpc.TextField;
 import com.smartdevicelink.proxy.rpc.WindowCapability;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 
-import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,7 +31,6 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -71,6 +64,7 @@ public class TextAndGraphicManagerTests {
 		// mock things
 		ISdl internalInterface = mock(ISdl.class);
 		FileManager fileManager = mock(FileManager.class);
+		SoftButtonManager softButtonManager = mock(SoftButtonManager.class);
 
 		testArtwork = new SdlArtwork();
 		testArtwork.setName("testFile");
@@ -110,7 +104,7 @@ public class TextAndGraphicManagerTests {
 		};
 		doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
 
-		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager);
+		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
 	}
 
 
@@ -264,25 +258,17 @@ public class TextAndGraphicManagerTests {
 	@Test
 	public void testOperationManagement() {
 		textAndGraphicManager.isDirty = true;
-		textAndGraphicManager.update(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-			}
-		});
+		textAndGraphicManager.updateOperation = null;
+		textAndGraphicManager.update(null);
 		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
 
 		textAndGraphicManager.transactionQueue.clear();
+		textAndGraphicManager.updateOperation = null;
 
 		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 0);
 
 		textAndGraphicManager.isDirty = true;
-		textAndGraphicManager.update(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-			}
-		});
+		textAndGraphicManager.update(null);
 
 		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
index 0e5b439f5..a279e3aec 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
@@ -83,7 +83,7 @@ public class TextAndGraphicUpdateOperationTest {
             RPCRequest message = (RPCRequest) args[0];
             if (message instanceof Show) {
                 int correlationId = message.getCorrelationID();
-                textAndGraphicUpdateOperation.setTaskIsCanceled(true);
+                textAndGraphicUpdateOperation.cancelTask();
                 ShowResponse showResponse = new ShowResponse();
                 showResponse.setSuccess(true);
                 message.getOnRPCResponseListener().onResponse(correlationId, showResponse);
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
index 7dba7853e..336abf5ba 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
@@ -85,7 +85,7 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager {
 	private TextAlignment textAlignment;
 	private String textField1, textField2, textField3, textField4, mediaTrackTextField, title;
 	private MetadataType textField1Type, textField2Type, textField3Type, textField4Type;
-	private TextAndGraphicUpdateOperation updateOperation;
+	TextAndGraphicUpdateOperation updateOperation;
 	private CompletionListener currentOperationListener;
 	Queue transactionQueue;