From b75359c7c5743c3728d83634e4bde7047ff528b8 Mon Sep 17 00:00:00 2001 From: Bilal Alsharifi Date: Fri, 13 Sep 2019 16:14:02 -0400 Subject: Move menuLayoutsAvailable to WindowCapability --- .../test/rpc/datatypes/DisplayCapabilitiesTests.java | 14 +++----------- .../test/rpc/datatypes/WindowCapabilityTests.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'android/sdl_android/src/androidTest') diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java index 742c4d03d..28d7e1460 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java @@ -43,7 +43,6 @@ public class DisplayCapabilitiesTests extends TestCase{ msg.setMediaClockFormats(Test.GENERAL_MEDIACLOCKFORMAT_LIST); msg.setScreenParams(Test.GENERAL_SCREENPARAMS); msg.setTemplatesAvailable(Test.GENERAL_STRING_LIST); - msg.setMenuLayoutsAvailable(Test.GENERAL_MENU_LAYOUT_LIST); } /** @@ -60,8 +59,7 @@ public class DisplayCapabilitiesTests extends TestCase{ List mediaClock = msg.getMediaClockFormats(); List textFields = msg.getTextFields(); List imageFields = msg.getImageFields(); - List menuLayouts = msg.getMenuLayoutsAvailable(); - + // Valid Tests assertEquals(Test.MATCH, Test.GENERAL_BOOLEAN, graphicSupported); assertEquals(Test.MATCH, Test.GENERAL_INT, numPresets); @@ -72,8 +70,7 @@ public class DisplayCapabilitiesTests extends TestCase{ assertEquals(Test.MATCH, Test.GENERAL_MEDIACLOCKFORMAT_LIST.size(), mediaClock.size()); assertEquals(Test.MATCH, Test.GENERAL_TEXTFIELD_LIST.size(), textFields.size()); assertEquals(Test.MATCH, Test.GENERAL_IMAGEFIELD_LIST.size(), imageFields.size()); - assertEquals(Test.MATCH, Test.GENERAL_MENU_LAYOUT_LIST.size(), menuLayouts.size()); - + for(int i = 0; i < Test.GENERAL_STRING_LIST.size(); i++){ assertEquals(Test.MATCH, Test.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i)); } @@ -90,9 +87,6 @@ public class DisplayCapabilitiesTests extends TestCase{ assertTrue(Test.TRUE, Validator.validateImageFields(Test.GENERAL_IMAGEFIELD_LIST.get(i), imageFields.get(i))); } - for(int i = 0; i < Test.GENERAL_MENU_LAYOUT_LIST.size(); i++){ - assertEquals(Test.MATCH, Test.GENERAL_MENU_LAYOUT_LIST.get(i), menuLayouts.get(i)); - } // Invalid/Null Tests DisplayCapabilities msg = new DisplayCapabilities(); @@ -107,7 +101,6 @@ public class DisplayCapabilitiesTests extends TestCase{ assertNull(Test.NULL, msg.getScreenParams()); assertNull(Test.NULL, msg.getTemplatesAvailable()); assertNull(Test.NULL, msg.getTextFields()); - assertNull(Test.NULL, msg.getMenuLayoutsAvailable()); } public void testJson(){ @@ -123,7 +116,6 @@ public class DisplayCapabilitiesTests extends TestCase{ reference.put(DisplayCapabilities.KEY_TEXT_FIELDS, Test.JSON_TEXTFIELDS); reference.put(DisplayCapabilities.KEY_IMAGE_FIELDS, Test.JSON_IMAGEFIELDS); reference.put(DisplayCapabilities.KEY_SCREEN_PARAMS, Test.JSON_SCREENPARAMS); - reference.put(DisplayCapabilities.KEY_MENU_LAYOUTS_AVAILABLE, JsonUtils.createJsonArray(Test.GENERAL_MENU_LAYOUT_LIST)); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -163,7 +155,7 @@ public class DisplayCapabilitiesTests extends TestCase{ Hashtable hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray); assertTrue(Test.TRUE, Validator.validateScreenParams(new ScreenParams(hashReference), new ScreenParams(hashTest))); - } else if(key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS) || key.equals(DisplayCapabilities.KEY_MENU_LAYOUTS_AVAILABLE)){ + } else if(key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS)){ JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key); JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key); assertEquals(Test.MATCH, referenceArray.length(), underTestArray.length()); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java index 07d2cbd49..973c6e0b8 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java @@ -7,6 +7,7 @@ import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities; import com.smartdevicelink.proxy.rpc.TextField; import com.smartdevicelink.proxy.rpc.WindowCapability; import com.smartdevicelink.proxy.rpc.enums.ImageType; +import com.smartdevicelink.proxy.rpc.enums.MenuLayout; import com.smartdevicelink.test.JsonUtils; import com.smartdevicelink.test.Test; import com.smartdevicelink.test.Validator; @@ -39,6 +40,7 @@ public class WindowCapabilityTests extends TestCase { msg.setNumCustomPresetsAvailable(Test.GENERAL_INT); msg.setButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST); msg.setSoftButtonCapabilities(Test.GENERAL_SOFTBUTTONCAPABILITIES_LIST); + msg.setMenuLayoutsAvailable(Test.GENERAL_MENU_LAYOUT_LIST); } /** @@ -54,6 +56,7 @@ public class WindowCapabilityTests extends TestCase { int numCustomPresetsAvailable = msg.getNumCustomPresetsAvailable(); List buttonCapabilities = msg.getButtonCapabilities(); List softButtonCapabilities = msg.getSoftButtonCapabilities(); + List menuLayouts = msg.getMenuLayoutsAvailable(); // Valid Tests assertEquals(Test.MATCH, Test.GENERAL_INT, windowID); @@ -64,6 +67,7 @@ public class WindowCapabilityTests extends TestCase { assertEquals(Test.MATCH, Test.GENERAL_INT, numCustomPresetsAvailable); assertEquals(Test.MATCH, Test.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size()); assertEquals(Test.MATCH, Test.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(), softButtonCapabilities.size()); + assertEquals(Test.MATCH, Test.GENERAL_MENU_LAYOUT_LIST.size(), menuLayouts.size()); for (int i = 0; i < Test.GENERAL_TEXTFIELD_LIST.size(); i++) { assertTrue(Test.TRUE, Validator.validateTextFields(Test.GENERAL_TEXTFIELD_LIST.get(i), textFields.get(i))); @@ -81,6 +85,10 @@ public class WindowCapabilityTests extends TestCase { assertEquals(Test.MATCH, Test.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i)); } + for(int i = 0; i < Test.GENERAL_MENU_LAYOUT_LIST.size(); i++){ + assertEquals(Test.MATCH, Test.GENERAL_MENU_LAYOUT_LIST.get(i), menuLayouts.get(i)); + } + assertTrue(Test.TRUE, Validator.validateButtonCapabilities(Test.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities)); assertTrue(Test.TRUE, Validator.validateSoftButtonCapabilities(Test.GENERAL_SOFTBUTTONCAPABILITIES_LIST, softButtonCapabilities)); @@ -96,6 +104,7 @@ public class WindowCapabilityTests extends TestCase { assertNull(Test.NULL, msg.getNumCustomPresetsAvailable()); assertNull(Test.NULL, msg.getButtonCapabilities()); assertNull(Test.NULL, msg.getSoftButtonCapabilities()); + assertNull(Test.NULL, msg.getMenuLayoutsAvailable()); } public void testJson() { @@ -110,6 +119,7 @@ public class WindowCapabilityTests extends TestCase { reference.put(WindowCapability.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, Test.GENERAL_INT); reference.put(WindowCapability.KEY_BUTTON_CAPABILITIES, Test.JSON_BUTTONCAPABILITIES); reference.put(WindowCapability.KEY_SOFT_BUTTON_CAPABILITIES, Test.JSON_SOFTBUTTONCAPABILITIES); + reference.put(WindowCapability.KEY_MENU_LAYOUTS_AVAILABLE, JsonUtils.createJsonArray(Test.GENERAL_MENU_LAYOUT_LIST)); JSONObject underTest = msg.serializeJSON(); assertEquals(Test.MATCH, reference.length(), underTest.length()); @@ -171,7 +181,7 @@ public class WindowCapabilityTests extends TestCase { testList.add(new SoftButtonCapabilities(hashTest)); } assertTrue(Test.TRUE, Validator.validateSoftButtonCapabilities(referenceList, testList)); - } else if (key.equals(WindowCapability.KEY_IMAGE_TYPE_SUPPORTED)) { + } else if (key.equals(WindowCapability.KEY_IMAGE_TYPE_SUPPORTED) || (key.equals(WindowCapability.KEY_MENU_LAYOUTS_AVAILABLE))) { List referenceList = JsonUtils.readStringListFromJsonObject(reference, key); List underTestList = JsonUtils.readStringListFromJsonObject(underTest, key); -- cgit v1.2.1