X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTokenizerTest.java;h=9f3536799081c21b8fbb7e672e9947573fe7b721;hb=67f7af91a79bc2ff50071389b6333a28755a4bff;hp=84571e898a5c5807b0f2c2f8a9ca54d5aa568c29;hpb=ba10494483d7eaf1e9d58ddb1402806c8fc58178;p=svjatoslav_commons.git

diff --git a/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java b/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java
index 84571e8..9f35367 100644
--- a/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java
+++ b/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java
@@ -4,9 +4,7 @@ import org.junit.Test;
 
 import static eu.svjatoslav.commons.string.tokenizer.Terminator.TerminationStrategy.DROP;
 import static eu.svjatoslav.commons.string.tokenizer.Terminator.TerminationStrategy.PRESERVE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 public class TokenizerTest {
 
@@ -30,10 +28,9 @@ public class TokenizerTest {
         Tokenizer tokenizer = new Tokenizer("\"hello\" /** comment **/   ((  is a N'2015-03-18 09:48:54.360' test")
                 .addTerminator(" ", DROP)
                 .addTerminator("(", PRESERVE)
-                .addTerminator("\"", "\"" , PRESERVE)
-                .addTerminator("N'", "'" , PRESERVE)
-                .addTerminator("/*", "*/" , DROP)
-                ;
+                .addTerminator("\"", "\"", PRESERVE)
+                .addTerminator("N'", "'", PRESERVE)
+                .addTerminator("/*", "*/", DROP);
 
         assertTokenEquals("\"", "hello", tokenizer);
         assertTokenEquals("(", null, tokenizer);
@@ -44,7 +41,7 @@ public class TokenizerTest {
         assertTokenEquals("test", null, tokenizer);
 
         assertNull(tokenizer.getNextToken());
-        assertFalse(tokenizer.hasMoreTokens());
+        assertFalse(tokenizer.hasMoreContent());
     }
 
     private void assertTokenEquals(String token, String reminder, Tokenizer tokenizer) throws InvalidSyntaxException {
@@ -65,5 +62,5 @@ public class TokenizerTest {
         else
             System.out.println("T: \"" + nextToken.token + "\", R: \"" + nextToken.reminder + "\"");
     }
-    
+
 }
\ No newline at end of file