Update unit testsfeature/sdl_file_input_stream

3 files changed, 39 insertions, 0 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index 8908346d2..bc368c522 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -2,6 +2,7 @@ package com.smartdevicelink.managers.file;
 
 import android.content.Context;
 import android.net.Uri;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.managers.BaseSubManager;
@@ -23,12 +24,15 @@ import com.smartdevicelink.proxy.rpc.enums.StaticIconName;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
 import com.smartdevicelink.test.TestValues;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -1003,4 +1007,13 @@ public class FileManagerTests {
 		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
 		assertTrue(artwork1.equals(artwork2));
 	}
+
+	@Test
+	public void testContentsOfInputStream() {
+		FileManager fileManager = new FileManager(null, mTestContext, null);
+		byte[] data1 = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+		InputStream inputStream = new ByteArrayInputStream(data1);
+		byte[] data2 = fileManager.contentsOfInputStream(inputStream, 0, data1.length);
+		Assert.assertArrayEquals(data1, data2);
+	}
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java
index 99d34fdff..adc8f6812 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlFileTests.java
@@ -90,6 +90,18 @@ public class SdlFileTests {
         sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN);
         assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN);
         assertFalse(sdlFile.getOverwrite());
+
+        // Case 4 (Setting InputStream)
+        sdlFile = new SdlFile();
+        sdlFile.setInputStream(TestValues.GENERAL_INPUT_STREAM);
+        assertEquals(sdlFile.getInputStream(), TestValues.GENERAL_INPUT_STREAM);
+        sdlFile.setName(TestValues.GENERAL_STRING);
+        assertEquals(sdlFile.getName(), TestValues.GENERAL_STRING);
+        sdlFile.setType(TestValues.GENERAL_FILETYPE);
+        assertEquals(sdlFile.getType(), TestValues.GENERAL_FILETYPE);
+        sdlFile.setPersistent(TestValues.GENERAL_BOOLEAN);
+        assertEquals(sdlFile.isPersistent(), TestValues.GENERAL_BOOLEAN);
+        assertFalse(sdlFile.getOverwrite());
     }
 
     @Test
@@ -154,4 +166,15 @@ public class SdlFileTests {
         assertEquals(sdlFile2.isPersistent(), TestValues.GENERAL_BOOLEAN);
         assertFalse(sdlFile2.getOverwrite());
     }
+
+    @Test
+    public void testConstructorWithInputStream() {
+        // Case1 (Set the name manually)
+        SdlFile sdlFile1 = new SdlFile(TestValues.GENERAL_STRING, TestValues.GENERAL_FILETYPE, TestValues.GENERAL_INPUT_STREAM,0, TestValues.GENERAL_BYTE_ARRAY.length, TestValues.GENERAL_BOOLEAN);
+        assertEquals(sdlFile1.getName(), TestValues.GENERAL_STRING);
+        assertEquals(sdlFile1.getType(), TestValues.GENERAL_FILETYPE);
+        assertEquals(sdlFile1.getInputStream(), TestValues.GENERAL_INPUT_STREAM);
+        assertEquals(sdlFile1.isPersistent(), TestValues.GENERAL_BOOLEAN);
+        assertFalse(sdlFile1.getOverwrite());
+    }
 }
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 05d0327a7..097e9e452 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
@@ -215,6 +215,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -252,6 +254,7 @@ public class TestValues {
 	public static final Double                         GENERAL_DOUBLE                         = 10.01;
 	public static final boolean                        GENERAL_BOOLEAN                        = true;
 	public static final byte[]                         GENERAL_BYTE_ARRAY                     = new byte[0];
+	public static final InputStream                    GENERAL_INPUT_STREAM                   = new ByteArrayInputStream(new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
 	public static final TPMS                           GENERAL_TPMS                           = TPMS.UNKNOWN;
 	public static final TBTState                       GENERAL_TBTSTATE                       = TBTState.NEXT_TURN_REQUEST;
 	public static final FileType                       GENERAL_FILETYPE                       = FileType.BINARY;