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 NPE tests for resourceToXXX convenience methods
  • Loading branch information
Behrang Saeedzadeh committed Aug 29, 2016
commit ec910eaa23211d206e19e46cac0bb9efd6a670ca
60 changes: 58 additions & 2 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 @@ -23,8 +23,33 @@
import org.junit.Before;
import org.junit.Test;

import java.io.*;
import java.net.*;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.CharArrayReader;
import java.io.CharArrayWriter;
import java.io.Closeable;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.io.StringReader;
import java.io.Writer;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.Selector;
Expand Down Expand Up @@ -1205,6 +1230,19 @@ private void testToString_URL(final String encoding) throws Exception {
IOUtils.resourceToString("/non-existing-file.bin", Charset.defaultCharset());
}

@Test public void testResourceToString_NullResource() throws Exception {
try {
IOUtils.resourceToString(null, Charset.defaultCharset());
fail();
} catch (NullPointerException npe) {
assertNotNull(npe);
}
}

@Test public void testResourceToString_NullCharset() throws Exception {
IOUtils.resourceToString("/test-file-utf8.bin", null);
}

@Test public void testResourceToByteArray_ExistingResourceAtRootPackage() throws Exception {
final long fileSize = new File(getClass().getResource("/test-file-utf8.bin").getFile()).length();
final byte[] bytes = IOUtils.resourceToByteArray("/test-file-utf8.bin");
Expand All @@ -1223,6 +1261,15 @@ private void testToString_URL(final String encoding) throws Exception {
IOUtils.resourceToByteArray("/non-existing-file.bin");
}

@Test public void testResourceToByteArray_Null() throws Exception {
try {
IOUtils.resourceToByteArray(null);
fail();
} catch (NullPointerException npe) {
assertNotNull(npe);
}
}

@Test public void testResourceToURL_ExistingResourceAtRootPackage() throws Exception {
final URL url = IOUtils.resourceToURL("/test-file-utf8.bin");
assertNotNull(url);
Expand All @@ -1239,6 +1286,15 @@ private void testToString_URL(final String encoding) throws Exception {
IOUtils.resourceToURL("/non-existing-file.bin");
}

@Test public void testResourceToURL_Null() throws Exception {
try {
IOUtils.resourceToURL(null);
fail();
} catch (NullPointerException npe) {
assertNotNull(npe);
}
}

@Test public void testAsBufferedInputStream() {
InputStream is = new InputStream() {
@Override
Expand Down