From 9df417a53efed428de99f5cd25dbe31bf2ea664e Mon Sep 17 00:00:00 2001
From: Luc Everse <luc@wukl.net>
Date: Mon, 21 Sep 2020 12:20:28 +0200
Subject: [PATCH] Fix style and test
---
.../ewi/auta/checker/asm/AttAsmAnalyzer.java | 8 --------
.../auta/checker/asm/AttAsmErrorListener.java | 5 ++++-
.../checker/grammar/asm/AttAsmLexerTest.java | 16 ++++++++--------
3 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmAnalyzer.java b/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmAnalyzer.java
index 71aa1d398..9fcf84814 100644
--- a/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmAnalyzer.java
+++ b/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmAnalyzer.java
@@ -3,9 +3,7 @@ package nl.tudelft.ewi.auta.checker.asm;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.BitSet;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -22,18 +20,12 @@ import nl.tudelft.ewi.auta.common.model.metric.MetricName;
import nl.tudelft.ewi.auta.common.model.metric.StringListMetric;
import nl.tudelft.ewi.auta.common.model.metric.StringMetric;
import nl.tudelft.ewi.auta.common.model.metric.StringSetMetric;
-import org.antlr.v4.runtime.ANTLRErrorListener;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import nl.tudelft.ewi.auta.checker.grammar.AttAsmLexer;
import nl.tudelft.ewi.auta.checker.grammar.AttAsmParser;
import nl.tudelft.ewi.auta.common.model.metric.MetricCriteriaScript;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.atn.ATNConfigSet;
-import org.antlr.v4.runtime.dfa.DFA;
import javax.annotation.Nullable;
diff --git a/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmErrorListener.java b/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmErrorListener.java
index fcfe984b6..944ded2ad 100644
--- a/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmErrorListener.java
+++ b/worker/src/main/java/nl/tudelft/ewi/auta/checker/asm/AttAsmErrorListener.java
@@ -29,7 +29,10 @@ public class AttAsmErrorListener implements ANTLRErrorListener {
final String msg,
final RecognitionException e
) {
- this.errors.add("Syntax error starting at line " + line + ", column " + charPositionInLine + ": " + msg);
+ this.errors.add(
+ "Syntax error starting at line " + line + ", column " + charPositionInLine + ": "
+ + msg
+ );
}
@Override
diff --git a/worker/src/test/java/nl/tudelft/ewi/auta/checker/grammar/asm/AttAsmLexerTest.java b/worker/src/test/java/nl/tudelft/ewi/auta/checker/grammar/asm/AttAsmLexerTest.java
index e153af27d..8e3fc9986 100644
--- a/worker/src/test/java/nl/tudelft/ewi/auta/checker/grammar/asm/AttAsmLexerTest.java
+++ b/worker/src/test/java/nl/tudelft/ewi/auta/checker/grammar/asm/AttAsmLexerTest.java
@@ -14,26 +14,26 @@ public class AttAsmLexerTest {
@Test
public void testShortFlonum() {
- final var token = this.lex("f0");
- this.checkToken(token, "Flonum", "f0");
+ final var token = this.lex("0f0");
+ this.checkToken(token, "Flonum", "0f0");
}
@Test
public void testNegativeFlonum() {
- final var token = this.lex("f-0");
- this.checkToken(token, "Flonum", "f-0");
+ final var token = this.lex("0f-0");
+ this.checkToken(token, "Flonum", "0f-0");
}
@Test
public void testFractionOnlyFlonum() {
- final var token = this.lex("f.2");
- this.checkToken(token, "Flonum", "f.2");
+ final var token = this.lex("0f.2");
+ this.checkToken(token, "Flonum", "0f.2");
}
@Test
public void testExponentFlonum() {
- final var token = this.lex("f1.4e7");
- this.checkToken(token, "Flonum", "f1.4e7");
+ final var token = this.lex("0f1.4e7");
+ this.checkToken(token, "Flonum", "0f1.4e7");
}
@Test
--
GitLab