Skip to content

Commit c30ba0c

Browse files
author
mikr
committed
Java-112 Update unit tests for article merge
1 parent 177dab4 commit c30ba0c

9 files changed

Lines changed: 40 additions & 58 deletions

File tree

‎core-java-modules/core-java-io/src/test/java/com/baeldung/readfile/JavaReadFromFileUnitTest.java‎

Lines changed: 39 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public class JavaReadFromFileUnitTest {
2828

2929
@Test
3030
public void whenReadWithBufferedReader_thenCorrect() throws IOException {
31-
final String expected_value = "Hello world";
31+
final String expected_value = "Hello, world!";
3232

33-
final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/test_read.in"));
33+
final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/fileTest.txt"));
3434
final String currentLine = reader.readLine();
3535
reader.close();
3636

@@ -39,7 +39,7 @@ public void whenReadWithBufferedReader_thenCorrect() throws IOException {
3939

4040
@Test
4141
public void givenFileName_whenUsingClassloader_thenFileData() throws IOException {
42-
String expectedData = "Hello World from fileTest.txt!!!";
42+
String expectedData = "Hello, world!";
4343

4444
ClassLoader classLoader = getClass().getClassLoader();
4545
File file = new File(classLoader.getResource("fileTest.txt").getFile());
@@ -51,7 +51,7 @@ public void givenFileName_whenUsingClassloader_thenFileData() throws IOException
5151

5252
@Test
5353
public void givenFileNameAsAbsolutePath_whenUsingClasspath_thenFileData() throws IOException {
54-
String expectedData = "Hello World from fileTest.txt!!!";
54+
String expectedData = "Hello, world!";
5555

5656
Class clazz = JavaReadFromFileUnitTest.class;
5757
InputStream inputStream = clazz.getResourceAsStream("/fileTest.txt");
@@ -87,7 +87,7 @@ public void givenURLName_whenUsingURL_thenFileData() throws IOException {
8787

8888
@Test
8989
public void givenFileName_whenUsingFileUtils_thenFileData() throws IOException {
90-
String expectedData = "Hello World from fileTest.txt!!!";
90+
String expectedData = "Hello, world!";
9191

9292
ClassLoader classLoader = getClass().getClassLoader();
9393
File file = new File(classLoader.getResource("fileTest.txt").getFile());
@@ -98,7 +98,7 @@ public void givenFileName_whenUsingFileUtils_thenFileData() throws IOException {
9898

9999
@Test
100100
public void givenFilePath_whenUsingFilesReadAllBytes_thenFileData() throws IOException, URISyntaxException {
101-
String expectedData = "Hello World from fileTest.txt!!!";
101+
String expectedData = "Hello, world!";
102102

103103
Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
104104

@@ -110,7 +110,7 @@ public void givenFilePath_whenUsingFilesReadAllBytes_thenFileData() throws IOExc
110110

111111
@Test
112112
public void givenFilePath_whenUsingFilesLines_thenFileData() throws IOException, URISyntaxException {
113-
String expectedData = "Hello World from fileTest.txt!!!";
113+
String expectedData = "Hello, world!";
114114

115115
Path path = Paths.get(getClass().getClassLoader().getResource("fileTest.txt").toURI());
116116

@@ -123,44 +123,42 @@ public void givenFilePath_whenUsingFilesLines_thenFileData() throws IOException,
123123

124124
@Test
125125
public void givenFileName_whenUsingIOUtils_thenFileData() throws IOException {
126-
String expectedData = "This is a content of the file";
126+
String expectedData = "Hello, world!";
127127

128-
FileInputStream fis = new FileInputStream("src/test/resources/test_read9.in");
128+
FileInputStream fis = new FileInputStream("src/test/resources/fileTest.txt");
129129
String data = IOUtils.toString(fis, "UTF-8");
130130

131131
assertEquals(expectedData, data.trim());
132132
}
133133

134134
@Test
135135
public void whenReadWithScanner_thenCorrect() throws IOException {
136-
final Scanner scanner = new Scanner(new File("src/test/resources/test_read1.in"));
136+
final Scanner scanner = new Scanner(new File("src/test/resources/fileTest.txt"));
137137
scanner.useDelimiter(" ");
138138

139139
assertTrue(scanner.hasNext());
140-
assertEquals("Hello", scanner.next());
141-
assertEquals("world", scanner.next());
142-
assertEquals(1, scanner.nextInt());
140+
assertEquals("Hello,", scanner.next());
141+
assertEquals("world!", scanner.next());
143142

144143
scanner.close();
145-
146144
}
147145

148146
@Test
149147
public void whenReadWithScannerTwoDelimiters_thenCorrect() throws IOException {
150-
final Scanner scanner = new Scanner(new File("src/test/resources/test_read2.in"));
151-
scanner.useDelimiter(",| ");
148+
final Scanner scanner = new Scanner(new File("src/test/resources/fileTest.txt"));
149+
scanner.useDelimiter("\\s|,");
152150

153-
assertTrue(scanner.hasNextInt());
154-
assertEquals(2, scanner.nextInt());
155-
assertEquals(3, scanner.nextInt());
156-
assertEquals(4, scanner.nextInt());
151+
assertTrue(scanner.hasNext());
152+
assertEquals("Hello", scanner.next());
153+
assertEquals("", scanner.next());
154+
assertEquals("world!", scanner.next());
157155

158156
scanner.close();
159157
}
160158

161159
@Test
162160
public void whenReadWithStreamTokenizer_thenCorrectTokens() throws IOException {
163-
final FileReader reader = new FileReader("src/test/resources/test_read3.in");
161+
final FileReader reader = new FileReader("src/test/resources/fileTestTokenizer.txt");
164162
final StreamTokenizer tokenizer = new StreamTokenizer(reader);
165163

166164
tokenizer.nextToken();
@@ -177,37 +175,26 @@ public void whenReadWithStreamTokenizer_thenCorrectTokens() throws IOException {
177175

178176
@Test
179177
public void whenReadWithDataInputStream_thenCorrect() throws IOException {
180-
final String expected_value = "Hello";
181-
182-
String result;
183-
final DataInputStream reader = new DataInputStream(new FileInputStream("src/test/resources/test_read4.in"));
184-
result = reader.readUTF();
185-
reader.close();
178+
String expectedValue = "Hello, world!";
179+
String file ="src/test/resources/fileTest.txt";
186180

187-
assertEquals(expected_value, result);
188-
}
189-
190-
public void whenReadTwoFilesWithSequenceInputStream_thenCorrect() throws IOException {
191-
final int expected_value1 = 2000;
192-
final int expected_value2 = 5000;
193-
194-
final FileInputStream stream1 = new FileInputStream("src/test/resources/test_read5.in");
195-
final FileInputStream stream2 = new FileInputStream("src/test/resources/test_read6.in");
181+
String result = null;
196182

197-
final SequenceInputStream sequence = new SequenceInputStream(stream1, stream2);
198-
final DataInputStream reader = new DataInputStream(sequence);
199-
200-
assertEquals(expected_value1, reader.readInt());
201-
assertEquals(expected_value2, reader.readInt());
183+
DataInputStream reader = new DataInputStream(new FileInputStream(file));
184+
int nBytesToRead = reader.available();
185+
if(nBytesToRead > 0) {
186+
byte[] bytes = new byte[nBytesToRead];
187+
reader.read(bytes);
188+
result = new String(bytes);
189+
}
202190

203-
reader.close();
204-
stream2.close();
191+
assertEquals(expectedValue, result);
205192
}
206193

207194
@Test
208195
public void whenReadUTFEncodedFile_thenCorrect() throws IOException {
209196
final String expected_value = "青空";
210-
final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/test/resources/test_read7.in"), "UTF-8"));
197+
final BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/test/resources/fileTestUtf8.txt"), "UTF-8"));
211198
final String currentLine = reader.readLine();
212199
reader.close();
213200

@@ -216,8 +203,8 @@ public void whenReadUTFEncodedFile_thenCorrect() throws IOException {
216203

217204
@Test
218205
public void whenReadFileContentsIntoString_thenCorrect() throws IOException {
219-
final String expected_value = "Hello world \n Test line \n";
220-
final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/test_read8.in"));
206+
final String expected_value = "Hello, world!\n";
207+
final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/fileTest.txt"));
221208
final StringBuilder builder = new StringBuilder();
222209
String currentLine = reader.readLine();
223210
while (currentLine != null) {
@@ -233,8 +220,8 @@ public void whenReadFileContentsIntoString_thenCorrect() throws IOException {
233220

234221
@Test
235222
public void whenReadWithFileChannel_thenCorrect() throws IOException {
236-
final String expected_value = "Hello world";
237-
final RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
223+
final String expected_value = "Hello, world!";
224+
final RandomAccessFile reader = new RandomAccessFile("src/test/resources/fileTest.txt", "r");
238225
final FileChannel channel = reader.getChannel();
239226

240227
int bufferSize = 1024;
@@ -251,18 +238,18 @@ public void whenReadWithFileChannel_thenCorrect() throws IOException {
251238

252239
@Test
253240
public void whenReadSmallFileJava7_thenCorrect() throws IOException {
254-
final String expected_value = "Hello world";
255-
final Path path = Paths.get("src/test/resources/test_read.in");
241+
final String expected_value = "Hello, world!";
242+
final Path path = Paths.get("src/test/resources/fileTest.txt");
256243

257244
final String read = Files.readAllLines(path, Charset.defaultCharset()).get(0);
258245
assertEquals(expected_value, read);
259246
}
260247

261248
@Test
262249
public void whenReadLargeFileJava7_thenCorrect() throws IOException {
263-
final String expected_value = "Hello world";
250+
final String expected_value = "Hello, world!";
264251

265-
final Path path = Paths.get("src/test/resources/test_read.in");
252+
final Path path = Paths.get("src/test/resources/fileTest.txt");
266253
final BufferedReader reader = Files.newBufferedReader(path, Charset.defaultCharset());
267254
final String line = reader.readLine();
268255
assertEquals(expected_value, line);

‎core-java-modules/core-java-io/src/test/resources/fileTest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Hello World from fileTest.txt!!!
1+
Hello, world!

core-java-modules/core-java-io/src/test/resources/test_read3.in renamed to core-java-modules/core-java-io/src/test/resources/fileTestTokenizer.txt

File renamed without changes.

core-java-modules/core-java-io/src/test/resources/test_read7.in renamed to core-java-modules/core-java-io/src/test/resources/fileTestUtf8.txt

File renamed without changes.

‎core-java-modules/core-java-io/src/test/resources/test_read1.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎core-java-modules/core-java-io/src/test/resources/test_read2.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎core-java-modules/core-java-io/src/test/resources/test_read4.in‎

-7 Bytes
Binary file not shown.

‎core-java-modules/core-java-io/src/test/resources/test_read8.in‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎core-java-modules/core-java-io/src/test/resources/test_read9.in‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)