summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Kast <julian@livio.com>2021-06-04 10:24:24 -0400
committerJulian Kast <julian@livio.com>2021-06-04 10:24:24 -0400
commita5e4dc9f8a5f703fcce6ec32320fc6f60044e155 (patch)
tree64573085e42e8c3da04f875089ec9c5007a6a817
parent965f9e45382a42e147a04df4cfcc7ab564d4bac1 (diff)
downloadsdl_android-a5e4dc9f8a5f703fcce6ec32320fc6f60044e155.tar.gz
Add Image fields to WindowCapability for menuManagerTest
-rw-r--r--android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java22
1 files changed, 18 insertions, 4 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
index 2419023f6..fe73b0784 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
@@ -43,6 +43,7 @@ import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCRequest;
import com.smartdevicelink.proxy.RPCResponse;
+import com.smartdevicelink.proxy.rpc.ImageField;
import com.smartdevicelink.proxy.rpc.OnCommand;
import com.smartdevicelink.proxy.rpc.OnHMIStatus;
import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
@@ -50,6 +51,7 @@ import com.smartdevicelink.proxy.rpc.SetGlobalProperties;
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.ImageFieldName;
import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
import com.smartdevicelink.proxy.rpc.enums.SystemContext;
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
@@ -63,6 +65,7 @@ import org.mockito.Mockito;
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;
@@ -161,6 +164,21 @@ public class MenuManagerTests {
assertNotNull(menuManager.commandListener);
assertNotNull(menuManager.onDisplaysCapabilityListener);
+ menuManager.defaultMainWindowCapability = new WindowCapability();
+
+ List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
+ menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts);
+ List<ImageField> imageFields = new ArrayList<>();
+ ImageField menuCommandSecondaryImage = new ImageField();
+ menuCommandSecondaryImage.setName(ImageFieldName.menuCommandSecondaryImage);
+ ImageField menuSubMenuSecondaryImage = new ImageField();
+ menuSubMenuSecondaryImage.setName(ImageFieldName.menuSubMenuSecondaryImage);
+ imageFields.add(menuCommandSecondaryImage);
+ imageFields.add(menuSubMenuSecondaryImage);
+ menuManager.defaultMainWindowCapability.setImageFields(imageFields);
+
+
+
}
@After
@@ -525,10 +543,6 @@ public class MenuManagerTests {
menuManager.currentHMILevel = HMILevel.HMI_FULL;
menuManager.currentSystemContext = SystemContext.SYSCTXT_MAIN;
menuManager.sdlMsgVersion = new SdlMsgVersion(6, 0);
- menuManager.defaultMainWindowCapability = new WindowCapability();
-
- List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
- menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts);
MenuConfiguration menuConfigurationTest = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST);
menuManager.setMenuConfiguration(menuConfigurationTest);