summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Grover <joeygrover@gmail.com>2017-06-01 13:26:36 -0400
committerGitHub <noreply@github.com>2017-06-01 13:26:36 -0400
commitb6c2062ba9699f0f407f5598583c1e39cedd80db (patch)
tree94fdc9082c203f9b88f560f1d8b322b24d2a0c10
parent4478585f75668831bb31bba4b7c78d0080c6b476 (diff)
parent662a975ce0fdad09455ebd7e2586eea9049f1155 (diff)
downloadsdl_android-b6c2062ba9699f0f407f5598583c1e39cedd80db.tar.gz
Merge pull request #530 from smartdevicelink/bugfix/issue_529
Bugfix/issue_529
-rw-r--r--sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java11
-rw-r--r--sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java10
-rw-r--r--sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java9
3 files changed, 8 insertions, 22 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
index 031281ea6..e05091c44 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
@@ -1,6 +1,7 @@
package com.smartdevicelink.test.streaming;
import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -43,22 +44,14 @@ public class AbstractPacketizerTests extends TestCase {
MockPacketizer testPacketizer2 = null;
MockPacketizer testPacketizer3 = null;
IStreamListener testListener = new MockStreamListener();
-
try {
-
- URL url = new URL("https://github.com/smartdevicelink/sdl_android");
- URLConnection urlConnection = url.openConnection();
- testInputStream = new BufferedInputStream(urlConnection.getInputStream());
-
+ testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
MockInterfaceBroker _interfaceBroker = new MockInterfaceBroker();
BaseTransportConfig _transportConfig = new BTTransportConfig(true);
-
testSdlSession = SdlSession.createSession(testWiproVersion,_interfaceBroker, _transportConfig);
-
testPacketizer1 = new MockPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
testPacketizer2 = new MockPacketizer(null, null, null, testSessionId, testSdlSession);
testPacketizer3 = new MockPacketizer(testListener, testInputStream, testRpcRequest, testSessionType, testSessionId, testWiproVersion, testSdlSession);
-
try {
new MockPacketizer(null, null, null, null, testSessionId, testWiproVersion, null);
fail("Exception should be thrown");
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
index 659e1bea3..218e904b3 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
@@ -1,6 +1,7 @@
package com.smartdevicelink.test.streaming;
import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -36,14 +37,9 @@ public class StreamPacketizerTests extends TestCase {
IStreamListener testListener = new MockStreamListener();
MockInterfaceBroker _interfaceBroker = new MockInterfaceBroker();
BaseTransportConfig _transportConfig = new BTTransportConfig(true);
-
SdlSession testSdlSession = SdlSession.createSession(testWiproVersion,_interfaceBroker, _transportConfig);
-
- try {
- URL url = new URL("https://github.com/smartdevicelink/sdl_android");
- URLConnection urlConnection = url.openConnection();
- testInputStream = new BufferedInputStream(urlConnection.getInputStream());
-
+ try {
+ testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
StreamPacketizer testStreamPacketizer = new StreamPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
assertNotNull(Test.NOT_NULL, testStreamPacketizer);
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
index f79b832d9..cac3b1616 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
@@ -1,6 +1,7 @@
package com.smartdevicelink.test.streaming;
import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -41,12 +42,8 @@ public class StreamRPCPacketizerTests extends TestCase {
MockInterfaceBroker _interfaceBroker = new MockInterfaceBroker();
BaseTransportConfig _transportConfig = new BTTransportConfig(true);
SdlSession testSdlSession = SdlSession.createSession(testWiproVersion,_interfaceBroker, _transportConfig);
-
- try {
- URL url = new URL("https://github.com/smartdevicelink/sdl_android");
- URLConnection urlConnection = url.openConnection();
- testInputStream = new BufferedInputStream(urlConnection.getInputStream());
-
+ try {
+ testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
StreamRPCPacketizer testStreamRpcPacketizer = new StreamRPCPacketizer(null, testListener, testInputStream, testRequest, testSessionType, testSessionId, testWV, testWV, testSdlSession);
assertNotNull(Test.NOT_NULL, testStreamRpcPacketizer);