Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into feature/refactor_samples

9 files changed, 6 insertions, 262 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
index 2b721db7c..16c1c9613 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
@@ -16,7 +16,6 @@ import com.smartdevicelink.managers.screen.menu.VoiceCommand;
 import com.smartdevicelink.managers.screen.menu.VoiceCommandSelectionListener;
 import com.smartdevicelink.protocol.SdlProtocol;
 import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.AppInfo;
 import com.smartdevicelink.proxy.rpc.AppServiceCapability;
 import com.smartdevicelink.proxy.rpc.AppServiceData;
@@ -494,7 +493,7 @@ public class TestValues {
 	public static final List<ClimateControlCapabilities> GENERAL_CLIMATECONTROLCAPABILITIES_LIST = new ArrayList<ClimateControlCapabilities>(1);
 	public static final List<RadioControlCapabilities>   GENERAL_RADIOCONTROLCAPABILITIES_LIST   = new ArrayList<RadioControlCapabilities>(1);
 	public static final Vector<String>                   GENERAL_VECTOR_STRING                   = new Vector<>(Arrays.asList(new String[] { "a", "b"}));
-	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle")));
+	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT)));
 	public static final List<SeatControlCapabilities>   GENERAL_SEATCONTROLCAPABILITIES_LIST   = new ArrayList<SeatControlCapabilities>(1);
 	public static final List<EqualizerSettings>         GENERAL_EQUALIZERSETTINGS_LIST         = new ArrayList<EqualizerSettings>(1);
 	public static final List<LightCapabilities>         GENERAL_LIGHTCAPABILITIES_LIST         = new ArrayList<LightCapabilities>(1);
@@ -794,8 +793,8 @@ public class TestValues {
 		GENERAL_VRHELPITEM.setPosition(100);
     	GENERAL_VRHELPITEM_LIST.add(GENERAL_VRHELPITEM);
 
-    	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle"));
-    	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Say a command"));
+    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT));
+    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Say a command", SpeechCapabilities.TEXT));
 
     	GENERAL_KEYBOARDPROPERTIES.setAutoCompleteText(GENERAL_STRING);
     	GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
