Handling a missed corner case

aalhossary · aalhossary · commit d62c7e653f7b · 2021-11-08T06:05:02.000+08:00
HAndling the case when the path is '~' only.
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -200,7 +200,7 @@ public static String toUnixPath(String path) {
 	public static String expandUserHome(String file) {
 		// replace any / with the proper separator (/ or \ for Linux and Windows respectively).
 		file = file.replaceAll("/", "\\"+File.separator); //The "\\" is to escape the separator if needed.
-		if (file.startsWith("~" + File.separator)) {
+		if (file.startsWith("~") && (file.length() == 1 || File.separator.equals(file.substring(1, 2)))) {
 			file = System.getProperty("user.home") + file.substring(1);
 		}
 		return file;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -131,6 +131,11 @@ void unixPathReturnedUnchanged(){
     class ExpandUserHome {
         String currUserHome = System.getProperty("user.home");
         @Test
+        void minimalPath (){
+        	String path="~";
+        	assertEquals(currUserHome, FileDownloadUtils.expandUserHome(path));
+        }
+        @Test
         void simplePath (){
             String path="~/sequence.gb";
             assertEquals(currUserHome+File.separator+"sequence.gb", FileDownloadUtils.expandUserHome(path));

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public static String toUnixPath(String path) {`
`200`	`200`	`public static String expandUserHome(String file) {`
`201`	`201`	`// replace any / with the proper separator (/ or \ for Linux and Windows respectively).`
`202`	`202`	`file = file.replaceAll("/", "\\"+File.separator); //The "\\" is to escape the separator if needed.`
`203`		`- if (file.startsWith("~" + File.separator)) {`
	`203`	`+ if (file.startsWith("~") && (file.length() == 1 \|\| File.separator.equals(file.substring(1, 2)))) {`
`204`	`204`	`file = System.getProperty("user.home") + file.substring(1);`
`205`	`205`	`}`
`206`	`206`	`return file;`