Merge pull request #3802 from 4everTheOne/improvement/organized-impor…

…ts-core-testing Part 2 | Import organization
javaparser · Dec 19, 2022 · e72e340 · e72e340
2 parents 913a2e7 + 5bce775
commit e72e340
Show file tree

Hide file tree

Showing 107 changed files with 388 additions and 685 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...core-testing/src/test/java/com/github/javaparser/UnicodeEscapeProcessingProviderTest.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...arser-core-testing/src/test/java/com/github/javaparser/ast/body/FieldDeclarationTest.java b/...arser-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/...rser-core-testing/src/test/java/com/github/javaparser/ast/body/MethodDeclarationTest.java b/...rser-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/...rser-core-testing/src/test/java/com/github/javaparser/ast/body/RecordDeclarationTest.java b/...rser-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/...parser-core-testing/src/test/java/com/github/javaparser/ast/body/TypeDeclarationTest.java b/...parser-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
@@ -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 {