diff --git a/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java b/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
index d883972369..6964ba80e3 100644
--- a/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
+++ b/core-java-io/src/test/java/com/baeldung/filechannel/FileChannelUnitTest.java
@@ -12,162 +12,154 @@ import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.Test;
 
 public class FileChannelUnitTest {
 
-	@Test
-	public void givenFile_whenReadWithFileChannelUsingRandomAccessFile_thenCorrect() throws IOException {
+    @Test
+    public void givenFile_whenReadWithFileChannelUsingRandomAccessFile_thenCorrect() throws IOException {
 
-		try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
-				FileChannel channel = reader.getChannel();
-				ByteArrayOutputStream out = new ByteArrayOutputStream();) {
+        try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r"); 
+            FileChannel channel = reader.getChannel(); 
+            ByteArrayOutputStream out = new ByteArrayOutputStream();) {
 
-			int bufferSize = 1024;
-			if (bufferSize > channel.size()) {
-				bufferSize = (int) channel.size();
-			}
-			ByteBuffer buff = ByteBuffer.allocate(bufferSize);
+            int bufferSize = 1024;
+            if (bufferSize > channel.size()) {
+                bufferSize = (int) channel.size();
+            }
+            ByteBuffer buff = ByteBuffer.allocate(bufferSize);
 
-			while (channel.read(buff) > 0) {
-				out.write(buff.array(), 0, buff.position());
-				buff.clear();
-			}
+            while (channel.read(buff) > 0) {
+                out.write(buff.array(), 0, buff.position());
+                buff.clear();
+            }
 
-			assertEquals("Hello world", new String(out.toByteArray(), StandardCharsets.UTF_8));
-		}
-	}
+            String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
 
-	@Test
-	public void givenFile_whenReadWithFileChannelUsingFileInputStream_thenCorrect() throws IOException {
+            assertEquals("Hello world", fileContent);
+        }
+    }
 
-		try (ByteArrayOutputStream out = new ByteArrayOutputStream();
-				FileInputStream fin = new FileInputStream("src/test/resources/test_read.in");
-				FileChannel channel = fin.getChannel();) {
+    @Test
+    public void givenFile_whenReadWithFileChannelUsingFileInputStream_thenCorrect() throws IOException {
 
-			int bufferSize = 1024;
-			if (bufferSize > channel.size()) {
-				bufferSize = (int) channel.size();
-			}
-			ByteBuffer buff = ByteBuffer.allocate(bufferSize);
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream(); 
+            FileInputStream fin = new FileInputStream("src/test/resources/test_read.in"); 
+            FileChannel channel = fin.getChannel();) {
 
-			while (channel.read(buff) > 0) {
-				out.write(buff.array(), 0, buff.position());
-				buff.clear();
-			}
+            int bufferSize = 1024;
+            if (bufferSize > channel.size()) {
+                bufferSize = (int) channel.size();
+            }
+            ByteBuffer buff = ByteBuffer.allocate(bufferSize);
 
-			assertEquals("Hello world", new String(out.toByteArray(), StandardCharsets.UTF_8));
+            while (channel.read(buff) > 0) {
+                out.write(buff.array(), 0, buff.position());
+                buff.clear();
+            }
+            String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
 
-		}
-	}
+            assertEquals("Hello world", fileContent);
+        }
+    }
 
-	@Test
-	public void givenFile_whenReadAFileSectionIntoMemoryWithFileChannel_thenCorrect() throws IOException {
+    @Test
+    public void givenFile_whenReadAFileSectionIntoMemoryWithFileChannel_thenCorrect() throws IOException {
 
-		try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
-				FileChannel channel = reader.getChannel();
-				ByteArrayOutputStream out = new ByteArrayOutputStream();) {
+        try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r"); 
+            FileChannel channel = reader.getChannel(); 
+            ByteArrayOutputStream out = new ByteArrayOutputStream();) {
 
-			MappedByteBuffer buff = channel.map(FileChannel.MapMode.READ_ONLY, 6, 5);
+            MappedByteBuffer buff = channel.map(FileChannel.MapMode.READ_ONLY, 6, 5);
 
-			if (buff.hasRemaining()) {
-				byte[] data = new byte[buff.remaining()];
-				buff.get(data);
-				assertEquals("world", new String(data, StandardCharsets.UTF_8));
+            if (buff.hasRemaining()) {
+                byte[] data = new byte[buff.remaining()];
+                buff.get(data);
+                assertEquals("world", new String(data, StandardCharsets.UTF_8));
+            }
+        }
+    }
 
-			}
+    @Test
+    public void whenWriteWithFileChannelUsingRandomAccessFile_thenCorrect() throws IOException {
+        String file = "src/test/resources/test_write_using_filechannel.txt";
+        try (RandomAccessFile writer = new RandomAccessFile(file, "rw"); 
+            FileChannel channel = writer.getChannel();) {
+            ByteBuffer buff = ByteBuffer.wrap("Hello world".getBytes(StandardCharsets.UTF_8));
 
-		}
-	}
+            channel.write(buff);
 
