Skip to content

Commit 9f06a66

Browse files
committed
tests update
1 parent a3caefa commit 9f06a66

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/main/java/org/scm4j/commons/URLContentLoader.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ public List<String> getContentsFromUrls(String... separatedUrls) throws IOExcept
3030
}
3131
String[] urls = separatedUrl.split(URL_SEPARATOR);
3232
for (String url : urls) {
33-
res.add(getContentFromUrl(url));
33+
String content = getContentFromUrl(url);
34+
if (content != null) {
35+
res.add(content);
36+
}
3437
}
3538
}
3639
return res;
@@ -50,6 +53,9 @@ public String getContentFromUrl(URL url) throws IOException {
5053
}
5154

5255
public String getContentFromUrl(String url) throws IOException {
56+
if (url.isEmpty()) {
57+
return null;
58+
}
5359
return getContentFromUrl(new URL(getWithDefaultProtocol(url)));
5460
}
5561
}

src/test/java/org/scm4j/commons/URLContentLoaderTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ public void testGetContentFromUrls() throws Exception {
2626
String content1 = FileUtils.readFileToString(new File(url1.toURI()), StandardCharsets.UTF_8);
2727
String content2 = FileUtils.readFileToString(new File(url2.toURI()), StandardCharsets.UTF_8);
2828
String content3 = FileUtils.readFileToString(new File(url3.toURI()), StandardCharsets.UTF_8);
29-
List<String> contents = loader.getContentsFromUrls(url1.toString(), url2.toString() +";" + url3.toString());
29+
List<String> contents = loader.getContentsFromUrls(url1.toString(), url2.toString() + URLContentLoader.URL_SEPARATOR + url3.toString());
3030
assertEquals(String.join("", content1, content2, content3), String.join("", contents));
3131

3232
contents = loader.getContentsFromUrls(Arrays.asList(url1, url2));
3333
assertEquals(String.join("", content1, content2), String.join("", contents));
34+
35+
contents = loader.getContentsFromUrls("", URLContentLoader.URL_SEPARATOR + url1.toString());
36+
assertEquals(content1, String.join("", contents));
3437
}
3538

3639
@Test

0 commit comments

Comments
 (0)