X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fstring%2Ftokenizer%2FTokenizerTest.java;h=ddb2662bfd8c81022313135f3889ad09eb42c820;hp=e72b9363bb22c327ef3cac0b3aaf19e25395be22;hb=3bc3db3ceb288b82e48c349bf27dfafda2bcd444;hpb=798a165906826270924f0d5d58cfa04cf6bdc113

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 e72b936..ddb2662 100644
--- a/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java
+++ b/src/test/java/eu/svjatoslav/commons/string/tokenizer/TokenizerTest.java
@@ -2,6 +2,7 @@ package eu.svjatoslav.commons.string.tokenizer;
 
 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;
 
@@ -20,7 +21,7 @@ public class TokenizerTest {
     @Test
     public void you_can_peek() throws Exception {
         Tokenizer tokenizer = new Tokenizer("this is a N'2015-03-18 09:48:54.360' test")
-                .addTerminator(" ", Terminator.TerminationStrategy.DROP)
+                .addTerminator(" ", DROP)
                 .addTerminator("N'", "'", PRESERVE);
 
         tokenizer.expectAndConsumeNextToken("this");
@@ -34,14 +35,15 @@ public class TokenizerTest {
 
     @Test
     public void complexTerminator() throws Exception {
-        Tokenizer tokenizer = new Tokenizer("   this((\"hello\"  /* comment */   ((  is a N'2015-03-18 09:48:54.360' test")
-                .addTerminator(" ", Terminator.TerminationStrategy.DROP)
-                .addTerminator("(", Terminator.TerminationStrategy.PRESERVE)
-                .addTerminator("\"", "\"" ,Terminator.TerminationStrategy.PRESERVE)
-                .addTerminator("/*", "*/" ,Terminator.TerminationStrategy.DROP)
+        Tokenizer tokenizer = new Tokenizer("/* hello */ /** comment **/   ((  is a N'2015-03-18 09:48:54.360' test")
+                .addTerminator(" ", DROP)
+                .addTerminator("(", PRESERVE)
+                .addTerminator("\"", "\"" , PRESERVE)
+                .addTerminator("/*", "*/" , PRESERVE)
                 ;
 
-        System.out.println(tokenizer.getNextToken().token);
+        TokenizerMatch nextToken = tokenizer.getNextToken();
+        System.out.println("T: \"" + nextToken.token + "\", R: \"" + nextToken.reminder + "\"");
         System.out.println(tokenizer.getNextToken().token);
         System.out.println(tokenizer.getNextToken().token);
         System.out.println(tokenizer.getNextToken().token);
@@ -65,7 +67,7 @@ public class TokenizerTest {
     @Test
     public void testComplexTerminator() throws Exception {
         Tokenizer tokenizer = new Tokenizer("this N'2015-03-18 09:48:54.360'  /* thoe unto u */ test")
-                .addTerminator(" ", Terminator.TerminationStrategy.DROP)
+                .addTerminator(" ", DROP)
                 .addTerminator("/*", "*/", PRESERVE);
 
 //        tokenizer.expectAndConsumeNextToken("this");