Fix unit testsfeature/rpc_versioning

2 files changed, 9 insertions, 1 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
index e506268ea..6f38fdfa0 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
@@ -12,6 +12,7 @@ import com.smartdevicelink.proxy.rpc.enums.SystemContext;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingState;
 import com.smartdevicelink.test.BaseRpcTests;
 import com.smartdevicelink.test.Test;
+import com.smartdevicelink.util.Version;
 
 /**
  * This is a unit test class for the SmartDeviceLink library project class : 
@@ -80,6 +81,9 @@ public class OnHMIStatusTests extends BaseRpcTests{
         testNullBase(msg);
 
         assertNull(Test.NULL, msg.getAudioStreamingState());
+
+        assertNull(Test.NULL, msg.getVideoStreamingState());
+        msg.format(new Version(4,5,0),true);
         assertEquals(Test.MATCH, VideoStreamingState.STREAMABLE, msg.getVideoStreamingState());
         assertNull(Test.NULL, msg.getHmiLevel());
         assertNull(Test.NULL, msg.getSystemContext());
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
index d32a204a6..2c6618f62 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
@@ -5,6 +5,7 @@ import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
+import com.smartdevicelink.util.Version;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,6 +16,7 @@ import java.io.InputStream;
  */
 public class MockPacketizer extends AbstractPacketizer {
 	public MockPacketizer (IStreamListener l, InputStream i, SessionType s, byte sid, SdlSession sdlsession) throws IOException { super (l, i, s, sid, sdlsession); }
+	public MockPacketizer (IStreamListener l, InputStream i, RPCRequest r, SessionType s, byte sid, Version protocolVersion,SdlSession sdlsession) throws IOException { super (l, i, r, s, sid, protocolVersion, sdlsession); }
 	public MockPacketizer (IStreamListener l, InputStream i, RPCRequest r, SessionType s, byte sid, byte w, SdlSession sdlsession) throws IOException { super (l, i, r, s, sid, w, sdlsession); }
 
 	@Override public void start() throws IOException { }
@@ -26,7 +28,9 @@ public class MockPacketizer extends AbstractPacketizer {
 	public SdlSession getSdlSession    () { return _session;    	}
 	public byte getSessionId           () { return _rpcSessionID;   }
 	public RPCRequest getRPCRequest    () { return _request;        }
-	public byte getWiproVersion        () { return _wiproVersion;   }
+	@Deprecated
+	public byte getWiproVersion        () { if(_wiproVersion != null){return (byte)_wiproVersion.getMajor(); }else{return 5;}}
+	public Version getProtocolVersion  () { return _wiproVersion;   }
 
 	@Override public void pause() { }
 	@Override public void resume() { }