summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBretty White <geekman3454@protonmail.com>2018-05-21 16:13:06 -0400
committerBretty White <geekman3454@protonmail.com>2018-05-21 16:13:06 -0400
commitc624c7500b8c401429525c5fdbc9391cac507e91 (patch)
tree3a130b73128bc7bd9529af1c8846d8b5e6816ec2
parent9346444c5a26dbba9c7bbbdc8792d2c658e64ad4 (diff)
downloadsdl_android-c624c7500b8c401429525c5fdbc9391cac507e91.tar.gz
fix sdl file tests
-rw-r--r--sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlFileTests.java6
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlFile.java3
2 files changed, 5 insertions, 4 deletions
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlFileTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlFileTests.java
index 2f09fa9f0..77038446a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlFileTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlFileTests.java
@@ -21,7 +21,7 @@ public class SdlFileTests extends TestCase {
msg.setSdlFileName(Test.GENERAL_STRING);
msg.setFileData(Test.GENERAL_BYTE_ARRAY);
- msg.setFilePath(Test.GENERAL_URI);
+ msg.setFilePath(Test.GENERAL_INT);
msg.setFileType(Test.GENERAL_FILETYPE);
msg.setPersistentFile(Test.GENERAL_BOOLEAN);
}
@@ -33,14 +33,14 @@ public class SdlFileTests extends TestCase {
// Test Values
String fileName = msg.getSdlFileName();
byte[] data = msg.getFileData();
- URI uri = msg.getFilePath();
+ int uri = msg.getFilePath();
FileType fileType = msg.getFileType();
Boolean persistent = msg.getPersistentFile();
// Valid Tests
assertEquals(Test.MATCH, Test.GENERAL_STRING, fileName);
assertEquals(Test.MATCH, Test.GENERAL_BYTE_ARRAY, data);
- assertEquals(Test.MATCH, Test.GENERAL_URI, uri);
+ assertEquals(Test.MATCH, Test.GENERAL_INT, uri);
assertEquals(Test.MATCH, Test.GENERAL_FILETYPE, fileType);
// Test.GENERAL_BOOLEAN == true
assertTrue(persistent);
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlFile.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlFile.java
index 328dd07ab..3e6937c7f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlFile.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SdlFile.java
@@ -3,6 +3,7 @@ package com.smartdevicelink.proxy.rpc;
import android.support.annotation.NonNull;
import com.smartdevicelink.api.FileManager;
+import com.smartdevicelink.api.SdlManager;
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.proxy.rpc.enums.FileType;
@@ -21,7 +22,7 @@ public class SdlFile extends RPCStruct {
/**
* Set the file name for the file to be uploaded. This parameter is required <br>
* <strong>If a file being uploaded has the same name as an already uploaded file, the new file will overwrite the previous file.</strong>
- * Easily check for uploaded files with {@link FileManager#getRemoteFileNames()}
+ * Easily check for uploaded files with SdlManager.getFileManager().getRemoteFileNames()
* @param fileName - the name of the file
*/
public void setSdlFileName(@NonNull String fileName) {