Skip to content

Commit d8a7a0b

Browse files
author
eugenp
committed
java conversion work
1 parent 59cd8a8 commit d8a7a0b

File tree

2 files changed

+35
-15
lines changed

2 files changed

+35
-15
lines changed

core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
import org.slf4j.LoggerFactory;
2323

2424
import com.google.common.base.Charsets;
25+
import com.google.common.io.ByteSource;
26+
import com.google.common.io.ByteStreams;
2527
import com.google.common.io.CharStreams;
2628
import com.google.common.io.InputSupplier;
2729

30+
@SuppressWarnings("unused")
2831
public class JavaInputStreamToXUnitTest {
2932
protected final Logger logger = LoggerFactory.getLogger(getClass());
30-
private static final int DEFAULT_SIZE = 150000000;
31-
32-
// private static final int DEFAULT_SIZE = 8;
33+
private static final int DEFAULT_SIZE = 1500000;
3334

3435
// tests - InputStream to String
3536

36-
// 11s
3737
@Test
38-
public void givenUsingJava5_whenConvertingAnInputStreamToAString_thenCorrect() throws IOException {
38+
public final void givenUsingJava5_whenConvertingAnInputStreamToAString_thenCorrect() throws IOException {
3939
final String originalString = randomAlphabetic(DEFAULT_SIZE);
4040
final InputStream inputStream = new ByteArrayInputStream(originalString.getBytes());
4141

@@ -49,7 +49,6 @@ public void givenUsingJava5_whenConvertingAnInputStreamToAString_thenCorrect() t
4949
assertEquals(textBuilder.toString(), originalString);
5050
}
5151

52-
// 8s
5352
@Test
5453
public final void givenUsingJava7_whenConvertingAnInputStreamToAString_thenCorrect() throws IOException {
5554
final String originalString = randomAlphabetic(DEFAULT_SIZE);
@@ -120,4 +119,25 @@ public final void givenUsingCommonsIoWithCopy_whenConvertingAnInputStreamToAStri
120119
assertThat(writer.toString(), equalTo(originalString));
121120
}
122121

122+
// tests - InputStream to byte[]
123+
124+
@Test
125+
public final void givenUsingPlainJava_whenConvertingAnInputStreamToAByteArray_thenCorrect() throws IOException {
126+
final InputStream initialStream = new ByteArrayInputStream(new byte[] { 0, 1, 2 });
127+
final byte[] targetArray = new byte[initialStream.available()];
128+
initialStream.read(targetArray);
129+
}
130+
131+
@Test
132+
public final void givenUsingGuava_whenConvertingAnInputStreamToAByteArray_thenCorrect() throws IOException {
133+
final InputStream initialStream = ByteSource.wrap(new byte[] { 0, 1, 2 }).openStream();
134+
final byte[] targetArray = ByteStreams.toByteArray(initialStream);
135+
}
136+
137+
@Test
138+
public final void givenUsingCommonsIO_whenConvertingAnInputStreamToAByteArray_thenCorrect() throws IOException {
139+
final ByteArrayInputStream initialStream = new ByteArrayInputStream(new byte[] { 0, 1, 2 });
140+
final byte[] targetArray = IOUtils.toByteArray(initialStream);
141+
}
142+
123143
}

core-java/src/test/java/org/baeldung/java/io/JavaXToInputStreamUnitTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.io.ByteArrayInputStream;
44
import java.io.IOException;
55
import java.io.InputStream;
6-
import java.io.Reader;
76

87
import org.apache.commons.io.IOUtils;
8+
import org.apache.commons.io.input.ReaderInputStream;
99
import org.junit.Test;
1010
import org.slf4j.Logger;
1111
import org.slf4j.LoggerFactory;
@@ -16,26 +16,26 @@
1616
public class JavaXToInputStreamUnitTest {
1717
protected final Logger logger = LoggerFactory.getLogger(getClass());
1818

19+
// tests - String - InputStream
20+
1921
@Test
20-
public void givenUsingPlainJava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
22+
public final void givenUsingPlainJava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
2123
final String initialString = "text";
2224
final InputStream targetStream = new ByteArrayInputStream(initialString.getBytes());
23-
final byte[] buffer = new byte[targetStream.available()];
24-
targetStream.read(buffer);
25-
final String targetString = new String(buffer);
2625
}
2726

2827
@Test
29-
public void givenUsingGuava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
28+
public final void givenUsingGuava_whenConvertingStringToInputStream_thenCorrect() throws IOException {
3029
final String initialString = "text";
31-
final CharSource source = CharSource.wrap(initialString);
32-
final Reader targetStream = source.openStream();
30+
final InputStream targetStream = new ReaderInputStream(CharSource.wrap(initialString).openStream());
3331
}
3432

3533
@Test
36-
public void givenUsingCommonsIO_whenConvertingStringToInputStream_thenCorrect() throws IOException {
34+
public final void givenUsingCommonsIO_whenConvertingStringToInputStream_thenCorrect() throws IOException {
3735
final String initialString = "text";
3836
final InputStream targetStream = IOUtils.toInputStream(initialString);
3937
}
4038

39+
//
40+
4141
}

0 commit comments

Comments
 (0)