From a87822229a2247098752e0f59c7014b9e7c08bff Mon Sep 17 00:00:00 2001 From: vatsalgosar Date: Wed, 23 Oct 2019 00:17:07 +0530 Subject: [PATCH] BAEL-3143 - made the required changes --- .../baeldung/scanner/JavaScannerUnitTest.java | 42 +++++-------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/core-java-modules/core-java-io-2/src/test/java/com/baeldung/scanner/JavaScannerUnitTest.java b/core-java-modules/core-java-io-2/src/test/java/com/baeldung/scanner/JavaScannerUnitTest.java index ea80c7aef7..8bc859ca07 100644 --- a/core-java-modules/core-java-io-2/src/test/java/com/baeldung/scanner/JavaScannerUnitTest.java +++ b/core-java-modules/core-java-io-2/src/test/java/com/baeldung/scanner/JavaScannerUnitTest.java @@ -1,54 +1,34 @@ package com.baeldung.scanner; -import org.junit.Test; +import static org.junit.Assert.assertEquals; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; import java.util.NoSuchElementException; import java.util.Scanner; -import static org.assertj.core.api.Assertions.fail; -import static org.junit.Assert.assertEquals; +import org.junit.Test; public class JavaScannerUnitTest { @Test public void whenReadingLines_thenCorrect() { String input = "Scanner\nTest\n"; - - byte[] byteArray = input.getBytes(StandardCharsets.UTF_8); - //@formatter:off - try (InputStream is = new ByteArrayInputStream(byteArray); - Scanner scanner = new Scanner(is)) { - - //@formatter:on - String result = scanner.nextLine() + " " + scanner.nextLine(); - - String expected = input.replace("\n", " ") - .trim(); - assertEquals(expected, result); - } catch (IOException e) { - fail(e.getMessage()); + try (Scanner scanner = new Scanner(input)) { + assertEquals("Scanner", scanner.nextLine()); + assertEquals("Test", scanner.nextLine()); } } @Test(expected = NoSuchElementException.class) - public void whenReadingLinesFromStringContainingNoLines_thenThrowNoSuchElementException() { - String input = ""; - Scanner scanner = new Scanner(input); - String result = scanner.nextLine(); - scanner.close(); + public void whenReadingLines_thenThrowNoSuchElementException() { + try (Scanner scanner = new Scanner("")) { + String result = scanner.nextLine(); + } } @Test(expected = IllegalStateException.class) - public void whenReadingLinesUsingClosedScanner_thenThrowIllegalStateException() { - String input = ""; - Scanner scanner = new Scanner(input); + public void whenReadingLines_thenThrowIllegalStateException() { + Scanner scanner = new Scanner(""); scanner.close(); String result = scanner.nextLine(); } - - }