From baceabde7bc971c35ea25016acf60b90d003ac29 Mon Sep 17 00:00:00 2001 From: jantuomi Date: Mon, 1 Aug 2016 14:47:22 +0300 Subject: Move tokenizer package under parser package --- .../jantuomi/tunkki/core/parser/ParserTest.java | 6 ++--- .../core/parser/tokenizer/TokenizerTest.java | 26 ++++++++++++++++++++++ .../tunkki/core/tokenizer/TokenizerTest.java | 26 ---------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 src/test/com/jantuomi/tunkki/core/parser/tokenizer/TokenizerTest.java delete mode 100644 src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java (limited to 'src/test/com') diff --git a/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java b/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java index 2e8421d..2a773cd 100644 --- a/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java +++ b/src/test/com/jantuomi/tunkki/core/parser/ParserTest.java @@ -1,8 +1,8 @@ package com.jantuomi.tunkki.core.parser; -import com.jantuomi.tunkki.core.tokenizer.token.Token; -import com.jantuomi.tunkki.core.tokenizer.token.types.AdditionToken; -import com.jantuomi.tunkki.core.tokenizer.token.types.IntegerLiteralToken; +import com.jantuomi.tunkki.core.parser.tokenizer.token.Token; +import com.jantuomi.tunkki.core.parser.tokenizer.token.types.AdditionToken; +import com.jantuomi.tunkki.core.parser.tokenizer.token.types.IntegerLiteralToken; import org.junit.Test; import java.util.Arrays; diff --git a/src/test/com/jantuomi/tunkki/core/parser/tokenizer/TokenizerTest.java b/src/test/com/jantuomi/tunkki/core/parser/tokenizer/TokenizerTest.java new file mode 100644 index 0000000..1ce55b2 --- /dev/null +++ b/src/test/com/jantuomi/tunkki/core/parser/tokenizer/TokenizerTest.java @@ -0,0 +1,26 @@ +package com.jantuomi.tunkki.core.parser.tokenizer; + +import com.jantuomi.tunkki.core.parser.tokenizer.token.Token; +import com.jantuomi.tunkki.core.parser.tokenizer.token.types.IntegerLiteralToken; +import com.jantuomi.tunkki.exception.TunkkiError; +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertTrue; + +/** + * Created by jan on 10.6.2016. + */ +public class TokenizerTest { + + @Test + public void testAddition() throws TunkkiError { + String testString = "1 2 +"; + List list = Tokenizer.getInstance().tokenize(testString); + + System.out.println(String.format("test string:\n%s", testString)); + Tokenizer.printTokens(list); + assertTrue(list.contains(new IntegerLiteralToken("2"))); + } +} \ No newline at end of file diff --git a/src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java b/src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java deleted file mode 100644 index f65830c..0000000 --- a/src/test/com/jantuomi/tunkki/core/tokenizer/TokenizerTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jantuomi.tunkki.core.tokenizer; - -import com.jantuomi.tunkki.core.tokenizer.token.Token; -import com.jantuomi.tunkki.core.tokenizer.token.types.IntegerLiteralToken; -import com.jantuomi.tunkki.exception.TunkkiError; -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertTrue; - -/** - * Created by jan on 10.6.2016. - */ -public class TokenizerTest { - - @Test - public void testAddition() throws TunkkiError { - String testString = "1 2 +"; - List list = Tokenizer.getInstance().tokenize(testString); - - System.out.println(String.format("test string:\n%s", testString)); - Tokenizer.printTokens(list); - assertTrue(list.contains(new IntegerLiteralToken("2"))); - } -} \ No newline at end of file -- cgit v1.3