Skip to content

Commit a5e4dc9

Browse files
author
Julian Kast
committed
Add Image fields to WindowCapability for menuManagerTest
1 parent 965f9e4 commit a5e4dc9

1 file changed

Lines changed: 18 additions & 4 deletions

File tree

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,15 @@
4343
import com.smartdevicelink.protocol.enums.FunctionID;
4444
import com.smartdevicelink.proxy.RPCRequest;
4545
import com.smartdevicelink.proxy.RPCResponse;
46+
import com.smartdevicelink.proxy.rpc.ImageField;
4647
import com.smartdevicelink.proxy.rpc.OnCommand;
4748
import com.smartdevicelink.proxy.rpc.OnHMIStatus;
4849
import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
4950
import com.smartdevicelink.proxy.rpc.SetGlobalProperties;
5051
import com.smartdevicelink.proxy.rpc.WindowCapability;
5152
import com.smartdevicelink.proxy.rpc.enums.FileType;
5253
import com.smartdevicelink.proxy.rpc.enums.HMILevel;
54+
import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
5355
import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
5456
import com.smartdevicelink.proxy.rpc.enums.SystemContext;
5557
import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
@@ -63,6 +65,7 @@
6365
import org.mockito.invocation.InvocationOnMock;
6466
import org.mockito.stubbing.Answer;
6567

68+
import java.util.ArrayList;
6669
import java.util.Arrays;
6770
import java.util.Collections;
6871
import java.util.List;
@@ -161,6 +164,21 @@ public Void answer(InvocationOnMock invocation) {
161164
assertNotNull(menuManager.commandListener);
162165
assertNotNull(menuManager.onDisplaysCapabilityListener);
163166

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+
164182
}
165183

166184
@After
@@ -525,10 +543,6 @@ public void testSetMenuConfiguration() {
525543
menuManager.currentHMILevel = HMILevel.HMI_FULL;
526544
menuManager.currentSystemContext = SystemContext.SYSCTXT_MAIN;
527545
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);
532546

533547
MenuConfiguration menuConfigurationTest = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST);
534548
menuManager.setMenuConfiguration(menuConfigurationTest);

0 commit comments

Comments
 (0)