Align to latest iOS PR

Author: Henigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java

@@ -3,17 +3,16 @@
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
 import com.smartdevicelink.protocol.enums.FrameDataControlFrameType;
 import com.smartdevicelink.protocol.enums.FrameType;
-import com.smartdevicelink.protocol.enums.QueryErrorCode;
-import com.smartdevicelink.protocol.enums.QueryID;
-import com.smartdevicelink.protocol.enums.QueryType;
+import com.smartdevicelink.protocol.enums.SecurityQueryErrorCode;
+import com.smartdevicelink.protocol.enums.SecurityQueryID;
+import com.smartdevicelink.protocol.enums.SecurityQueryType;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.rpc.*;
 import com.smartdevicelink.proxy.rpc.enums.AppServiceType;
 import com.smartdevicelink.proxy.rpc.enums.DefrostZone;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
-import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout;
 import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 import com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
@@ -129,7 +128,7 @@ public static boolean validateSessionTypeArray(SessionType[] array1, SessionType
         return true;
     }
 
-    public static boolean validateQueryTypeArray(QueryType[] array1, QueryType[] array2) {
+    public static boolean validateQueryTypeArray(SecurityQueryType[] array1, SecurityQueryType[] array2) {
 
         if (array1 == null) {
             return (array2 == null);
@@ -152,7 +151,7 @@ public static boolean validateQueryTypeArray(QueryType[] array1, QueryType[] arr
         return true;
     }
 
-    public static boolean validateQueryIDArray(QueryID[] array1, QueryID[] array2) {
+    public static boolean validateQueryIDArray(SecurityQueryID[] array1, SecurityQueryID[] array2) {
 
         if (array1 == null) {
             return (array2 == null);
@@ -175,7 +174,7 @@ public static boolean validateQueryIDArray(QueryID[] array1, QueryID[] array2) {
         return true;
     }
 
-    public static boolean validateQueryErrorCodeArray(QueryErrorCode[] array1, QueryErrorCode[] array2) {
+    public static boolean validateQueryErrorCodeArray(SecurityQueryErrorCode[] array1, SecurityQueryErrorCode[] array2) {
 
         if (array1 == null) {
             return (array2 == null);

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/SecurityQueryPayloadTests.java

@@ -3,8 +3,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.protocol.SecurityQueryPayload;
-import com.smartdevicelink.protocol.enums.QueryID;
-import com.smartdevicelink.protocol.enums.QueryType;
+import com.smartdevicelink.protocol.enums.SecurityQueryID;
+import com.smartdevicelink.protocol.enums.SecurityQueryType;
 import com.smartdevicelink.util.BitConverter;
 
 import org.junit.Test;
@@ -22,8 +22,8 @@ public class SecurityQueryPayloadTests {
     public static SecurityQueryPayload createDummyBqh() {
         SecurityQueryPayload bqh = new SecurityQueryPayload();
         bqh.setCorrelationID(123);
-        bqh.setQueryID(QueryID.SEND_HANDSHAKE_DATA);
-        bqh.setQueryType(QueryType.REQUEST);
+        bqh.setQueryID(SecurityQueryID.SEND_HANDSHAKE_DATA);
+        bqh.setQueryType(SecurityQueryType.REQUEST);
         bqh.setBulkData(null);
         bqh.setJsonSize(0);
         return bqh;
@@ -54,25 +54,25 @@ public void testCorrectParsing() {
         array[11] = 0;
 
         SecurityQueryPayload parsedBqh = SecurityQueryPayload.parseBinaryQueryHeader(array);
-        assertEquals(parsedBqh.getQueryType(), QueryType.REQUEST);
-        assertEquals(parsedBqh.getQueryID(), QueryID.SEND_INTERNAL_ERROR);
+        assertEquals(parsedBqh.getQueryType(), SecurityQueryType.REQUEST);
+        assertEquals(parsedBqh.getQueryID(), SecurityQueryID.SEND_INTERNAL_ERROR);
         assertEquals(parsedBqh.getCorrelationID(), 3);
         assertEquals(parsedBqh.getJsonSize(), 0);
     }
 
     @Test
     public void testCorrectHeaderAssembly() {
         SecurityQueryPayload dummyBqh = new SecurityQueryPayload();
-        dummyBqh.setQueryType(QueryType.REQUEST);
-        dummyBqh.setQueryID(QueryID.SEND_HANDSHAKE_DATA);
+        dummyBqh.setQueryType(SecurityQueryType.REQUEST);
+        dummyBqh.setQueryID(SecurityQueryID.SEND_HANDSHAKE_DATA);
         dummyBqh.setCorrelationID(3);
         dummyBqh.setJsonSize(0);
 
         byte[] assembledHeader = dummyBqh.assembleHeaderBytes();
-        assertEquals(dummyBqh.getQueryType(), QueryType.valueOf(assembledHeader[0]));
+        assertEquals(dummyBqh.getQueryType(), SecurityQueryType.valueOf(assembledHeader[0]));
         byte[] queryIDFromHeader = new byte[3];
         System.arraycopy(assembledHeader, 1, queryIDFromHeader, 0, 3);
-        assertEquals(dummyBqh.getQueryID(), QueryID.valueOf(queryIDFromHeader));
+        assertEquals(dummyBqh.getQueryID(), SecurityQueryID.valueOf(queryIDFromHeader));
         assertEquals(dummyBqh.getCorrelationID(), BitConverter.intFromByteArray(assembledHeader, 4));
         assertEquals(dummyBqh.getJsonSize(), BitConverter.intFromByteArray(assembledHeader, 8));
     }
@@ -98,15 +98,10 @@ public void testAssemblyAndParse() {
     @Test
     public void testCorruptHeader() {
         SecurityQueryPayload bqh = createDummyBqh();
-        bqh.setJsonSize(5);
-        bqh.setJsonData(new byte[5]);
-        bqh.setJsonSize(Integer.MAX_VALUE);
-
-        assertNotEquals(bqh.getJsonData().length, bqh.getJsonSize());
 
         byte[] bqhBytes = bqh.assembleHeaderBytes();
 
-        assertNull(safeParse(bqhBytes));
+        assertNotNull(safeParse(bqhBytes));
 
         int size = bqhBytes.length;
         for (int i = 0; i < size; i++) {