This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new ed67bad4 Organize imports
ed67bad4 is described below
commit ed67bad4753d5ff7b62ca807b9553713a6e05d2e
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Mon Aug 15 19:47:57 2022 -0400
Organize imports
---
src/examples/Mini/ASCII_CharStream.java | 2 ++
.../java/org/apache/bcel/classfile/JavaClass.java | 4 ++--
.../org/apache/bcel/classfile/ModulePackages.java | 2 +-
.../java/org/apache/bcel/classfile/StackMapEntry.java | 1 +
src/main/java/org/apache/bcel/generic/MethodGen.java | 6 +++---
.../apache/bcel/util/AbstractClassPathRepository.java | 6 +++---
.../org/apache/bcel/verifier/GraphicalVerifier.java | 1 +
.../org/apache/bcel/verifier/VerifierAppFrame.java | 1 +
src/test/java/org/apache/bcel/AbstractTestCase.java | 4 ++--
.../org/apache/bcel/AnnotationAccessFlagTestCase.java | 6 +++---
.../bcel/AnnotationDefaultAttributeTestCase.java | 4 ++--
.../java/org/apache/bcel/AnonymousClassTestCase.java | 6 +++---
.../java/org/apache/bcel/CounterVisitorTestCase.java | 4 ++--
.../java/org/apache/bcel/ElementValueGenTestCase.java | 6 +++---
.../apache/bcel/EnclosingMethodAttributeTestCase.java | 6 +++---
.../java/org/apache/bcel/EnumAccessFlagTestCase.java | 6 +++---
.../org/apache/bcel/InstructionFinderTestCase.java | 4 ++--
src/test/java/org/apache/bcel/PLSETestCase.java | 9 +++++----
src/test/java/org/apache/bcel/PerformanceTest.java | 4 ++--
.../apache/bcel/classfile/ConstantPoolTestCase.java | 4 ++--
.../org/apache/bcel/classfile/UtilityTestCase.java | 4 ++--
src/test/java/org/apache/bcel/data/ConstantPoolX.java | 19 ++++++++++++++++++-
.../apache/bcel/generic/AnnotationGenTestCase.java | 8 ++++----
.../org/apache/bcel/generic/BranchHandleTestCase.java | 4 ++--
.../apache/bcel/generic/FieldAnnotationsTestCase.java | 6 +++---
.../generic/GeneratingAnnotatedClassesTestCase.java | 8 ++++----
.../bcel/generic/InstructionHandleTestCase.java | 4 ++--
.../org/apache/bcel/generic/JiraBcel362TestCase.java | 6 +++---
.../org/apache/bcel/generic/MethodGenTestCase.java | 16 ++++++++--------
.../java/org/apache/bcel/generic/TypeTestCase.java | 4 ++--
.../java/org/apache/bcel/util/BCELifierTestCase.java | 7 ++++---
.../java/org/apache/bcel/util/Class2HTMLTestCase.java | 4 ++--
.../apache/bcel/util/ClassPathRepositoryTestCase.java | 10 +++++-----
.../java/org/apache/bcel/util/ClassPathTestCase.java | 4 ++--
.../org/apache/bcel/util/InstructionFinderTest.java | 4 ++--
.../apache/bcel/util/ModularRuntimeImageTestCase.java | 8 ++++----
.../bcel/verifier/AbstractVerifierTestCase.java | 6 +++---
.../org/apache/bcel/verifier/VerifierTestCase.java | 4 ++--
.../bcel/verifier/VerifyBadClassesTestCase.java | 12 ++++++------
.../bcel/verifier/tests/TestArrayAccess02Creator.java | 4 ++--
.../bcel/verifier/tests/TestArrayAccess03Creator.java | 4 ++--
.../bcel/verifier/tests/TestArrayAccess04Creator.java | 4 ++--
.../bcel/verifier/tests/TestReturn01Creator.java | 4 ++--
.../bcel/verifier/tests/TestReturn03Creator.java | 4 ++--
.../java/org/apache/bcel/visitors/CounterVisitor.java | 4 ++--
45 files changed, 136 insertions(+), 112 deletions(-)
diff --git a/src/examples/Mini/ASCII_CharStream.java
b/src/examples/Mini/ASCII_CharStream.java
index b6db95fa..6797aa41 100644
--- a/src/examples/Mini/ASCII_CharStream.java
+++ b/src/examples/Mini/ASCII_CharStream.java
@@ -18,6 +18,8 @@
/* Generated By:JavaCC: Do not edit this line. ASCII_CharStream.java Version
0.7pre6 */
package Mini;
+import java.io.IOException;
+
/**
* An implementation of interface CharStream, where the stream is assumed to
* contain only ASCII characters (without unicode processing).
diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java
b/src/main/java/org/apache/bcel/classfile/JavaClass.java
index 50fda405..e94f8492 100644
--- a/src/main/java/org/apache/bcel/classfile/JavaClass.java
+++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -24,10 +24,10 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Objects;
-import java.util.StringTokenizer;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.TreeSet;
import org.apache.bcel.Const;
diff --git a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
index 7b3b2e6b..7788bcbd 100644
--- a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
+++ b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
@@ -21,8 +21,8 @@ import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.bcel.Const;
+import org.apache.commons.lang3.ArrayUtils;
/**
* This class is derived from <em>Attribute</em> and represents the list of
packages that are exported or opened by the Module attribute.
diff --git a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
index 04b44588..48071afd 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMapEntry.java
@@ -20,6 +20,7 @@ package org.apache.bcel.classfile;
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
+
import org.apache.bcel.Const;
/**
diff --git a/src/main/java/org/apache/bcel/generic/MethodGen.java
b/src/main/java/org/apache/bcel/generic/MethodGen.java
index 026a2e40..3fce4d9a 100644
--- a/src/main/java/org/apache/bcel/generic/MethodGen.java
+++ b/src/main/java/org/apache/bcel/generic/MethodGen.java
@@ -18,12 +18,12 @@
package org.apache.bcel.generic;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Comparator;
-import java.util.Objects;
+import java.util.Hashtable;
import java.util.List;
+import java.util.Objects;
import java.util.Stack;
-import java.util.Hashtable;
-import java.util.Arrays;
import org.apache.bcel.Const;
import org.apache.bcel.classfile.AnnotationEntry;
diff --git
a/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
b/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
index b60c2884..15969e6f 100644
--- a/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
+++ b/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
@@ -17,12 +17,12 @@
*/
package org.apache.bcel.util;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.JavaClass;
-
import java.io.IOException;
import java.io.InputStream;
+import org.apache.bcel.classfile.ClassParser;
+import org.apache.bcel.classfile.JavaClass;
+
/**
* This abstract class provides a logic of a loading {@link JavaClass} objects
class names via {@link ClassPath}.
*
diff --git a/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
b/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
index 26597a37..d6902202 100644
--- a/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
@@ -19,6 +19,7 @@ package org.apache.bcel.verifier;
import java.awt.Dimension;
import java.awt.Toolkit;
+
import javax.swing.UIManager;
import org.apache.bcel.generic.Type;
diff --git a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
index 9f9fdcce..a607da3e 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
@@ -25,6 +25,7 @@ import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.WindowEvent;
+
import javax.swing.BorderFactory;
import javax.swing.JFrame;
import javax.swing.JList;
diff --git a/src/test/java/org/apache/bcel/AbstractTestCase.java
b/src/test/java/org/apache/bcel/AbstractTestCase.java
index d7ad5e66..70bc700c 100644
--- a/src/test/java/org/apache/bcel/AbstractTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractTestCase.java
@@ -18,6 +18,8 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -37,8 +39,6 @@ import org.apache.bcel.generic.SimpleElementValueGen;
import org.apache.bcel.util.ClassPath;
import org.apache.bcel.util.SyntheticRepository;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public abstract class AbstractTestCase
{
private static final boolean verbose = false;
diff --git a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
index 9ac5e811..b22500b4 100644
--- a/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java
@@ -18,12 +18,12 @@
package org.apache.bcel;
-import org.apache.bcel.classfile.JavaClass;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.bcel.classfile.JavaClass;
+import org.junit.jupiter.api.Test;
+
public class AnnotationAccessFlagTestCase extends AbstractTestCase
{
/**
diff --git
a/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
index ebcd7bbf..f8b91339 100644
--- a/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java
@@ -18,6 +18,8 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.bcel.classfile.AnnotationDefault;
import org.apache.bcel.classfile.ElementValue;
import org.apache.bcel.classfile.JavaClass;
@@ -25,8 +27,6 @@ import org.apache.bcel.classfile.Method;
import org.apache.bcel.classfile.SimpleElementValue;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class AnnotationDefaultAttributeTestCase extends AbstractTestCase
{
/**
diff --git a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
index 50425160..75feb8d2 100644
--- a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
+++ b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
@@ -18,12 +18,12 @@
package org.apache.bcel;
-import org.apache.bcel.classfile.JavaClass;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.bcel.classfile.JavaClass;
+import org.junit.jupiter.api.Test;
+
public class AnonymousClassTestCase extends AbstractTestCase
{
@Test
diff --git a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
index f442d3fe..3f2fad46 100644
--- a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
+++ b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
@@ -18,11 +18,11 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.bcel.classfile.JavaClass;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase
{
@Override
diff --git a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
index 2da5e658..875bbfd1 100644
--- a/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
+++ b/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
@@ -18,6 +18,9 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -33,9 +36,6 @@ import org.apache.bcel.generic.ObjectType;
import org.apache.bcel.generic.SimpleElementValueGen;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class ElementValueGenTestCase extends AbstractTestCase
{
private void checkSerialize(final ElementValueGen evgBefore, final
ConstantPoolGen cpg) throws IOException {
diff --git
a/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
index 141b9c01..a147f759 100644
--- a/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
+++ b/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java
@@ -18,6 +18,9 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.File;
import java.io.IOException;
@@ -28,9 +31,6 @@ import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.util.SyntheticRepository;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class EnclosingMethodAttributeTestCase extends AbstractTestCase
{
/**
diff --git a/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
index df488c4d..ddcfa7a4 100644
--- a/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
+++ b/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java
@@ -18,12 +18,12 @@
package org.apache.bcel;
-import org.apache.bcel.classfile.JavaClass;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.bcel.classfile.JavaClass;
+import org.junit.jupiter.api.Test;
+
public class EnumAccessFlagTestCase extends AbstractTestCase
{
/**
diff --git a/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
index e0999750..d16e6d8e 100644
--- a/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
+++ b/src/test/java/org/apache/bcel/InstructionFinderTestCase.java
@@ -17,6 +17,8 @@
*/
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Iterator;
import org.apache.bcel.classfile.JavaClass;
@@ -26,8 +28,6 @@ import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.util.InstructionFinder;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class InstructionFinderTestCase extends AbstractTestCase
{
@Test
diff --git a/src/test/java/org/apache/bcel/PLSETestCase.java
b/src/test/java/org/apache/bcel/PLSETestCase.java
index 701baa25..19cd1f2f 100644
--- a/src/test/java/org/apache/bcel/PLSETestCase.java
+++ b/src/test/java/org/apache/bcel/PLSETestCase.java
@@ -18,6 +18,11 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.util.stream.Stream;
+
import org.apache.bcel.classfile.Code;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.LineNumber;
@@ -35,10 +40,6 @@ import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.Type;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import java.util.stream.Stream;
-
public class PLSETestCase extends AbstractTestCase
{
/**
diff --git a/src/test/java/org/apache/bcel/PerformanceTest.java
b/src/test/java/org/apache/bcel/PerformanceTest.java
index 91e50878..0c7ea289 100644
--- a/src/test/java/org/apache/bcel/PerformanceTest.java
+++ b/src/test/java/org/apache/bcel/PerformanceTest.java
@@ -18,6 +18,8 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
@@ -34,8 +36,6 @@ import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.fail;
-
public final class PerformanceTest {
private static final boolean REPORT =
Boolean.parseBoolean(System.getProperty("PerformanceTest.report", "true"));
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 6bd0d586..fae5bcf7 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -17,6 +17,8 @@
package org.apache.bcel.classfile;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import org.apache.bcel.AbstractTestCase;
import org.apache.bcel.generic.ConstantPoolGen;
import org.apache.bcel.generic.InstructionHandle;
@@ -24,8 +26,6 @@ import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class ConstantPoolTestCase extends AbstractTestCase {
private InstructionHandle[] getInstructionHandles(final JavaClass clazz,
final ConstantPoolGen cp, final Method method) {
diff --git a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
index 378eba65..940298a6 100644
--- a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
@@ -17,10 +17,10 @@
package org.apache.bcel.classfile;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class UtilityTestCase {
@Test
diff --git a/src/test/java/org/apache/bcel/data/ConstantPoolX.java
b/src/test/java/org/apache/bcel/data/ConstantPoolX.java
index b44a23bc..73c6a09d 100644
--- a/src/test/java/org/apache/bcel/data/ConstantPoolX.java
+++ b/src/test/java/org/apache/bcel/data/ConstantPoolX.java
@@ -28,7 +28,24 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.bcel.Const;
-import org.apache.bcel.classfile.*;
+import org.apache.bcel.classfile.ClassFormatException;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantCP;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantDouble;
+import org.apache.bcel.classfile.ConstantFloat;
+import org.apache.bcel.classfile.ConstantInteger;
+import org.apache.bcel.classfile.ConstantInvokeDynamic;
+import org.apache.bcel.classfile.ConstantLong;
+import org.apache.bcel.classfile.ConstantMethodHandle;
+import org.apache.bcel.classfile.ConstantMethodType;
+import org.apache.bcel.classfile.ConstantModule;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPackage;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.Node;
+import org.apache.bcel.classfile.Utility;
/**
* This class represents the constant pool, i.e., a table of constants, of
diff --git a/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
index 855186b6..94b7603e 100644
--- a/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/AnnotationGenTestCase.java
@@ -17,6 +17,10 @@
package org.apache.bcel.generic;
+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.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
@@ -33,10 +37,6 @@ import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class AnnotationGenTestCase extends AbstractTestCase
{
private void checkSerialize(final AnnotationEntryGen a, final
ConstantPoolGen cpg) throws IOException
diff --git a/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
index 21bd3feb..2b46e3e4 100644
--- a/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
@@ -17,11 +17,11 @@
*/
package org.apache.bcel.generic;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class BranchHandleTestCase {
@Test
diff --git
a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
index 4f64e314..325491d5 100644
--- a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
@@ -18,6 +18,9 @@
package org.apache.bcel.generic;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -29,9 +32,6 @@ import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.util.SyntheticRepository;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class FieldAnnotationsTestCase extends AbstractTestCase
{
// helper methods
diff --git
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index 747d7b12..c8cc8190 100644
---
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -17,6 +17,10 @@
*/
package org.apache.bcel.generic;
+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.File;
import java.util.ArrayList;
import java.util.List;
@@ -34,10 +38,6 @@ import org.apache.bcel.classfile.SimpleElementValue;
import org.apache.bcel.util.SyntheticRepository;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
/**
* The program that some of the tests generate looks like this:
*
diff --git
a/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
index 733b877e..4946ce5d 100644
--- a/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
@@ -17,11 +17,11 @@
*/
package org.apache.bcel.generic;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
+
public class InstructionHandleTestCase {
// Test that setInstruction only allows Instructions that are not
BranchInstructions
diff --git a/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
b/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
index 53f06f27..42a737ed 100644
--- a/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JiraBcel362TestCase.java
@@ -17,13 +17,13 @@
package org.apache.bcel.generic;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.bcel.AbstractTestCase;
import org.apache.bcel.classfile.JavaClass;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Verify that a constant pool containing dynamic constants (condy) - in this
case created by JaCoCo -
* can be read and the corresponding constant is found after parsing.
diff --git a/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
b/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
index 30abcb98..8d69316f 100644
--- a/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/MethodGenTestCase.java
@@ -17,14 +17,6 @@
package org.apache.bcel.generic;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,6 +25,14 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.junit.jupiter.api.Test;
+
public class MethodGenTestCase {
@interface A {
diff --git a/src/test/java/org/apache/bcel/generic/TypeTestCase.java
b/src/test/java/org/apache/bcel/generic/TypeTestCase.java
index 93537d9e..13512ddb 100644
--- a/src/test/java/org/apache/bcel/generic/TypeTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/TypeTestCase.java
@@ -17,10 +17,10 @@
*/
package org.apache.bcel.generic;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
public class TypeTestCase {
@Test
public void testBCEL243() {
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index 0a643bf1..7a9779e1 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -17,18 +17,19 @@
*/
package org.apache.bcel.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+
import org.apache.bcel.classfile.JavaClass;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class BCELifierTestCase {
diff --git a/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
b/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
index 4a9e68fd..a56dff07 100644
--- a/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
+++ b/src/test/java/org/apache/bcel/util/Class2HTMLTestCase.java
@@ -17,14 +17,14 @@
package org.apache.bcel.util;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.FileInputStream;
import org.apache.bcel.classfile.ClassParser;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
public class Class2HTMLTestCase {
@Test
diff --git
a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
index e256a1da..601bdee3 100644
--- a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
@@ -17,16 +17,16 @@
*/
package org.apache.bcel.util;
-import java.io.IOException;
-
-import org.apache.bcel.classfile.JavaClass;
-import org.junit.jupiter.api.Test;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import java.io.IOException;
+
+import org.apache.bcel.classfile.JavaClass;
+import org.junit.jupiter.api.Test;
+
/**
* Tests {@link ClassPathRepository}, {@link
MemorySensitiveClassPathRepository}, and {@link
* LruCacheClassPathRepository} for their common attributes of caching.
diff --git a/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
b/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
index 37fcb736..ef66d9ad 100644
--- a/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
@@ -18,14 +18,14 @@
package org.apache.bcel.util;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.InputStream;
import org.apache.bcel.AbstractTestCase;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class ClassPathTestCase extends AbstractTestCase {
@Test
diff --git a/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
index 292fb6aa..39d92cc8 100644
--- a/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
+++ b/src/test/java/org/apache/bcel/util/InstructionFinderTest.java
@@ -18,6 +18,8 @@
package org.apache.bcel.util;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Iterator;
import org.apache.bcel.AbstractTestCase;
@@ -28,8 +30,6 @@ import org.apache.bcel.generic.InstructionHandle;
import org.apache.bcel.generic.InstructionList;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class InstructionFinderTest extends AbstractTestCase {
@Test
diff --git
a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
index c6c04a76..18903ba2 100644
--- a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
@@ -18,6 +18,10 @@
package org.apache.bcel.util;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
@@ -28,10 +32,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
/**
* Tests {@link ModularRuntimeImage}.
*/
diff --git
a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
index 3f2ba5d6..06517091 100644
--- a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
@@ -18,12 +18,12 @@
package org.apache.bcel.verifier;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.bcel.Repository;
+import org.apache.bcel.classfile.JavaClass;
+
public abstract class AbstractVerifierTestCase {
public static final String TEST_PACKAGE =
AbstractVerifierTestCase.class.getPackage().getName() + ".tests.";
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index 4c6dae7a..784440ae 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -18,11 +18,11 @@
package org.apache.bcel.verifier;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Collection;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
public class VerifierTestCase {
diff --git
a/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
index c59f7dfd..ebbaa43f 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
@@ -17,24 +17,24 @@
package org.apache.bcel.verifier;
-import java.io.File;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecuteResultHandler;
import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.PumpStreamHandler;
-
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
/**
* Test a number of BCEL issues related to running the Verifier on
* a bad or malformed .class file and having it die with an exception
diff --git
a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
index ac6e2705..5da892ea 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess02Creator.java
@@ -17,6 +17,8 @@
*/
package org.apache.bcel.verifier.tests;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -32,8 +34,6 @@ import org.apache.bcel.generic.ObjectType;
import org.apache.bcel.generic.PUSH;
import org.apache.bcel.generic.Type;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class TestArrayAccess02Creator extends TestCreator {
private final InstructionFactory _factory;
private final ConstantPoolGen _cp;
diff --git
a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
index 9ae7db60..befec0e1 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess03Creator.java
@@ -17,6 +17,8 @@
*/
package org.apache.bcel.verifier.tests;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -32,8 +34,6 @@ import org.apache.bcel.generic.ObjectType;
import org.apache.bcel.generic.PUSH;
import org.apache.bcel.generic.Type;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class TestArrayAccess03Creator extends TestCreator {
private final InstructionFactory _factory;
private final ConstantPoolGen _cp;
diff --git
a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
index d29c2fd6..50012e43 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess04Creator.java
@@ -18,6 +18,8 @@
package org.apache.bcel.verifier.tests;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -32,8 +34,6 @@ import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.PUSH;
import org.apache.bcel.generic.Type;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class TestArrayAccess04Creator extends TestCreator {
private final InstructionFactory _factory;
private final ConstantPoolGen _cp;
diff --git
a/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
index 662c3c99..c404662b 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn01Creator.java
@@ -17,6 +17,8 @@
*/
package org.apache.bcel.verifier.tests;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -30,8 +32,6 @@ import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.Type;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class TestReturn01Creator extends TestCreator {
private final InstructionFactory _factory;
private final ConstantPoolGen _cp;
diff --git
a/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
index f88f3e76..0f043932 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/TestReturn03Creator.java
@@ -17,6 +17,8 @@
*/
package org.apache.bcel.verifier.tests;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.IOException;
import java.io.OutputStream;
@@ -30,8 +32,6 @@ import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
import org.apache.bcel.generic.Type;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
public class TestReturn03Creator extends TestCreator {
private final InstructionFactory _factory;
private final ConstantPoolGen _cp;
diff --git a/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
b/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
index 59ed19f7..bf686eab 100644
--- a/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
+++ b/src/test/java/org/apache/bcel/visitors/CounterVisitor.java
@@ -60,11 +60,11 @@ import org.apache.bcel.classfile.MethodParameter;
import org.apache.bcel.classfile.MethodParameters;
import org.apache.bcel.classfile.Module;
import org.apache.bcel.classfile.ModuleExports;
+import org.apache.bcel.classfile.ModuleMainClass;
import org.apache.bcel.classfile.ModuleOpens;
+import org.apache.bcel.classfile.ModulePackages;
import org.apache.bcel.classfile.ModuleProvides;
import org.apache.bcel.classfile.ModuleRequires;
-import org.apache.bcel.classfile.ModuleMainClass;
-import org.apache.bcel.classfile.ModulePackages;
import org.apache.bcel.classfile.NestHost;
import org.apache.bcel.classfile.NestMembers;
import org.apache.bcel.classfile.ParameterAnnotationEntry;
