|
43 | 43 | import com.smartdevicelink.protocol.enums.FunctionID; |
44 | 44 | import com.smartdevicelink.proxy.RPCRequest; |
45 | 45 | import com.smartdevicelink.proxy.RPCResponse; |
| 46 | +import com.smartdevicelink.proxy.rpc.ImageField; |
46 | 47 | import com.smartdevicelink.proxy.rpc.OnCommand; |
47 | 48 | import com.smartdevicelink.proxy.rpc.OnHMIStatus; |
48 | 49 | import com.smartdevicelink.proxy.rpc.SdlMsgVersion; |
49 | 50 | import com.smartdevicelink.proxy.rpc.SetGlobalProperties; |
50 | 51 | import com.smartdevicelink.proxy.rpc.WindowCapability; |
51 | 52 | import com.smartdevicelink.proxy.rpc.enums.FileType; |
52 | 53 | import com.smartdevicelink.proxy.rpc.enums.HMILevel; |
| 54 | +import com.smartdevicelink.proxy.rpc.enums.ImageFieldName; |
53 | 55 | import com.smartdevicelink.proxy.rpc.enums.MenuLayout; |
54 | 56 | import com.smartdevicelink.proxy.rpc.enums.SystemContext; |
55 | 57 | import com.smartdevicelink.proxy.rpc.enums.TriggerSource; |
|
63 | 65 | import org.mockito.invocation.InvocationOnMock; |
64 | 66 | import org.mockito.stubbing.Answer; |
65 | 67 |
|
| 68 | +import java.util.ArrayList; |
66 | 69 | import java.util.Arrays; |
67 | 70 | import java.util.Collections; |
68 | 71 | import java.util.List; |
@@ -161,6 +164,21 @@ public Void answer(InvocationOnMock invocation) { |
161 | 164 | assertNotNull(menuManager.commandListener); |
162 | 165 | assertNotNull(menuManager.onDisplaysCapabilityListener); |
163 | 166 |
|
| 167 | + menuManager.defaultMainWindowCapability = new WindowCapability(); |
| 168 | + |
| 169 | + List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES); |
| 170 | + menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts); |
| 171 | + List<ImageField> imageFields = new ArrayList<>(); |
| 172 | + ImageField menuCommandSecondaryImage = new ImageField(); |
| 173 | + menuCommandSecondaryImage.setName(ImageFieldName.menuCommandSecondaryImage); |
| 174 | + ImageField menuSubMenuSecondaryImage = new ImageField(); |
| 175 | + menuSubMenuSecondaryImage.setName(ImageFieldName.menuSubMenuSecondaryImage); |
| 176 | + imageFields.add(menuCommandSecondaryImage); |
| 177 | + imageFields.add(menuSubMenuSecondaryImage); |
| 178 | + menuManager.defaultMainWindowCapability.setImageFields(imageFields); |
| 179 | + |
| 180 | + |
| 181 | + |
164 | 182 | } |
165 | 183 |
|
166 | 184 | @After |
@@ -525,10 +543,6 @@ public void testSetMenuConfiguration() { |
525 | 543 | menuManager.currentHMILevel = HMILevel.HMI_FULL; |
526 | 544 | menuManager.currentSystemContext = SystemContext.SYSCTXT_MAIN; |
527 | 545 | menuManager.sdlMsgVersion = new SdlMsgVersion(6, 0); |
528 | | - menuManager.defaultMainWindowCapability = new WindowCapability(); |
529 | | - |
530 | | - List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES); |
531 | | - menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts); |
532 | 546 |
|
533 | 547 | MenuConfiguration menuConfigurationTest = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST); |
534 | 548 | menuManager.setMenuConfiguration(menuConfigurationTest); |
|
0 commit comments