Remove FrameData as it is not usedfeature/remove_framedata

3 files changed, 1 insertions, 212 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index d34bfea07..6de391c41 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.test;
 
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
-import com.smartdevicelink.protocol.enums.FrameData;
 import com.smartdevicelink.protocol.enums.FrameDataControlFrameType;
 import com.smartdevicelink.protocol.enums.FrameType;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -146,28 +145,7 @@ public class Validator{
     	
     	return true;
     }
-    
-    public static boolean validateFrameDataArray (FrameData[] array1, FrameData[] array2) {
-    	if (array1 == null) {
-    		return (array2 == null);
-    	}
-    	
-    	if (array2 == null) {
-    		return (array1 == null);
-    	}
-    	
-    	if (array1.length != array2.length) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < array1.length; i++) {
-    		if (array1[i] != array2[i]) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
+
 
     public static boolean validateImage(Image image1, Image image2){
         if(image1 == null){
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
deleted file mode 100644
index e2ad1ea3a..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.smartdevicelink.test.protocol.enums;
-
-import com.smartdevicelink.protocol.enums.FrameData;
-import com.smartdevicelink.test.Validator;
-
-import junit.framework.TestCase;
-
-import java.util.Vector;
-
-public class FrameDataTests extends TestCase {
-	
-	private Vector<FrameData> list = FrameData.getList();
-	
-	// Verifies the values are not null upon valid assignment.
-	// These are not actual enums for packeting reasons so testing is different.
-	public void testValidEnums () {
-		
-		final byte   START_SESSION_BYTE   = (byte) 0x01;
-		final String START_SESSION_STRING = "StartSession";
-		
-		final byte   START_SESSION_ACK_BYTE   = (byte) 0x02;
-		final String START_SESSION_ACK_STRING = "StartSessionACK";
-		
-		final byte   START_SESSION_NACK_BYTE   = (byte) 0x03;
-		final String START_SESSION_NACK_STRING = "StartSessionNACK";
-		
-		final byte   END_SESSION_BYTE   = (byte) 0x04;
-		final String END_SESSION_STRING = "EndSession";
-		
-		try {
-			
-			assertNotNull("FrameData list returned null", list);
-			
-			// Check the byte values
-			FrameData enumSS     = (FrameData) FrameData.get(list, START_SESSION_BYTE);
-			FrameData enumSSACK  = (FrameData) FrameData.get(list, START_SESSION_ACK_BYTE);
-			FrameData enumSSNACK = (FrameData) FrameData.get(list, START_SESSION_NACK_BYTE);
-			FrameData enumES     = (FrameData) FrameData.get(list, END_SESSION_BYTE);
-			
-			assertNotNull("Start session byte match returned null", enumSS);
-			assertNotNull("Single byte match returned null",        enumSSACK);
-			assertNotNull("First byte match returned null",         enumSSNACK);
-			assertNotNull("Consecutive byte match returned null",   enumES);
-			
-			// Check the string values
-			enumSS     = (FrameData) FrameData.get(list, START_SESSION_STRING);
-			enumSSACK  = (FrameData) FrameData.get(list, START_SESSION_ACK_STRING);
-			enumSSNACK = (FrameData) FrameData.get(list, START_SESSION_NACK_STRING);
-			enumES     = (FrameData) FrameData.get(list, END_SESSION_STRING);
-			
-			assertNotNull("Start session string match returned null", enumSS);
-			assertNotNull("Single string match returned null",        enumSSACK);
-			assertNotNull("First string match returned null",         enumSSNACK);
-			assertNotNull("Consecutive string match returned null",   enumES);
-			
-		} catch (NullPointerException exception) {
-            fail("Null enum list throws NullPointerException.");
-		}		
-	}
-	
-	// Verifies that an invalid assignment is null.
-	public void testInvalidEnum () {
-		
-		final byte   INVALID_BYTE   = (byte) 0xAB;
-		final String INVALID_STRING = "Invalid";
-		
-		try {
-			
-			// Check the byte value
-			FrameData enumInvalid = (FrameData) FrameData.get(list, INVALID_BYTE);
-			assertNull("Invalid byte match didn't return null", enumInvalid);
-			
-			// Check the string value
-			enumInvalid = (FrameData) FrameData.get(list, INVALID_STRING);
-			assertNull("Invalid string match didn't return null", enumInvalid);
-			
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	// Verifies that a null assignment is invalid.
-	public void testNullEnum () {		
-		try {
-			
-			// Check null string lookup
-			FrameData enumNull = (FrameData) FrameData.get(list, null);
-			assertNull("Null lookup returns a value", enumNull);
-			
-		} catch (NullPointerException exception) {
-            fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	// Verifies the possible enum values of FrameType.
-	public void testListEnum () {
-		// Test Vector
-		Vector<FrameData> enumTestList = new Vector<FrameData>();
-		enumTestList.add(FrameData.StartSession);
-		enumTestList.add(FrameData.StartSessionACK);
-		enumTestList.add(FrameData.StartSessionNACK);
-		enumTestList.add(FrameData.EndSession);
-		
-		assertTrue("List does not match enum test list.",
-					list.containsAll(enumTestList) &&
-					enumTestList.containsAll(list));
-		
-		// Test Array
-		FrameData[] enumValueArray = FrameData.values();
-		FrameData[] enumTestArray = { FrameData.StartSession,     FrameData.StartSessionACK, 
-									  FrameData.StartSessionNACK, FrameData.EndSession };
-		
-		assertTrue("Array does not match enum values array.",
-					Validator.validateFrameDataArray(enumValueArray, enumTestArray));
-	}
-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
deleted file mode 100644
index 745faf5f3..000000000
--- a/base/src/main/java/com/smartdevicelink/protocol/enums/FrameData.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.protocol.enums;

-

-import com.smartdevicelink.util.ByteEnumer;

-

-import java.util.Vector;

-

-public class FrameData extends ByteEnumer {

-

-	private static Vector<FrameData> theList = new Vector<FrameData>();

-	public static Vector<FrameData> getList() { return theList; } 

-	

-	byte i = 0x00;

-	

-	protected FrameData(byte value, String name) {

-		super(value, name);

-	}

-	

-	public final static FrameData StartSession = new FrameData((byte)0x01, "StartSession");

-	public final static FrameData StartSessionACK = new FrameData((byte)0x02, "StartSessionACK");

-	public final static FrameData StartSessionNACK = new FrameData((byte)0x03, "StartSessionNACK");

-	public final static FrameData EndSession = new FrameData((byte)0x04, "EndSession");

-	

-	public final static FrameData SingleFrame = new FrameData((byte)0x00, "SingleFrame");

-	public final static FrameData FirstFrame = new FrameData((byte)0x00, "FirstFrame");

-	public final static FrameData ConsecutiveFrame = new FrameData((byte)0x00, "ConsecutiveFrame");

-	public final static byte LastFrame = (byte)0x00;

-	

-	static {

-		theList.addElement(StartSession);

-		theList.addElement(StartSessionACK);

-		theList.addElement(StartSessionNACK);

-		theList.addElement(EndSession);	

-	}

-	

-	public static FrameData valueOf(String passedButton) {

-		return (FrameData) get(theList, passedButton);

-	}

-	

-	public static FrameData[] values() {

-		return theList.toArray(new FrameData[theList.size()]);

-	}

-}