Revert "#463 Fix failing unit tests, get inputStream locally"

This reverts commit 75edaa32903e048c265d1c3aa2bf14b98cca0244.

3 files changed, 22 insertions, 8 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 e05091c44..031281ea6 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,7 +1,6 @@
 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;
@@ -44,14 +43,22 @@ public class AbstractPacketizerTests extends TestCase {
 		MockPacketizer  testPacketizer2  = null;
 		MockPacketizer  testPacketizer3  = null;
 		IStreamListener testListener     = new MockStreamListener();
+		
 		try {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
+			
+			URL url = new URL("https://github.com/smartdevicelink/sdl_android");
+		    URLConnection urlConnection = url.openConnection();
+			testInputStream = new BufferedInputStream(urlConnection.getInputStream());
+			
 			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 218e904b3..659e1bea3 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,7 +1,6 @@
 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;
@@ -37,9 +36,14 @@ 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 {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
+		
+		try {			
+			URL url = new URL("https://github.com/smartdevicelink/sdl_android");
+		    URLConnection urlConnection = url.openConnection();
+			testInputStream = new BufferedInputStream(urlConnection.getInputStream());
+			
 			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 cac3b1616..f79b832d9 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,7 +1,6 @@
 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;
@@ -42,8 +41,12 @@ public class StreamRPCPacketizerTests extends TestCase {
 		MockInterfaceBroker _interfaceBroker = new MockInterfaceBroker();
 		BaseTransportConfig _transportConfig = new BTTransportConfig(true);
 		SdlSession testSdlSession = SdlSession.createSession(testWiproVersion,_interfaceBroker, _transportConfig);
-		try {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
+
+		try {			
+			URL url = new URL("https://github.com/smartdevicelink/sdl_android");
+		    URLConnection urlConnection = url.openConnection();
+			testInputStream = new BufferedInputStream(urlConnection.getInputStream());
+			
 			StreamRPCPacketizer testStreamRpcPacketizer = new StreamRPCPacketizer(null, testListener, testInputStream, testRequest, testSessionType, testSessionId, testWV, testWV, testSdlSession);
 			assertNotNull(Test.NOT_NULL, testStreamRpcPacketizer);