-	@Test
-	public void whenWriteWithFileChannelUsingRandomAccessFile_thenCorrect() throws IOException {
-		String file = "src/test/resources/test_write_using_filechannel.txt";
-		try (RandomAccessFile writer = new RandomAccessFile(file, "rw"); 
-			FileChannel channel = writer.getChannel();) {
-			ByteBuffer buff = ByteBuffer.wrap("Hello world".getBytes(StandardCharsets.UTF_8));
+            // now we verify whether the file was written correctly
+            RandomAccessFile reader = new RandomAccessFile(file, "r");
+            assertEquals("Hello world", reader.readLine());
+            reader.close();
+        }
+    }
 
-			if (buff.hasRemaining()) {
-				channel.write(buff);
-			}
+    @Test
+    public void givenFile_whenWriteAFileUsingLockAFileSectionWithFileChannel_thenCorrect() throws IOException {
+        try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "rw"); 
+            FileChannel channel = reader.getChannel(); 
+            FileLock fileLock = channel.tryLock(6, 5, Boolean.FALSE);) {
 
-			// verify
-			RandomAccessFile reader = new RandomAccessFile(file, "r");
-			assertEquals("Hello world", reader.readLine());
-			reader.close();
-		}
-	}
+            assertNotNull(fileLock);
+        }
+    }
 
-	@Test
-	public void givenFile_whenWriteAFileUsingLockAFileSectionWithFileChannel_thenCorrect() throws IOException {
-		try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "rw");
-				FileChannel channel = reader.getChannel();
-				FileLock fileLock = channel.tryLock(6, 5, Boolean.FALSE);) {
+    @Test
+    public void givenFile_whenReadWithFileChannelGetPosition_thenCorrect() throws IOException {
 
-			assertNotNull(fileLock);
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream(); 
+            RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r"); 
+            FileChannel channel = reader.getChannel();) {
 
-		} catch (OverlappingFileLockException | IOException ex) {
+            int bufferSize = 1024;
+            if (bufferSize > channel.size()) {
+                bufferSize = (int) channel.size();
+            }
+            ByteBuffer buff = ByteBuffer.allocate(bufferSize);
 
-		}
+            while (channel.read(buff) > 0) {
+                out.write(buff.array(), 0, buff.position());
+                buff.clear();
+            }
 
-	}
+            // the original file is 11 bytes long, so that's where the position pointer should be
+            assertEquals(11, channel.position());
 
-	@Test
-	public void givenFile_whenReadWithFileChannelGetPosition_thenCorrect() throws IOException {
+            channel.position(4);
+            assertEquals(4, channel.position());
+        }
+    }
 
-		try (ByteArrayOutputStream out = new ByteArrayOutputStream();
-				RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
-				FileChannel channel = reader.getChannel();) {
+    @Test
+    public void whenGetFileSize_thenCorrect() throws IOException {
 
-			int bufferSize = 1024;
-			if (bufferSize > channel.size()) {
-				bufferSize = (int) channel.size();
-			}
-			ByteBuffer buff = ByteBuffer.allocate(bufferSize);
+        try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r"); 
+            FileChannel channel = reader.getChannel();) {
 
-			while (channel.read(buff) > 0) {
-				out.write(buff.array(), 0, buff.position());
-				buff.clear();
-			}
+            // the original file is 11 bytes long, so that's where the position pointer should be
+            assertEquals(11, channel.size());
+        }
+    }
 
-			assertEquals(11, channel.position());
+    @Test
+    public void whenTruncateFile_thenCorrect() throws IOException {
+        String input = "this is a test input";
 
-			channel.position(4);
-			assertEquals(4, channel.position());
+        FileOutputStream fout = new FileOutputStream("src/test/resources/test_truncate.txt");
+        FileChannel channel = fout.getChannel();
 
-		}
-	}
+        ByteBuffer buff = ByteBuffer.wrap(input.getBytes());
+        channel.write(buff);
+        buff.flip();
 
-	@Test
-	public void whenGetFileSize_thenCorrect() throws IOException {
+        channel = channel.truncate(5);
+        assertEquals(5, channel.size());
 
-		try (RandomAccessFile reader = new RandomAccessFile("src/test/resources/test_read.in", "r");
-				FileChannel channel = reader.getChannel();) {
-
-			long imageFileSize = channel.size();
-			assertEquals(11, imageFileSize);
-		}
-
-	}
-
-	@Test
-	public void whenTruncateFile_thenCorrect() throws IOException {
-		String input = "this is a test input";
-
-		FileOutputStream fout = new FileOutputStream("src/test/resources/test_truncate.txt");
-		FileChannel channel = fout.getChannel();
-
-		ByteBuffer buff = ByteBuffer.wrap(input.getBytes());
-		channel.write(buff);
-		buff.flip();
-
-		channel = channel.truncate(5);
-		assertEquals(5, channel.size());
-
-		fout.close();
-		channel.close();
-	}
+        fout.close();
+        channel.close();
+    }
 }