diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java index 096d5f7a41..d1ebd48518 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/CommentsInserterTest.java @@ -21,20 +21,18 @@ package com.github.javaparser; -import static com.github.javaparser.utils.TestUtils.assertEqualToTextResource; +import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.comments.CommentsCollection; +import com.github.javaparser.utils.TestParser; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + import static com.github.javaparser.utils.TestUtils.assertEqualToTextResourceNoEol; import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; import static com.github.javaparser.utils.Utils.SYSTEM_EOL; import static org.junit.jupiter.api.Assertions.assertEquals; -import java.io.IOException; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.comments.CommentsCollection; -import com.github.javaparser.utils.TestParser; - class CommentsInserterTest { private String makeFilename(String sampleName) { return "com/github/javaparser/issue_samples/" + sampleName + ".java.txt"; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ExpectedTokensTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ExpectedTokensTest.java index 4bde2899eb..598823d34d 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ExpectedTokensTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ExpectedTokensTest.java @@ -26,7 +26,6 @@ import com.github.javaparser.utils.ExtractingVisitors; import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.List; import static com.github.javaparser.utils.TestUtils.getNodeStartingAtPosition; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/Issue1017Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/Issue1017Test.java index a6fb348eeb..293163167e 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/Issue1017Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/Issue1017Test.java @@ -1,10 +1,9 @@ package com.github.javaparser; +import com.github.javaparser.ast.CompilationUnit; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import com.github.javaparser.ast.CompilationUnit; - public class Issue1017Test { @Test() diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/Issue3064Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/Issue3064Test.java index f84b42b640..a3cb113729 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/Issue3064Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/Issue3064Test.java @@ -1,12 +1,11 @@ package com.github.javaparser; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.github.javaparser.ast.CompilationUnit; +import org.junit.jupiter.api.Test; import java.io.StringReader; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.CompilationUnit; +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue3064Test { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java index 889b00ce79..df9bd8a265 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java @@ -22,26 +22,18 @@ package com.github.javaparser; +import com.github.javaparser.ast.expr.Expression; +import org.junit.jupiter.api.Test; + import java.lang.reflect.Field; import java.util.Iterator; + import static com.github.javaparser.GeneratedJavaParserConstants.*; -import static com.github.javaparser.JavaToken.Category.COMMENT; -import static com.github.javaparser.JavaToken.Category.LITERAL; -import static com.github.javaparser.JavaToken.Category.OPERATOR; -import static com.github.javaparser.JavaToken.Category.WHITESPACE_NO_EOL; +import static com.github.javaparser.JavaToken.Category.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.Range.range; -import static com.github.javaparser.StaticJavaParser.parse; import static org.junit.jupiter.api.Assertions.*; -import java.lang.reflect.Field; -import java.util.Iterator; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.expr.Expression; -import com.github.javaparser.ast.CompilationUnit; - class JavaTokenTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/LineSeparatorProcessorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/LineSeparatorProcessorTest.java index 487321d482..2d9eb72a95 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/LineSeparatorProcessorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/LineSeparatorProcessorTest.java @@ -1,14 +1,5 @@ package com.github.javaparser; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; @@ -19,6 +10,11 @@ import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; import com.github.javaparser.utils.LineSeparator; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; public class LineSeparatorProcessorTest extends AbstractLexicalPreservingTest{ diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ParserConfigurationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ParserConfigurationTest.java index 70a45d44bc..b63e69c925 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ParserConfigurationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ParserConfigurationTest.java @@ -27,9 +27,8 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.RAW; import static com.github.javaparser.Providers.provider; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/PositionMappingTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/PositionMappingTest.java index 7d0a13018f..6cbe74c9e5 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/PositionMappingTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/PositionMappingTest.java @@ -20,17 +20,17 @@ */ package com.github.javaparser; -import static com.github.javaparser.UnicodeEscapeProcessingProviderTest.*; -import static org.junit.jupiter.api.Assertions.*; +import com.github.javaparser.UnicodeEscapeProcessingProvider.PositionMapping; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.UnicodeEscapeProcessingProvider.PositionMapping; +import static com.github.javaparser.UnicodeEscapeProcessingProviderTest.process; +import static com.github.javaparser.UnicodeEscapeProcessingProviderTest.provider; +import static org.junit.jupiter.api.Assertions.*; /** * Test case for {@link PositionMapping}. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/RangeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/RangeTest.java index 69ebc05332..b98c9fc97b 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/RangeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/RangeTest.java @@ -21,12 +21,10 @@ package com.github.javaparser; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + class RangeTest { private final Position pos1 = new Position(10, 11); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/TokenRangeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/TokenRangeTest.java index 03f46e2734..2967a1aa77 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/TokenRangeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/TokenRangeTest.java @@ -28,7 +28,7 @@ import java.util.Optional; import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class TokenRangeTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/UnicodeEscapeProcessingProviderTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/UnicodeEscapeProcessingProviderTest.java index 7c6974a176..d2c44ec1ed 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/UnicodeEscapeProcessingProviderTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/UnicodeEscapeProcessingProviderTest.java @@ -20,11 +20,11 @@ */ package com.github.javaparser; -import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.Test; import java.io.IOException; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test case for {@link UnicodeEscapeProcessingProvider}. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/DataKeyTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/DataKeyTest.java index db3ac57555..c7d8dd6fa3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/DataKeyTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/DataKeyTest.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast; -import com.github.javaparser.ast.expr.Name; import com.github.javaparser.ast.expr.SimpleName; import org.junit.jupiter.api.Test; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/FindNodeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/FindNodeTest.java index 1143dd3b4e..c60a533406 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/FindNodeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/FindNodeTest.java @@ -21,16 +21,15 @@ package com.github.javaparser.ast; -import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.function.Predicate; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.TryStmt; +import org.junit.jupiter.api.Test; + +import java.util.function.Predicate; + +import static com.github.javaparser.StaticJavaParser.parse; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Some tests for finding descendant and ancestor nodes. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java index b7842451cc..f66cb33f3b 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeListTest.java @@ -21,13 +21,7 @@ package com.github.javaparser.ast; -import com.github.javaparser.JavaParser; -import com.github.javaparser.ast.expr.ArrayInitializerExpr; -import com.github.javaparser.ast.expr.Expression; -import com.github.javaparser.ast.expr.MemberValuePair; -import com.github.javaparser.ast.expr.Name; -import com.github.javaparser.ast.expr.NormalAnnotationExpr; -import com.github.javaparser.ast.expr.StringLiteralExpr; +import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.observer.AstObserver; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; @@ -36,12 +30,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.NoSuchElementException; -import java.util.Optional; +import java.util.*; import static com.github.javaparser.ast.NodeList.nodeList; import static org.junit.jupiter.api.Assertions.*; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java index 08a0e9e0f4..f795b1ade9 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodePositionTest.java @@ -21,7 +21,10 @@ package com.github.javaparser.ast; -import com.github.javaparser.*; +import com.github.javaparser.JavaParser; +import com.github.javaparser.ParseResult; +import com.github.javaparser.ParseStart; +import com.github.javaparser.Providers; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeTest.java index da7e410981..e61282d7c1 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/NodeTest.java @@ -35,7 +35,6 @@ import static com.github.javaparser.StaticJavaParser.parse; import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; class NodeTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/WalkFindTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/WalkFindTest.java index 21d1125ea1..b0ef0c856d 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/WalkFindTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/WalkFindTest.java @@ -1,22 +1,21 @@ package com.github.javaparser.ast; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.StaticJavaParser.parseExpression; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.IntegerLiteralExpr; import com.github.javaparser.ast.expr.SimpleName; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import static com.github.javaparser.StaticJavaParser.parse; +import static com.github.javaparser.StaticJavaParser.parseExpression; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class WalkFindTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java index 0b6a1ecc7a..442423b8ce 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java @@ -21,17 +21,16 @@ package com.github.javaparser.ast.body; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Modifier.Keyword; import com.github.javaparser.ast.NodeList; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.StaticJavaParser.parse; +import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class FieldDeclarationTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java index 581f8e44ad..c1cb51c790 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java @@ -21,14 +21,11 @@ package com.github.javaparser.ast.body; -import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.junit.jupiter.api.Test; +import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; +import static org.junit.jupiter.api.Assertions.*; + class MethodDeclarationTest { @Test void annotationsAllowedAfterGenericsAndBeforeReturnType() { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java index f1aa113ad7..a9017579b3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java @@ -16,10 +16,7 @@ import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class RecordDeclarationTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/TypeDeclarationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/TypeDeclarationTest.java index 0b95dc8028..52f525bd98 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/TypeDeclarationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/body/TypeDeclarationTest.java @@ -21,7 +21,6 @@ package com.github.javaparser.ast.body; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import org.junit.jupiter.api.Test; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/comments/CommentTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/comments/CommentTest.java index c95b551556..292b3fc4c3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/comments/CommentTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/comments/CommentTest.java @@ -21,15 +21,6 @@ package com.github.javaparser.ast.comments; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -43,6 +34,12 @@ import com.github.javaparser.printer.configuration.Indentation; import com.github.javaparser.printer.configuration.Indentation.IndentType; import com.github.javaparser.printer.configuration.PrinterConfiguration; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.StaticJavaParser.parse; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.junit.jupiter.api.Assertions.*; class CommentTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/MethodReferenceExprTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/MethodReferenceExprTest.java index fc939fe808..aab7042521 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/MethodReferenceExprTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/MethodReferenceExprTest.java @@ -25,7 +25,6 @@ import static com.github.javaparser.utils.TestUtils.assertExpressionValid; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; class MethodReferenceExprTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/StringLiteralExprTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/StringLiteralExprTest.java index bafd1cad40..23e8aaf16a 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/StringLiteralExprTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/StringLiteralExprTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.StaticJavaParser.parseExpression; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class StringLiteralExprTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SuperExprTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SuperExprTest.java index 9ddfd0ddbb..ff04978f35 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SuperExprTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SuperExprTest.java @@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.StaticJavaParser.parseExpression; -import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; class SuperExprTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java index f0471da17d..fd38dc0a69 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/expr/SwitchExprTest.java @@ -24,8 +24,6 @@ import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.SwitchEntry; -import com.github.javaparser.ast.stmt.SwitchStmt; - import org.junit.jupiter.api.Test; import static com.github.javaparser.ast.stmt.SwitchEntry.Type.*; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithBodyTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithBodyTest.java index 1dc039bb82..67f6ceced0 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithBodyTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithBodyTest.java @@ -22,12 +22,11 @@ package com.github.javaparser.ast.nodeTypes; import com.github.javaparser.ast.stmt.ForStmt; -import com.github.javaparser.ast.stmt.IfStmt; -import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.utils.TestParser; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class NodeWithBodyTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadocTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadocTest.java index cfedb3ac26..774c0c9024 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadocTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadocTest.java @@ -28,7 +28,8 @@ import com.github.javaparser.ast.comments.LineComment; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class NodeWithJavadocTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java index 32d64edc64..ce82bbf633 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiersTest.java @@ -32,10 +32,7 @@ import java.util.LinkedList; import java.util.List; -import static com.github.javaparser.ast.Modifier.Keyword.PRIVATE; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; -import static com.github.javaparser.ast.Modifier.Keyword.SYNCHRONIZED; +import static com.github.javaparser.ast.Modifier.Keyword.*; import static com.github.javaparser.ast.Modifier.createModifierList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScopeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScopeTest.java index afbdd44cbe..323ce87cc3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScopeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalScopeTest.java @@ -21,14 +21,13 @@ package com.github.javaparser.ast.nodeTypes; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.ast.expr.ObjectCreationExpr; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class NodeWithOptionalScopeTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java index 5c0e241444..49f06ae340 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/SwitchStmtTest.java @@ -27,7 +27,7 @@ import static com.github.javaparser.StaticJavaParser.parseStatement; import static com.github.javaparser.ast.stmt.SwitchEntry.Type.EXPRESSION; import static com.github.javaparser.ast.stmt.SwitchEntry.Type.STATEMENT_GROUP; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class SwitchStmtTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/YieldStmtTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/YieldStmtTest.java index 6122c6ff10..7307edb994 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/YieldStmtTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/stmt/YieldStmtTest.java @@ -22,12 +22,7 @@ package com.github.javaparser.ast.stmt; import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.expr.BinaryExpr; -import com.github.javaparser.ast.expr.ConditionalExpr; -import com.github.javaparser.ast.expr.EnclosedExpr; -import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.NameExpr; - +import com.github.javaparser.ast.expr.*; import org.junit.jupiter.api.Test; import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_12; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java index 619b822391..3cbed2411e 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/ArrayTypeTest.java @@ -21,18 +21,6 @@ package com.github.javaparser.ast.type; -import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; -import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; -import static com.github.javaparser.StaticJavaParser.parseExpression; -import static com.github.javaparser.StaticJavaParser.parseName; -import static com.github.javaparser.StaticJavaParser.parseParameter; -import static com.github.javaparser.StaticJavaParser.parseStatement; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.Parameter; @@ -41,6 +29,12 @@ import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.stmt.ExpressionStmt; import com.github.javaparser.printer.ConcreteSyntaxModel; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.StaticJavaParser.*; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; class ArrayTypeTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/TypeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/TypeTest.java index 2e8a1abd94..6f7f155a7a 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/TypeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/type/TypeTest.java @@ -30,12 +30,11 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.ParseStart.VARIABLE_DECLARATION_EXPR; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.RAW; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.StaticJavaParser.parseType; import static com.github.javaparser.StaticJavaParser.parseVariableDeclarationExpr; import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertThrows; class TypeTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java14ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java14ValidatorTest.java index dde56a87bc..e412b2b04f 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java14ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java14ValidatorTest.java @@ -26,10 +26,8 @@ import com.github.javaparser.ParserConfiguration; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.utils.TestUtils; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentest4j.AssertionFailedError; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_14; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java index 4ba1bb6c60..e3e98f2256 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java @@ -24,24 +24,16 @@ import com.github.javaparser.JavaParser; import com.github.javaparser.ParseResult; import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.Problem; import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.expr.ArrayCreationExpr; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.stmt.Statement; -import com.github.javaparser.ast.type.PrimitiveType; -import com.github.javaparser.ast.validator.language_level_validations.Java1_0Validator; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.List; - import static com.github.javaparser.ParseStart.*; import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_1_0; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; -import static org.junit.jupiter.api.Assertions.assertEquals; class Java1_0ValidatorTest { public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_0)); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java index 0fa74e0a47..5956f31238 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java @@ -29,10 +29,8 @@ import com.github.javaparser.ast.stmt.Statement; import org.junit.jupiter.api.Test; -import static com.github.javaparser.ParseStart.COMPILATION_UNIT; -import static com.github.javaparser.ParseStart.EXPRESSION; -import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParseStart.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_1_1; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java index f994e47d43..8003a437f7 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java @@ -30,7 +30,7 @@ import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_1_2; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java index 39cd6f802e..fe223d110d 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_1_3; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java index a52f4eebf4..e4971334c5 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.ParseStart.*; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_1_4; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java index 514c1f8879..2c2b3426bb 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java @@ -30,7 +30,7 @@ import static com.github.javaparser.ParseStart.EXPRESSION; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_6; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java7ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java7ValidatorTest.java index 32a75ea1d1..70f53dbeac 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java7ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java7ValidatorTest.java @@ -33,12 +33,11 @@ import com.github.javaparser.ast.validator.language_level_validations.Java7Validator; import org.junit.jupiter.api.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import static com.github.javaparser.ParseStart.COMPILATION_UNIT; -import static com.github.javaparser.ParseStart.EXPRESSION; -import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParseStart.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_7; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java index aaa931ca1b..b326b75c51 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java @@ -30,7 +30,7 @@ import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_8; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers; import static com.github.javaparser.utils.TestUtils.assertNoProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java index 07e6bfcfa8..77ecc7a455 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java @@ -30,7 +30,7 @@ import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers; import static com.github.javaparser.utils.TestUtils.assertNoProblems; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/CloneVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/CloneVisitorTest.java index bf20141de1..14835b7c94 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/CloneVisitorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/CloneVisitorTest.java @@ -24,7 +24,6 @@ import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.*; -import com.github.javaparser.ast.expr.Name; import com.github.javaparser.ast.type.Type; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java index f02c4d52c3..61b22db40d 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/ModifierVisitorTest.java @@ -21,16 +21,6 @@ package com.github.javaparser.ast.visitor; -import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; -import static com.github.javaparser.StaticJavaParser.parseExpression; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.BodyDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; @@ -39,6 +29,13 @@ import com.github.javaparser.ast.expr.StringLiteralExpr; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; +import static com.github.javaparser.StaticJavaParser.parseExpression; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; class ModifierVisitorTest extends AbstractLexicalPreservingTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/TreeVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/TreeVisitorTest.java index ed5845bfcc..7017f32434 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/TreeVisitorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/TreeVisitorTest.java @@ -21,20 +21,19 @@ package com.github.javaparser.ast.visitor; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.StaticJavaParser.parseExpression; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.ArrayInitializerExpr; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.IntegerLiteralExpr; import com.github.javaparser.ast.expr.SimpleName; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.StaticJavaParser.parse; +import static com.github.javaparser.StaticJavaParser.parseExpression; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; class TreeVisitorTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/VoidVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/VoidVisitorTest.java index f3b8f44f85..9601a21707 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/VoidVisitorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/VoidVisitorTest.java @@ -21,16 +21,15 @@ package com.github.javaparser.ast.visitor; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import com.github.javaparser.JavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.expr.ObjectCreationExpr; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; public class VoidVisitorTest { @Test() diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java index 4ae051b817..f38fcc8d54 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/builders/CompilationUnitBuildersTest.java @@ -21,27 +21,23 @@ package com.github.javaparser.builders; -import static com.github.javaparser.StaticJavaParser.parseImport; -import static com.github.javaparser.ast.Modifier.Keyword.PRIVATE; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.lang.annotation.ElementType; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.PackageDeclaration; import com.github.javaparser.ast.body.AnnotationDeclaration; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.ast.expr.Name; +import org.junit.jupiter.api.Test; + +import java.lang.annotation.ElementType; +import java.util.Comparator; +import java.util.List; +import java.util.Map; + +import static com.github.javaparser.StaticJavaParser.parseImport; +import static com.github.javaparser.ast.Modifier.Keyword.PRIVATE; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.junit.jupiter.api.Assertions.*; class CompilationUnitBuildersTest { private final CompilationUnit cu = new CompilationUnit(); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java index 4f154964f3..27780c0764 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java @@ -1,19 +1,18 @@ package com.github.javaparser.issues; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.io.IOException; -import java.util.stream.Stream; - -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - import com.github.javaparser.Range; import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.MethodDeclaration; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import java.io.IOException; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue2627Test { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue3255Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue3255Test.java index 9ca37cb389..643006880c 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue3255Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue3255Test.java @@ -1,14 +1,13 @@ package com.github.javaparser.issues; -import static com.github.javaparser.utils.TestParser.parseStatement; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.JavaParser; import com.github.javaparser.ParseResult; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.utils.LineSeparator; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.utils.TestParser.parseStatement; +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue3255Test { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocExtractorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocExtractorTest.java index b29fe6fea2..f4a2db6baa 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocExtractorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/javadoc/JavadocExtractorTest.java @@ -29,7 +29,6 @@ import java.io.File; import java.io.FileNotFoundException; -import java.nio.charset.StandardCharsets; import static com.github.javaparser.StaticJavaParser.parse; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java index d11582c04f..921116f723 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java @@ -23,7 +23,6 @@ import com.github.javaparser.ParserConfiguration; import com.github.javaparser.Problem; -import com.github.javaparser.utils.CodeGenerationUtils; import com.github.javaparser.utils.Log; import com.github.javaparser.utils.SourceRoot; import com.github.javaparser.utils.SourceZip; @@ -42,8 +41,8 @@ import java.util.TreeMap; import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; -import static com.github.javaparser.utils.CodeGenerationUtils.*; import static com.github.javaparser.utils.CodeGenerationUtils.f; +import static com.github.javaparser.utils.CodeGenerationUtils.mavenModuleRoot; import static com.github.javaparser.utils.SourceRoot.Callback.Result.DONT_SAVE; import static com.github.javaparser.utils.TestUtils.download; import static com.github.javaparser.utils.TestUtils.temporaryDirectory; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java index 263f576890..dec8e699d8 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/ConcreteSyntaxModelAcceptanceTest.java @@ -21,17 +21,16 @@ package com.github.javaparser.printer; -import static com.github.javaparser.StaticJavaParser.parse; - -import java.io.IOException; -import java.nio.file.Path; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.utils.CodeGenerationUtils; import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.nio.file.Path; + +import static com.github.javaparser.StaticJavaParser.parse; class ConcreteSyntaxModelAcceptanceTest { private final Path rootDir = CodeGenerationUtils.mavenModuleRoot(ConcreteSyntaxModelAcceptanceTest.class).resolve("src/test/test_sourcecode"); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/DefaultPrettyPrinterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/DefaultPrettyPrinterTest.java index 8892ce751d..b148ad3b29 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/DefaultPrettyPrinterTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/DefaultPrettyPrinterTest.java @@ -37,6 +37,7 @@ import com.github.javaparser.printer.configuration.PrinterConfiguration; import com.github.javaparser.printer.configuration.imports.EclipseImportOrderingStrategy; import com.github.javaparser.printer.configuration.imports.IntelliJImportOrderingStrategy; + import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java index a1af7fb0ed..428ee7de55 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrintVisitorTest.java @@ -21,22 +21,7 @@ package com.github.javaparser.printer; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.utils.TestParser.parseBodyDeclaration; -import static com.github.javaparser.utils.TestParser.parseCompilationUnit; -import static com.github.javaparser.utils.TestParser.parseExpression; -import static com.github.javaparser.utils.TestParser.parseStatement; -import static com.github.javaparser.utils.TestParser.parseVariableDeclarationExpr; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Optional; - import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.utils.TestParser; -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.body.MethodDeclaration; @@ -52,6 +37,15 @@ import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration; import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption; import com.github.javaparser.printer.configuration.PrinterConfiguration; +import com.github.javaparser.utils.TestParser; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static com.github.javaparser.StaticJavaParser.parse; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.junit.jupiter.api.Assertions.assertEquals; class PrettyPrintVisitorTest extends TestParser { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java index 863eb9b043..d0e4cd431a 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrettyPrinterTest.java @@ -21,29 +21,7 @@ package com.github.javaparser.printer; -import static com.github.javaparser.ParseStart.COMPILATION_UNIT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; -import static com.github.javaparser.Providers.provider; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.StaticJavaParser.parseBodyDeclaration; -import static com.github.javaparser.StaticJavaParser.parseStatement; -import static com.github.javaparser.printer.configuration.Indentation.IndentType.TABS; -import static com.github.javaparser.printer.configuration.Indentation.IndentType.TABS_WITH_SPACE_ALIGN; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; -import java.util.function.Function; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.JavaParser; -import com.github.javaparser.ParseProblemException; -import com.github.javaparser.ParseResult; -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.StaticJavaParser; +import com.github.javaparser.*; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.FieldDeclaration; @@ -52,13 +30,22 @@ import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.type.PrimitiveType; import com.github.javaparser.ast.visitor.VoidVisitor; -import com.github.javaparser.printer.configuration.ConfigurationOption; -import com.github.javaparser.printer.configuration.DefaultConfigurationOption; -import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration; +import com.github.javaparser.printer.configuration.*; import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption; -import com.github.javaparser.printer.configuration.Indentation; import com.github.javaparser.printer.configuration.Indentation.IndentType; -import com.github.javaparser.printer.configuration.PrinterConfiguration; +import org.junit.jupiter.api.Test; + +import java.util.Optional; +import java.util.function.Function; + +import static com.github.javaparser.ParseStart.COMPILATION_UNIT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; +import static com.github.javaparser.Providers.provider; +import static com.github.javaparser.StaticJavaParser.*; +import static com.github.javaparser.printer.configuration.Indentation.IndentType.TABS; +import static com.github.javaparser.printer.configuration.Indentation.IndentType.TABS_WITH_SPACE_ALIGN; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static org.junit.jupiter.api.Assertions.*; class PrettyPrinterTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrinterConfigurationTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrinterConfigurationTest.java index 15985e5751..cbbf277a8b 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrinterConfigurationTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/PrinterConfigurationTest.java @@ -1,20 +1,16 @@ package com.github.javaparser.printer; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.printer.configuration.ConfigurationOption; import com.github.javaparser.printer.configuration.DefaultConfigurationOption; import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration; import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption; import com.github.javaparser.printer.configuration.PrinterConfiguration; import com.github.javaparser.utils.Utils; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; class PrinterConfigurationTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java index 9fe8982f86..64305601d2 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AbstractLexicalPreservingTest.java @@ -21,20 +21,19 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsString; -import static com.github.javaparser.utils.TestUtils.readResource; - -import java.io.IOException; - -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; - import com.github.javaparser.ParserConfiguration; import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.stmt.Statement; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; + +import java.io.IOException; + +import static com.github.javaparser.utils.TestUtils.assertEqualsString; +import static com.github.javaparser.utils.TestUtils.readResource; public abstract class AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AnnotationSpaceTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AnnotationSpaceTest.java index 05c03781c1..56888963f1 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AnnotationSpaceTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/AnnotationSpaceTest.java @@ -21,16 +21,13 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.ast.expr.MarkerAnnotationExpr; +import com.github.javaparser.ast.type.ClassOrInterfaceType; +import org.junit.jupiter.api.Test; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.expr.MarkerAnnotationExpr; -import com.github.javaparser.ast.type.ClassOrInterfaceType; +import static org.junit.jupiter.api.Assertions.assertTrue; public class AnnotationSpaceTest extends AbstractLexicalPreservingTest { /** Tests that inserted annotations on types are followed by a space. */ diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1467Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1467Test.java index 3397bd74b4..464f36d74b 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1467Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1467Test.java @@ -21,10 +21,6 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Modifier.Keyword; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -36,6 +32,7 @@ import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.stmt.ThrowStmt; import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; public class Issue1467Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1634Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1634Test.java index 8468fc776a..bab9e61482 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1634Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1634Test.java @@ -1,13 +1,10 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.ImportDeclaration; import com.github.javaparser.ast.NodeList; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue1634Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1766Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1766Test.java index 47388b858e..e70c195a50 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1766Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1766Test.java @@ -21,12 +21,8 @@ package com.github.javaparser.printer.lexicalpreservation; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; public class Issue1766Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1793Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1793Test.java index 45178aec0e..d3f6fa80c0 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1793Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue1793Test.java @@ -22,14 +22,12 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertEquals; - +import com.github.javaparser.ParserConfiguration; +import com.github.javaparser.StaticJavaParser; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; +import static org.junit.jupiter.api.Assertions.assertEquals; class Issue1793Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2137Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2137Test.java index 0c071706a7..b3c48d2d8c 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2137Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2137Test.java @@ -1,9 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - -import java.util.StringJoiner; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -25,15 +19,14 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.type.VoidType; -import com.github.javaparser.javadoc.Javadoc; -import com.github.javaparser.javadoc.description.JavadocDescription; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue2137Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2290Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2290Test.java index d3a4aadaf7..d4840c29c5 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2290Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2290Test.java @@ -21,17 +21,13 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.ast.stmt.ExpressionStmt; +import org.junit.jupiter.api.Test; import java.util.List; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.stmt.ExpressionStmt; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class Issue2290Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2374Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2374Test.java index 2799339c30..469d9301ce 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2374Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2374Test.java @@ -21,16 +21,14 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.stmt.Statement; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class Issue2374Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2393Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2393Test.java index 2a885baa1f..11c438d670 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2393Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2393Test.java @@ -21,12 +21,11 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.stmt.IfStmt; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue2393Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2517Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2517Test.java index 01b3e03998..2cb76c4e42 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2517Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2517Test.java @@ -1,9 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - -import java.util.StringJoiner; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -25,16 +19,14 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; -import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.ObjectCreationExpr; -import com.github.javaparser.javadoc.Javadoc; -import com.github.javaparser.javadoc.description.JavadocDescription; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue2517Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2592Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2592Test.java index 9da8f03258..ac85ce3d23 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2592Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2592Test.java @@ -1,16 +1,13 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.Parameter; import com.github.javaparser.ast.expr.SimpleName; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class Issue2592Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2610Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2610Test.java index faaf88eeae..e0c8a88a72 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2610Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2610Test.java @@ -21,14 +21,12 @@ package com.github.javaparser.printer.lexicalpreservation; -import java.util.Optional; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.expr.MethodCallExpr; +import org.junit.jupiter.api.Test; + +import java.util.Optional; public class Issue2610Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2620Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2620Test.java index a509b56290..cf699d3e9c 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2620Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2620Test.java @@ -21,16 +21,6 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.util.Optional; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -38,6 +28,13 @@ import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.type.ClassOrInterfaceType; import com.github.javaparser.utils.LineSeparator; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class Issue2620Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2806Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2806Test.java index 05c4414a64..1a2013861a 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2806Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue2806Test.java @@ -22,15 +22,13 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.JavaParser; -import com.github.javaparser.ParserConfiguration; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.ImportDeclaration; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; class Issue2806Test extends AbstractLexicalPreservingTest{ diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3296Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3296Test.java index 8113ee9283..5d9798404d 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3296Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3296Test.java @@ -1,10 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -26,13 +19,17 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static org.junit.jupiter.api.Assertions.assertTrue; public class Issue3296Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3358Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3358Test.java index ce654eb5a3..7d540ad5f6 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3358Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3358Test.java @@ -1,7 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static org.junit.jupiter.api.Assertions.assertTrue; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -23,10 +19,13 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Modifier.Keyword; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class Issue3358Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3387Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3387Test.java index d7dd2fd6fc..7ba2e8e82c 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3387Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3387Test.java @@ -1,9 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - -import java.util.StringJoiner; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -25,13 +19,16 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.javadoc.Javadoc; import com.github.javaparser.javadoc.description.JavadocDescription; +import org.junit.jupiter.api.Test; + +import java.util.StringJoiner; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue3387Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3440Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3440Test.java index ebba294909..1b49f93ec3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3440Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3440Test.java @@ -21,11 +21,10 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.stmt.SwitchEntry; import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; public class Issue3440Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3441Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3441Test.java index d2587880f6..d416364d72 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3441Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3441Test.java @@ -1,7 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -23,13 +19,13 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; -import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.Statement; -import com.github.javaparser.ast.stmt.SwitchEntry; -import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue3441Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3721Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3721Test.java index e7cfd48421..5258d6adcd 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3721Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3721Test.java @@ -1,7 +1,3 @@ -package com.github.javaparser.printer.lexicalpreservation; - -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - /* * Copyright (C) 2007-2010 Júlio Vilmar Gesser. * Copyright (C) 2011, 2013-2019 The JavaParser Team. @@ -23,9 +19,12 @@ * GNU Lesser General Public License for more details. */ -import org.junit.jupiter.api.Test; +package com.github.javaparser.printer.lexicalpreservation; import com.github.javaparser.ast.body.VariableDeclarator; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue3721Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3746Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3746Test.java index b28fc70843..58cb245786 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3746Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3746Test.java @@ -21,27 +21,12 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.util.List; -import java.util.Optional; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.Modifier; -import com.github.javaparser.ast.NodeList; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.github.javaparser.ast.body.FieldDeclaration; -import com.github.javaparser.ast.body.VariableDeclarator; import com.github.javaparser.ast.expr.MethodCallExpr; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.ExpressionStmt; -import com.github.javaparser.ast.type.ClassOrInterfaceType; -import com.github.javaparser.utils.LineSeparator; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue3746Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3750Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3750Test.java index dbd21a5234..c2692207ac 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3750Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3750Test.java @@ -21,24 +21,12 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; +import com.github.javaparser.ast.body.FieldDeclaration; +import org.junit.jupiter.api.Test; import java.util.List; -import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.Modifier; -import com.github.javaparser.ast.NodeList; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.github.javaparser.ast.body.FieldDeclaration; -import com.github.javaparser.ast.body.VariableDeclarator; -import com.github.javaparser.ast.type.ClassOrInterfaceType; -import com.github.javaparser.utils.LineSeparator; +import static org.junit.jupiter.api.Assertions.assertEquals; public class Issue3750Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java index 028d2d8238..1044618721 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java @@ -21,25 +21,14 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; +import com.github.javaparser.ast.Modifier; +import com.github.javaparser.ast.body.FieldDeclaration; +import org.junit.jupiter.api.Test; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.Modifier; -import com.github.javaparser.ast.NodeList; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.github.javaparser.ast.body.FieldDeclaration; -import com.github.javaparser.ast.body.VariableDeclarator; -import com.github.javaparser.ast.type.ClassOrInterfaceType; -import com.github.javaparser.utils.LineSeparator; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; public class Issue3761Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3773Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3773Test.java index 41859b1d51..4480bcfe58 100755 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3773Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3773Test.java @@ -22,24 +22,18 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; - -import java.util.List; - -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.expr.BinaryExpr; -import com.github.javaparser.ast.expr.Expression; -import com.github.javaparser.ast.expr.FieldAccessExpr; -import com.github.javaparser.ast.expr.IntegerLiteralExpr; -import com.github.javaparser.ast.expr.MethodCallExpr; -import com.github.javaparser.ast.expr.NameExpr; +import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.expr.BinaryExpr.Operator; import com.github.javaparser.ast.stmt.ExpressionStmt; import com.github.javaparser.ast.stmt.IfStmt; import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.visitor.ModifierVisitor; import com.github.javaparser.ast.visitor.Visitable; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; class Issue3773Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java index f19d266fc8..af4c523b08 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java @@ -21,18 +21,6 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.TokenTypes.eolTokenKind; -import static com.github.javaparser.TokenTypes.spaceTokenKind; -import static com.github.javaparser.ast.Modifier.createModifierList; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.util.List; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Node; @@ -43,12 +31,7 @@ import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.comments.JavadocComment; -import com.github.javaparser.ast.expr.AssignExpr; -import com.github.javaparser.ast.expr.FieldAccessExpr; -import com.github.javaparser.ast.expr.Name; -import com.github.javaparser.ast.expr.NameExpr; -import com.github.javaparser.ast.expr.SimpleName; -import com.github.javaparser.ast.expr.ThisExpr; +import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.ExpressionStmt; @@ -57,6 +40,17 @@ import com.github.javaparser.printer.concretesyntaxmodel.CsmElement; import com.github.javaparser.printer.concretesyntaxmodel.CsmToken; import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator.CsmChild; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.List; + +import static com.github.javaparser.TokenTypes.eolTokenKind; +import static com.github.javaparser.TokenTypes.spaceTokenKind; +import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.createModifierList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class LexicalDifferenceCalculatorTest extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java index 70be958d36..ebcb9b3356 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinterTest.java @@ -21,55 +21,34 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.StaticJavaParser.parse; -import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; -import static com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter.NODE_TEXT_DATA; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.GeneratedJavaParserConstants; import com.github.javaparser.JavaParser; import com.github.javaparser.ParserConfiguration; import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.ArrayCreationLevel; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.ImportDeclaration; -import com.github.javaparser.ast.Modifier; -import com.github.javaparser.ast.Node; -import com.github.javaparser.ast.NodeList; -import com.github.javaparser.ast.body.AnnotationDeclaration; -import com.github.javaparser.ast.body.AnnotationMemberDeclaration; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.github.javaparser.ast.body.FieldDeclaration; -import com.github.javaparser.ast.body.InitializerDeclaration; -import com.github.javaparser.ast.body.MethodDeclaration; -import com.github.javaparser.ast.body.Parameter; -import com.github.javaparser.ast.body.VariableDeclarator; +import com.github.javaparser.ast.*; +import com.github.javaparser.ast.body.*; import com.github.javaparser.ast.comments.LineComment; import com.github.javaparser.ast.expr.*; -import com.github.javaparser.ast.stmt.BlockStmt; -import com.github.javaparser.ast.stmt.CatchClause; -import com.github.javaparser.ast.stmt.ExpressionStmt; -import com.github.javaparser.ast.stmt.IfStmt; -import com.github.javaparser.ast.stmt.Statement; -import com.github.javaparser.ast.stmt.TryStmt; +import com.github.javaparser.ast.stmt.*; import com.github.javaparser.ast.type.Type; import com.github.javaparser.ast.type.UnionType; import com.github.javaparser.ast.type.VoidType; import com.github.javaparser.ast.visitor.ModifierVisitor; import com.github.javaparser.ast.visitor.Visitable; import com.github.javaparser.utils.TestUtils; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType; +import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter.NODE_TEXT_DATA; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; +import static org.junit.jupiter.api.Assertions.*; class LexicalPreservingPrinterTest extends AbstractLexicalPreservingTest { private NodeText getTextForNode(Node node) { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2340Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2340Test.java index 1ccd681269..df39f2f113 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2340Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2340Test.java @@ -21,16 +21,11 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.Optional; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.Modifier; import com.github.javaparser.ast.Modifier.Keyword; -import com.github.javaparser.ast.body.EnumDeclaration; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; class PrettyPrinterIssue2340Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2351Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2351Test.java index 0a67dd70e1..6b61e4c167 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2351Test.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/PrettyPrinterIssue2351Test.java @@ -21,13 +21,12 @@ package com.github.javaparser.printer.lexicalpreservation; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.ast.body.EnumDeclaration; +import org.junit.jupiter.api.Test; import java.util.Optional; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.body.EnumDeclaration; +import static org.junit.jupiter.api.Assertions.assertTrue; // manage java.lang.UnsupportedOperationException: Csm token token(}) NodeText TOKEN ";" <102> (line 1,col 39)-(line 1,col 39) class PrettyPrinterIssue2351Test extends AbstractLexicalPreservingTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java index 0d513acc9e..e416e41698 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/TransformationsTest.java @@ -21,14 +21,6 @@ package com.github.javaparser.printer.lexicalpreservation; -import static com.github.javaparser.ast.Modifier.Keyword.STATIC; -import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; - -import java.io.IOException; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.StaticJavaParser; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; @@ -40,9 +32,15 @@ import com.github.javaparser.ast.expr.NullLiteralExpr; import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.ReturnStmt; -import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.type.ArrayType; import com.github.javaparser.ast.type.PrimitiveType; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +import static com.github.javaparser.ast.Modifier.Keyword.STATIC; +import static com.github.javaparser.utils.TestUtils.assertEqualsStringIgnoringEol; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; /** * These tests are more "high level" than the ones in LexicalPreservingPrinterTest. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChangeTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChangeTest.java index 9bf98cc4d3..bcfcbb52ff 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChangeTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChangeTest.java @@ -1,16 +1,11 @@ package com.github.javaparser.printer.lexicalpreservation.changes; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.observer.ObservableProperty; import com.github.javaparser.ast.type.ClassOrInterfaceType; +import org.junit.jupiter.api.*; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; class NoChangeTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java index 5d87867ea2..3127b25811 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/ConstructorDeclarationTransformationsTest.java @@ -30,8 +30,6 @@ import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; import static com.github.javaparser.ast.Modifier.createModifierList; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java index 962818053e..6f2dd639e1 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/FieldDeclarationTransformationsTest.java @@ -21,16 +21,15 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import static com.github.javaparser.ast.Modifier.createModifierList; -import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; -import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; -import static com.github.javaparser.utils.Utils.SYSTEM_EOL; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; +import org.junit.jupiter.api.Test; + +import static com.github.javaparser.ast.Modifier.Keyword.PROTECTED; +import static com.github.javaparser.ast.Modifier.Keyword.PUBLIC; +import static com.github.javaparser.ast.Modifier.createModifierList; +import static com.github.javaparser.utils.Utils.SYSTEM_EOL; /** * Transforming FieldDeclaration and verifying the LexicalPreservation works as expected. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java index aba7349cb0..f8d33db01f 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/InitializerDeclarationTransformationsTest.java @@ -25,8 +25,6 @@ import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; import org.junit.jupiter.api.Test; -import java.io.IOException; - /** * Transforming InitializerDeclaration and verifying the LexicalPreservation works as expected. */ diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/OperatorTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/OperatorTransformationsTest.java index 5355b4bb51..d0c5b23eaa 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/OperatorTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/OperatorTransformationsTest.java @@ -21,13 +21,10 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import java.io.IOException; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.expr.IntegerLiteralExpr; import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; +import org.junit.jupiter.api.Test; /** * Transforming BinaryExpr and verifying the LexicalPreservation works as expected. diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java index b3d6f54efc..a48cd2124f 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/StatementTransformationsTest.java @@ -21,15 +21,12 @@ package com.github.javaparser.printer.lexicalpreservation.transformations.ast.body; -import java.io.IOException; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.NameExpr; import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; +import org.junit.jupiter.api.Test; import static com.github.javaparser.StaticJavaParser.parseStatement; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java index ee647039f2..8b5b7376e1 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/remove/NodeRemovalTest.java @@ -29,15 +29,13 @@ import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.printer.lexicalpreservation.AbstractLexicalPreservingTest; -import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; - import org.junit.jupiter.api.Test; +import java.util.List; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; - class NodeRemovalTest extends AbstractLexicalPreservingTest{ private final CompilationUnit compilationUnit = new CompilationUnit(); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/CodeGenerationUtilsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/CodeGenerationUtilsTest.java index 30ebadd24f..98256ddeb0 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/CodeGenerationUtilsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/CodeGenerationUtilsTest.java @@ -24,7 +24,8 @@ import org.junit.jupiter.api.Test; import static com.github.javaparser.utils.CodeGenerationUtils.*; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; class CodeGenerationUtilsTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/LogTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/LogTest.java index b233d5f344..1798af3518 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/LogTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/LogTest.java @@ -27,7 +27,7 @@ import java.util.function.Supplier; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class LogTest { private static class TestAdapter implements Log.Adapter { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java index e02650e4e5..4c159aa4e7 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/ParserCollectionStrategyTest.java @@ -21,20 +21,19 @@ package com.github.javaparser.utils; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; -import static com.github.javaparser.utils.CodeGenerationUtils.mavenModuleRoot; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.github.javaparser.ParseResult; +import com.github.javaparser.ParserConfiguration; +import com.github.javaparser.ast.CompilationUnit; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Path; import java.util.List; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ParseResult; -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.ast.CompilationUnit; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; +import static com.github.javaparser.utils.CodeGenerationUtils.mavenModuleRoot; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; class ParserCollectionStrategyTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceRootTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceRootTest.java index d0b88194ef..34397866c3 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceRootTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceRootTest.java @@ -21,9 +21,14 @@ package com.github.javaparser.utils; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.ParseProblemException; +import com.github.javaparser.ParseResult; +import com.github.javaparser.ParserConfiguration; +import com.github.javaparser.ast.CompilationUnit; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import java.io.IOException; import java.nio.file.Files; @@ -31,15 +36,7 @@ import java.nio.file.Paths; import java.util.List; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.MockedStatic; -import org.mockito.Mockito; - -import com.github.javaparser.ParseProblemException; -import com.github.javaparser.ParseResult; -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.ast.CompilationUnit; +import static org.junit.jupiter.api.Assertions.*; class SourceRootTest { private final Path root = CodeGenerationUtils.mavenModuleRoot(SourceRootTest.class).resolve("src/test/resources/com/github/javaparser/utils/"); diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceZipTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceZipTest.java index 8f1b9c74e5..7d6aeac817 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceZipTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/SourceZipTest.java @@ -26,15 +26,12 @@ import org.junit.jupiter.api.Test; import java.io.IOException; -import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; class SourceZipTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestParser.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestParser.java index 903dffc022..e7f7f647e7 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestParser.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestParser.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; -import static com.github.javaparser.ParserConfiguration.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel; import static com.github.javaparser.ParserConfiguration.LanguageLevel.BLEEDING_EDGE; import static org.junit.jupiter.api.Assertions.fail; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestUtils.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestUtils.java index 00dfa9d96a..117a7542a6 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestUtils.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/TestUtils.java @@ -21,12 +21,7 @@ package com.github.javaparser.utils; -import com.github.javaparser.JavaParser; -import com.github.javaparser.ParseResult; -import com.github.javaparser.ParseStart; -import com.github.javaparser.ParserConfiguration; -import com.github.javaparser.Position; -import com.github.javaparser.Problem; +import com.github.javaparser.*; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.expr.Expression; @@ -34,12 +29,7 @@ import okhttp3.Request; import okhttp3.Response; -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Files; diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java index 65cbe91a41..52157e0821 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/UtilsTest.java @@ -21,6 +21,8 @@ package com.github.javaparser.utils; +import org.junit.jupiter.api.Test; + import java.io.IOException; import java.io.Reader; import java.util.ArrayList; @@ -28,13 +30,9 @@ import java.util.HashSet; import java.util.Optional; -import org.junit.jupiter.api.Test; - +import static com.github.javaparser.utils.Utils.assertNotNull; import static com.github.javaparser.utils.Utils.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; class UtilsTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorListTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorListTest.java index 2a5d43a7aa..bd7d5958fe 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorListTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorListTest.java @@ -21,19 +21,18 @@ package com.github.javaparser.utils; -import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.github.javaparser.ast.CompilationUnit; +import com.github.javaparser.ast.visitor.ObjectIdentityEqualsVisitor; +import com.github.javaparser.ast.visitor.ObjectIdentityHashCodeVisitor; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.junit.jupiter.api.Test; - -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.visitor.ObjectIdentityEqualsVisitor; -import com.github.javaparser.ast.visitor.ObjectIdentityHashCodeVisitor; +import static com.github.javaparser.StaticJavaParser.parse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class VisitorListTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorMapTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorMapTest.java index 1e55f03258..47088c17c9 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorMapTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorMapTest.java @@ -30,9 +30,7 @@ import java.util.Map; import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; class VisitorMapTest { @Test diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorSetTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorSetTest.java index 32913d5bff..cb7a373b84 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorSetTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/utils/VisitorSetTest.java @@ -21,21 +21,16 @@ package com.github.javaparser.utils; -import static com.github.javaparser.StaticJavaParser.parse; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.visitor.ObjectIdentityEqualsVisitor; import com.github.javaparser.ast.visitor.ObjectIdentityHashCodeVisitor; +import org.junit.jupiter.api.Test; + +import java.util.*; + +import static com.github.javaparser.StaticJavaParser.parse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; class VisitorSetTest { diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java index 10b104308e..510bb84c87 100644 --- a/javaparser-core-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java +++ b/javaparser-core-testing/src/test/java/com/github/javaparser/version/Java10PostProcessorTest.java @@ -21,20 +21,19 @@ package com.github.javaparser.version; -import static com.github.javaparser.ParseStart.STATEMENT; -import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10; -import static com.github.javaparser.Providers.provider; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; - -import org.junit.jupiter.api.Test; - import com.github.javaparser.JavaParser; import com.github.javaparser.ParseResult; import com.github.javaparser.ParserConfiguration; import com.github.javaparser.ast.stmt.Statement; import com.github.javaparser.ast.type.VarType; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_10; +import static com.github.javaparser.Providers.provider; +import static org.junit.jupiter.api.Assertions.assertEquals; class Java10PostProcessorTest { public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_10));