Skip to content

Added resourceToString, resourceToByteArray, and resourceToURL methods to IOUtils #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
behrangsa wants to merge 10 commits into from
Closed

Added resourceToString, resourceToByteArray, and resourceToURL methods to IOUtils #17

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba44c80
Added IOUtils#resourceToString
Aug 20, 2016
6208a8c
Added resourceToByteArray and resourceToURL methods
Aug 21, 2016
c5af446
Added assertions to verify that the size of content read via resource…
Aug 22, 2016
05a6adb
Added extra assertions for resourceToURL tests
Aug 22, 2016
0a3f907
Removed redundant (expected = Test.None.class) clauses
Aug 22, 2016
ec910ea
Added NPE tests for resourceToXXX convenience methods
Aug 29, 2016
62535cc
Undid expansion of asterisk imports.
Aug 29, 2016
3b71609
Removed unused import statement.
Aug 29, 2016
c188aa9
Using a platform-independent charset in resourceToXXX tests
Aug 30, 2016
1d33b62
Added variants using ClassLoader
Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added assertions to verify that the size of content read via resource… 
…ToXXX methods is correct
  • Loading branch information
Behrang Saeedzadeh committed Aug 22, 2016
commit c5af446ddc77b81801e451bd4e2c28cd685670ad
20 changes: 16 additions & 4 deletions src/test/java/org/apache/commons/io/IOUtilsTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,23 +1188,35 @@ private void testToString_URL(final String encoding) throws Exception {
}

@Test(expected = Test.None.class) public void testResourceToString_ExistingResourceAtRootPackage() throws Exception {
IOUtils.resourceToString("/test-file-utf8.bin", Charset.defaultCharset());
final long fileSize = new File(getClass().getResource("/test-file-utf8.bin").getFile()).length();
final String content = IOUtils.resourceToString("/test-file-utf8.bin", Charset.defaultCharset());

@ansell ansell Aug 29, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Charset.defaultCharset here and in other tests seems wrong as it is locale/environment dependent. StandardCharsets.UTF_8 may be more appropriate.

@behrangsa behrangsa Aug 30, 2016

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I will fix it now.

assertNotNull(content);
assertEquals(fileSize, content.getBytes().length);
}

@Test(expected = Test.None.class) public void testResourceToString_ExistingResourceAtSubPackage() throws Exception {
IOUtils.resourceToString("/org/apache/commons/io/FileUtilsTestDataCR.dat", Charset.defaultCharset());
final long fileSize = new File(getClass().getResource("/org/apache/commons/io/FileUtilsTestDataCR.dat").getFile()).length();
final String content = IOUtils.resourceToString("/org/apache/commons/io/FileUtilsTestDataCR.dat", Charset.defaultCharset());
assertNotNull(content);
assertEquals(fileSize, content.getBytes().length);
}

@Test(expected = IOException.class) public void testResourceToString_NonExistingResource() throws Exception {
IOUtils.resourceToString("/non-existing-file.bin", Charset.defaultCharset());
}

@Test(expected = Test.None.class) public void testResourceToByteArray_ExistingResourceAtRootPackage() throws Exception {
IOUtils.resourceToByteArray("/test-file-utf8.bin");
final long fileSize = new File(getClass().getResource("/test-file-utf8.bin").getFile()).length();
final byte[] bytes = IOUtils.resourceToByteArray("/test-file-utf8.bin");
assertNotNull(bytes);
assertEquals(fileSize, bytes.length);
}

@Test(expected = Test.None.class) public void testResourceToByteArray_ExistingResourceAtSubPackage() throws Exception {
IOUtils.resourceToByteArray("/org/apache/commons/io/FileUtilsTestDataCR.dat");
final long fileSize = new File(getClass().getResource("/org/apache/commons/io/FileUtilsTestDataCR.dat").getFile()).length();
final byte[] bytes = IOUtils.resourceToByteArray("/org/apache/commons/io/FileUtilsTestDataCR.dat");
assertNotNull(bytes);
assertEquals(fileSize, bytes.length);
}

@Test(expected = IOException.class) public void testResourceToByteArray_NonExistingResource() throws Exception {
Expand Down