test make method static

This commit is contained in:
ChUrl
2021-02-05 11:47:02 +01:00
parent 3810785ae7
commit 9680608228

View File

@ -27,7 +27,7 @@ class LexerTest {
return null; return null;
} }
private List<String> getSymbols(Lexer lex) { private static List<String> getSymbols(Lexer lex) {
return lex.getAllTokens().stream() return lex.getAllTokens().stream()
.map(tok -> lex.getVocabulary().getSymbolicName(tok.getType())) .map(tok -> lex.getVocabulary().getSymbolicName(tok.getType()))
.collect(Collectors.toUnmodifiableList()); .collect(Collectors.toUnmodifiableList());
@ -37,7 +37,7 @@ class LexerTest {
void testEmptyFile() { void testEmptyFile() {
final Lexer lex = this.initLexer("EmptyFile.stups"); final Lexer lex = this.initLexer("EmptyFile.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).isEmpty(); assertThat(token).isEmpty();
} }
@ -46,7 +46,7 @@ class LexerTest {
void testWhitespace() { void testWhitespace() {
final Lexer lex = this.initLexer("Whitespace.stups"); final Lexer lex = this.initLexer("Whitespace.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).containsExactly("IDENTIFIER", assertThat(token).containsExactly("IDENTIFIER",
"IDENTIFIER", "IDENTIFIER",
@ -58,7 +58,7 @@ class LexerTest {
void testEmptyMain() { void testEmptyMain() {
final Lexer lex = this.initLexer("EmptyMain.stups"); final Lexer lex = this.initLexer("EmptyMain.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).containsExactly("CLASS", assertThat(token).containsExactly("CLASS",
"IDENTIFIER", "IDENTIFIER",
@ -82,7 +82,7 @@ class LexerTest {
void testGeneralWhile() { void testGeneralWhile() {
final Lexer lex = this.initLexer("GeneralWhile.stups"); final Lexer lex = this.initLexer("GeneralWhile.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).hasSize(68) assertThat(token).hasSize(68)
.containsSequence("WHILE", .containsSequence("WHILE",
@ -102,7 +102,7 @@ class LexerTest {
void testGeneralComment() { void testGeneralComment() {
final Lexer lex = this.initLexer("GeneralComment.stups"); final Lexer lex = this.initLexer("GeneralComment.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).hasSize(21) assertThat(token).hasSize(21)
.doesNotContain("WHITESPACE") .doesNotContain("WHITESPACE")
@ -125,7 +125,7 @@ class LexerTest {
void testGeneralIfElse() { void testGeneralIfElse() {
final Lexer lex = this.initLexer("GeneralIfElse.stups"); final Lexer lex = this.initLexer("GeneralIfElse.stups");
final List<String> token = this.getSymbols(lex); final List<String> token = LexerTest.getSymbols(lex);
assertThat(token).hasSize(96) assertThat(token).hasSize(96)
.containsSequence("IF", .containsSequence("IF",