create sym links for proxy files, fix isdl, and fix tests

14 files changed, 33 insertions, 8 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index 91fbf6dde..a7b49489e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -3,6 +3,7 @@ package com.smartdevicelink.test.proxy;
 import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
+import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.SystemCapabilityManager;
 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
@@ -173,7 +174,7 @@ public class SystemCapabilityManagerTests extends AndroidTestCase2 {
 		public void sendRPCRequest(RPCRequest message) {}
 
 		@Override
-		public void sendRPC(RPCRequest message) {}
+		public void sendRPC(RPCMessage message) {}
 
 		@Override
 		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
index 7e3b894e5..58319ad10 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
@@ -11,13 +11,13 @@ import junit.framework.TestCase;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.transport.TransportType}
+ * {@link com.smartdevicelink.transport.enums.TransportType}
  */
 public class TransportTypeTests extends TestCase {
 	
 	/**
 	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.transport.TransportType}
+	 * {@link com.smartdevicelink.transport.enums.TransportType}
 	 */
 	public void testTransportTypeEnum () {
 		
@@ -27,6 +27,7 @@ public class TransportTypeTests extends TestCase {
 		String testInvalid   	= "INVALID";
 		String testBluetooth 	= "BLUETOOTH";
 		String testMultiplexing = "MULTIPLEX";
+		String testWebSocketServer = "WEB_SOCKET_SERVER";
 		
 		try {
 			// Comparison Values
@@ -34,12 +35,14 @@ public class TransportTypeTests extends TestCase {
 			TransportType expectedUsbEnum        	= TransportType.USB;
 			TransportType expectedBluetoothEnum  	= TransportType.BLUETOOTH;
 			TransportType expectedMultiplexingEnum  = TransportType.MULTIPLEX;
+			TransportType expectedWebSocketServerEnum  = TransportType.WEB_SOCKET_SERVER;
 			
 			List<TransportType> expectedEnumList = new ArrayList<TransportType>();
 			expectedEnumList.add(TransportType.BLUETOOTH);
 			expectedEnumList.add(TransportType.TCP);
 			expectedEnumList.add(TransportType.USB);
 			expectedEnumList.add(TransportType.MULTIPLEX);
+			expectedEnumList.add(TransportType.WEB_SOCKET_SERVER);
 			
 			TransportType actualNullEnum       		= TransportType.valueForString(null);
 			TransportType actualTcpEnum        		= TransportType.valueForString(testTcp);
@@ -47,6 +50,7 @@ public class TransportTypeTests extends TestCase {
 			TransportType actualInvalidEnum    		= TransportType.valueForString(testInvalid);
 			TransportType actualBluetoothEnum  		= TransportType.valueForString(testBluetooth);
 			TransportType actualMultiplexingEnum 	= TransportType.valueForString(testMultiplexing);
+			TransportType actualWebSocketServerEnum 	= TransportType.valueForString(testWebSocketServer);
 
 			List<TransportType> actualEnumList = Arrays.asList(TransportType.values());
 			
@@ -55,6 +59,7 @@ public class TransportTypeTests extends TestCase {
 			assertEquals(Test.MATCH, expectedUsbEnum, actualUsbEnum);
 			assertEquals(Test.MATCH, expectedBluetoothEnum, actualBluetoothEnum);
 			assertEquals(Test.MATCH, expectedMultiplexingEnum, actualMultiplexingEnum);
+			assertEquals(Test.MATCH, expectedWebSocketServerEnum, actualWebSocketServerEnum);
 			assertTrue(Test.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
 			
 			// Invalid/Null Tests
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
index c96a3d237..4aa848782 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -688,7 +688,7 @@ public class SdlManager extends BaseSdlManager{
 		}
 
 		@Override
-		public void sendRPC(RPCRequest message) {
+		public void sendRPC(RPCMessage message) {
 			try {
 				proxy.sendRPC(message);
 			} catch (SdlException e) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 96e503ab6..50e0369f8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -335,9 +335,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 

 		@Override

-		public void sendRPC(RPCRequest message) {

+		public void sendRPC(RPCMessage message) {

 			try {

-				SdlProxyBase.this.sendRPCRequest(message);

+				SdlProxyBase.this.sendRPC(message);

 			} catch (SdlException e) {

 				e.printStackTrace();

 			}

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index fc348faf5..fc348faf5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 9b55d4f17..d97d64735 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
+import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.util.Version;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
@@ -135,9 +136,9 @@ public interface ISdl {
 
     /**
      * Pass an RPC message through the proxy to be sent to the connected module
-     * @param message RPCRequest that should be sent to the module
+     * @param message RPCMessage that should be sent to the module
      */
-    void sendRPC(RPCRequest message);
+    void sendRPC(RPCMessage message);
 
     /**
      * Pass a list of RPC requests through the proxy to be sent to core
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
new file mode 120000
index 000000000..97e44408d
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
@@ -0,0 +1 @@
+../../../../../../../base/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
\ No newline at end of file
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCRequest.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
new file mode 120000
index 000000000..c1e2f4a27
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
@@ -0,0 +1 @@
+../../../../../../../base/src/main/java/com/smartdevicelink/proxy/RPCRequest.java
\ No newline at end of file
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
new file mode 120000
index 000000000..683ec16a9
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
@@ -0,0 +1 @@
+../../../../../../../base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
\ No newline at end of file
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
new file mode 120000
index 000000000..3d03c008f
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
@@ -0,0 +1 @@
+../../../../../../../base/src/main/java/com/smartdevicelink/proxy/SystemCapabilityManager.java
\ No newline at end of file
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
new file mode 120000
index 000000000..32895d7fe
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
@@ -0,0 +1 @@
+../../../../../../../../base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
\ No newline at end of file
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
new file mode 120000
index 000000000..9b79b4afc
--- /dev/null
+++ b/baseAndroid/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -0,0 +1 @@
+../../../../../../../../base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
\ No newline at end of file
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 8d3791b94..86ca6ba61 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -826,6 +826,13 @@ public class SdlManager extends BaseSdlManager{
 		}
 
 		@Override
+		public void sendRPC(RPCMessage message) {
+			if(message != null){
+				proxy.sendRpc(message);
+			}
+		}
+
+		@Override
 		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
 			proxy.sendRpcs(rpcs, listener);
 		}
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 81933e588..f9287b766 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -726,6 +726,11 @@ public class LifecycleManager extends BaseLifecycleManager {
         }
 
         @Override
+        public void sendRPC(RPCMessage message) {
+            LifecycleManager.this.sendRPCMessagePrivate(message);
+        }
+
+        @Override
         public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
             //FIXME
         }