From 60c2edaaeb78110ab664e3929c8738b2481aecaf Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sat, 8 Apr 2017 13:49:01 +0200 Subject: [PATCH] StringTokenizerTest refactor (#1611) * TokenizerRefactor * TokenizerRefactor * TokenizerRefactor --- .../{Application.java => MyTokenizer.java} | 14 +++--- .../stringtokenizer/ApplicationTest.java | 47 ------------------- .../stringtokenizer/TokenizerTest.java | 29 ++++++++++++ 3 files changed, 36 insertions(+), 54 deletions(-) rename core-java/src/main/java/com/baeldung/stringtokenizer/{Application.java => MyTokenizer.java} (83%) delete mode 100644 core-java/src/test/java/com/baeldung/stringtokenizer/ApplicationTest.java create mode 100644 core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java diff --git a/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java b/core-java/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java similarity index 83% rename from core-java/src/main/java/com/baeldung/stringtokenizer/Application.java rename to core-java/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java index 4560e40697..130218acc2 100644 --- a/core-java/src/main/java/com/baeldung/stringtokenizer/Application.java +++ b/core-java/src/main/java/com/baeldung/stringtokenizer/MyTokenizer.java @@ -9,10 +9,10 @@ import java.util.List; import java.util.StringTokenizer; import java.util.stream.Collectors; -public class Application { +public class MyTokenizer { public List getTokens(String str) { - List tokens = new ArrayList(); + List tokens = new ArrayList<>(); // StringTokenizer tokenizer = new StringTokenizer( str ); StringTokenizer tokenizer = new StringTokenizer(str, ","); // StringTokenizer tokenizer = new StringTokenizer( str , "," , true ); @@ -25,18 +25,18 @@ public class Application { } public List getTokensWithCollection(String str) { - StringTokenizer tokenizer = new StringTokenizer(str, ","); - - return Collections.list(tokenizer).stream() + return Collections + .list(new StringTokenizer(str, ",")) + .stream() .map(token -> (String) token) .collect(Collectors.toList()); } public List getTokensFromFile(String path, String delim) { List tokens = new ArrayList<>(); - String currLine = ""; + String currLine; StringTokenizer tokenizer; - try (BufferedReader br = new BufferedReader(new InputStreamReader(Application.class.getResourceAsStream("/" + path)))) { + try (BufferedReader br = new BufferedReader(new InputStreamReader(MyTokenizer.class.getResourceAsStream("/" + path)))) { while ((currLine = br.readLine()) != null) { tokenizer = new StringTokenizer(currLine, delim); while (tokenizer.hasMoreElements()) { diff --git a/core-java/src/test/java/com/baeldung/stringtokenizer/ApplicationTest.java b/core-java/src/test/java/com/baeldung/stringtokenizer/ApplicationTest.java deleted file mode 100644 index 5d475d2fbb..0000000000 --- a/core-java/src/test/java/com/baeldung/stringtokenizer/ApplicationTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.baeldung.stringtokenizer; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -public class ApplicationTest { - - Application application = new Application(); - List expectedTokensForString = new ArrayList(); - List expectedTokensForFile = new ArrayList(); - - @Before - public void init() { - expectedTokensForString.add("Welcome"); - expectedTokensForString.add("to"); - expectedTokensForString.add("baeldung.com"); - - expectedTokensForFile.add("1"); - expectedTokensForFile.add("IND"); - expectedTokensForFile.add("India"); - expectedTokensForFile.add("2"); - expectedTokensForFile.add("MY"); - expectedTokensForFile.add("Malaysia"); - expectedTokensForFile.add("3"); - expectedTokensForFile.add("AU"); - expectedTokensForFile.add("Australia"); - } - - @Test - public void givenString_thenGetListOfString() { - String str = "Welcome,to,baeldung.com"; - List actualTokens = application.getTokens(str); - assertEquals(expectedTokensForString, actualTokens); - } - - @Test - public void givenFile_thenGetListOfString() { - List actualTokens = application.getTokensFromFile("data.csv", "|"); - assertEquals(expectedTokensForFile, actualTokens); - } - -} diff --git a/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java b/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java new file mode 100644 index 0000000000..eed42a2f96 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java @@ -0,0 +1,29 @@ +package com.baeldung.stringtokenizer; + +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class TokenizerTest { + + private final MyTokenizer myTokenizer = new MyTokenizer(); + private final List expectedTokensForString = Arrays.asList("Welcome", "to", "baeldung.com"); + private final List expectedTokensForFile = Arrays.asList("1", "IND", "India", "2", "MY", "Malaysia", "3", "AU", "Australia"); + + @Test + public void givenString_thenGetListOfString() { + String str = "Welcome,to,baeldung.com"; + List actualTokens = myTokenizer.getTokens(str); + assertEquals(expectedTokensForString, actualTokens); + } + + @Test + public void givenFile_thenGetListOfString() { + List actualTokens = myTokenizer.getTokensFromFile("data.csv", "|"); + assertEquals(expectedTokensForFile, actualTokens); + } + +}