deleted file mode 100644
index ec64ed99d..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.smartdevicelink.test.proxy;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.InternalProxyMessage}
- */
-public class InternalProxyMessageTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.InternalProxyMessage#InternalProxyMessage(String)}
-	 */
-	public void testValues () {
-		// Valid Tests
-		String test = "functionName";
-		InternalProxyMessage testIPM = new InternalProxyMessage(test);
-		assertEquals(TestValues.MATCH, test, testIPM.getFunctionName());
-		
-		test = "OnProxyError";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyError);
-		test = "OnProxyOpened";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyOpened);
-		test = "OnProxyClosed";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyClosed);
-		
-		// Invalid/Null Tests
-		testIPM = new InternalProxyMessage(null);
-		assertNull(TestValues.NULL, testIPM.getFunctionName());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
deleted file mode 100644
index ad1976cb1..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.smartdevicelink.test.proxy;
-
-import com.smartdevicelink.proxy.TTSChunkFactory;
-import com.smartdevicelink.proxy.rpc.TTSChunk;
-import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import java.util.Vector;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.TTSChunkFactory}
- */
-public class TTSChunkFactoryTests extends TestCase {
-	
-	private TTSChunk testChunk;
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createChunk(SpeechCapabilities, String)}
-	 */
-	public void testCreateChunk () {
-		// Valid Tests
-		SpeechCapabilities testType = SpeechCapabilities.TEXT;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.SILENCE;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-				
-		testType = SpeechCapabilities.SAPI_PHONEMES;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.PRE_RECORDED;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.LHPLUS_PHONEMES;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		// Invalid/Null Tests
-		testChunk = TTSChunkFactory.createChunk(null, null);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertNull(TestValues.NULL, testChunk.getType());
-		assertNull(TestValues.NULL, testChunk.getText());
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createSimpleTTSChunks(String)}
-	 */
-	public void testCreateSimpleTTSChunks () {
-		// Test Values
-		Vector<TTSChunk> testChunks;
-		testChunks = TTSChunkFactory.createSimpleTTSChunks(TestValues.GENERAL_STRING);
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testChunks);
-		assertEquals(TestValues.MATCH, SpeechCapabilities.TEXT, testChunks.get(0).getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunks.get(0).getText());
-		
-		// Invalid/Null Tests
-		testChunks = TTSChunkFactory.createSimpleTTSChunks(null);
-		assertNull(TestValues.NULL, testChunks);
-	}
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createPrerecordedTTSChunks(String)}
-	 */
-	public void testCreatePrerecordedTTSChunks () {
-		// Test Values
-		Vector<TTSChunk> testChunks;
-		testChunks = TTSChunkFactory.createPrerecordedTTSChunks(TestValues.GENERAL_STRING);
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testChunks);
-		assertEquals(TestValues.MATCH, SpeechCapabilities.PRE_RECORDED, testChunks.get(0).getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunks.get(0).getText());
-		
-		// Invalid/Null Tests
-		testChunks = TTSChunkFactory.createPrerecordedTTSChunks(null);
-		assertNull(TestValues.NULL, testChunks);
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
deleted file mode 100644
index f0c542894..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnError;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnError}
- */
-public class OnErrorTests extends TestCase {
-		
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError(String, Exception)}
-	 */
-	@Test
-	public void testValues () {		
-		// Valid Tests
-		OnError testOnError = new OnError();
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		
-		Exception testE = new Exception();
-		testOnError = new OnError(TestValues.GENERAL_STRING, testE);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testOnError.getInfo());
-		assertEquals(TestValues.MATCH, testE, testOnError.getException());
-		
-		// Invalid/Null Tests
-		testOnError = new OnError(null, null);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		assertNull(TestValues.NULL, testOnError.getInfo());
-		assertNull(TestValues.NULL, testOnError.getException());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
deleted file mode 100644
index 1ef639029..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnProxyClosed;
-import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed}
- */
-public class OnProxyClosedTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed#OnProxyClosed()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed#OnProxyClosed(String, Exception, SdlDisconnectedReason)}
-	 */
-	@Test
-	public void testValues () {
-		// Valid Tests
-		OnProxyClosed testOnProxyClosed = new OnProxyClosed();
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		
-		Exception testE = new Exception();
-		SdlDisconnectedReason testReason = SdlDisconnectedReason.DEFAULT;
-		testOnProxyClosed = new OnProxyClosed(TestValues.GENERAL_STRING, testE, testReason);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testOnProxyClosed.getInfo());
-		assertEquals(TestValues.MATCH, testE, testOnProxyClosed.getException());
-		assertEquals(TestValues.MATCH, testReason, testOnProxyClosed.getReason());
-		
-		// Invalid/Null Tests
-		testOnProxyClosed = new OnProxyClosed(null, null, null);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		assertNull(TestValues.NULL, testOnProxyClosed.getInfo());
-		assertNull(TestValues.NULL, testOnProxyClosed.getException());
-		assertNull(TestValues.NULL, testOnProxyClosed.getReason());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
deleted file mode 100644
index 3f76fd4cb..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnProxyOpened;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened}
- */
-public class OnProxyOpenedTests extends TestCase {
-	
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened#OnProxyOpened()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened#getFunctionName()}
-	 */
-	@Test
-	public void testMethods () {		
-		OnProxyOpened testOnProxyOpened = new OnProxyOpened();
-		assertNotNull(TestValues.NOT_NULL, testOnProxyOpened);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyOpened, testOnProxyOpened.getFunctionName());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
index d5f6629bd..8fcde0456 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
@@ -15,7 +15,6 @@ public class BaseTransportConfigTests extends TestCase {
 	/**
 	 * This is a unit test for the following methods : 
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getTransportType()}
-	 * {@link com.smartdevicelink.transport.BaseTransportConfig#shareConnection()}
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getHeartBeatTimeout()}
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#setHeartBeatTimeout(int)}
 	 */
@@ -27,14 +26,12 @@ public class BaseTransportConfigTests extends TestCase {
 		
 		// Comparison Values
 		int     expectedMaxValue      = Integer.MAX_VALUE;
-		boolean actualShareConnection = testBaseTransportConfig.shareConnection();
 		int     actualMaxValue        = testBaseTransportConfig.getHeartBeatTimeout();
 		
 		// Valid Tests
 		assertNotNull(TestValues.NOT_NULL, testBaseTransportConfig);
 		assertEquals(TestValues.MATCH, expectedMaxValue, actualMaxValue);
-		assertTrue(TestValues.TRUE, actualShareConnection);
-		
+
 		testBaseTransportConfig.setHeartBeatTimeout(testInt);
 		assertEquals(TestValues.MATCH, testInt, testBaseTransportConfig.getHeartBeatTimeout());
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
index cdf83079c..51916ea16 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
@@ -47,11 +47,7 @@ public class MultiplexBluetoothTransportTest extends TestCase {
 
 		};
 
-		//TODO test for more than the two states
-		bluetooth = MultiplexBluetoothTransport.getBluetoothSerialServerInstance();
-		assertNull(bluetooth);
-
-		bluetooth = MultiplexBluetoothTransport.getBluetoothSerialServerInstance(stateChangeHandler);
+		bluetooth = new MultiplexBluetoothTransport(stateChangeHandler);
 		assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
 
 		bluetooth.start();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index 91aea6432..557e0592d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
@@ -371,7 +371,7 @@ public class RSVTestCase {
 			}
 		};
 		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(),true, cb));
+		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(),true, cb, null));
 		//Now wait for call to finish
 		synchronized(REQUEST_LOCK){
 			try {