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
commit 430d90de1bc512a5d9c42ca957f6edf7662ad817 Author: Gary David Gregory (Code signing key) <ggreg...@apache.org> AuthorDate: Tue Apr 25 13:47:47 2023 -0400 Organize imports --- .../java/org/apache/bcel/AnnotationEntryTest.java | 12 ++++++------ .../apache/bcel/classfile/ConstantPoolTestCase.java | 1 + .../classfile/InvalidMethodSigantureTestCase.java | 1 - .../org/apache/bcel/classfile/SignatureTestCase.java | 12 ++++++------ .../org/apache/bcel/classfile/UtilityTestCase.java | 3 ++- .../org/apache/bcel/generic/BinaryOpCreator.java | 12 ++++++------ .../bcel/generic/InstructionFactoryTestCase.java | 13 +++++++------ .../apache/bcel/verifier/VerifierMainTestCase.java | 20 ++++++++++---------- 8 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/test/java/org/apache/bcel/AnnotationEntryTest.java b/src/test/java/org/apache/bcel/AnnotationEntryTest.java index 7a3b7808..77238583 100644 --- a/src/test/java/org/apache/bcel/AnnotationEntryTest.java +++ b/src/test/java/org/apache/bcel/AnnotationEntryTest.java @@ -17,17 +17,17 @@ package org.apache.bcel; -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.ElementValuePair; -import org.apache.bcel.classfile.SimpleElementValue; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.bcel.classfile.AnnotationEntry; +import org.apache.bcel.classfile.ElementValuePair; +import org.apache.bcel.classfile.SimpleElementValue; +import org.junit.jupiter.api.Test; /** * Tests {@link AnnotationEntry}. diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java index 0f0e3658..73c6becc 100644 --- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java +++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java @@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; + import org.apache.bcel.AbstractTestCase; import org.apache.bcel.Const; import org.apache.bcel.generic.ConstantPoolGen; diff --git a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java index e5ff65fd..f61b56fb 100644 --- a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java +++ b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java @@ -26,7 +26,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** diff --git a/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java b/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java index 9726e506..eb3d5e4f 100644 --- a/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java +++ b/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java @@ -16,17 +16,17 @@ */ package org.apache.bcel.classfile; -import org.apache.bcel.AbstractTestCase; -import org.apache.bcel.Repository; -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.assertThrowsExactly; import java.io.DataInput; import java.util.Map; import java.util.Optional; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrowsExactly; +import org.apache.bcel.AbstractTestCase; +import org.apache.bcel.Repository; +import org.apache.bcel.generic.Type; +import org.junit.jupiter.api.Test; /** * Tests signatures, including primitives, generics, and bad signatures for exceptions. diff --git a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java index 0829e749..128b9282 100644 --- a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java +++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java @@ -22,10 +22,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.Arrays; + import org.apache.bcel.Const; import org.apache.bcel.Repository; import org.junit.jupiter.api.Test; -import java.util.Arrays; public class UtilityTestCase { diff --git a/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java b/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java index 6450445b..9a96851c 100644 --- a/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java +++ b/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java @@ -16,18 +16,18 @@ */ package org.apache.bcel.generic; -import org.apache.bcel.Const; -import org.apache.bcel.classfile.StackMap; -import org.apache.bcel.classfile.StackMapEntry; -import org.apache.bcel.classfile.StackMapType; -import org.apache.commons.lang.ArrayUtils; - import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.apache.bcel.Const; +import org.apache.bcel.classfile.StackMap; +import org.apache.bcel.classfile.StackMapEntry; +import org.apache.bcel.classfile.StackMapType; +import org.apache.commons.lang.ArrayUtils; + public class BinaryOpCreator { private static final String ORG_APACHE_BCEL_GENERIC_BINARY_OP = "org.apache.bcel.generic.BinaryOp"; diff --git a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java index 3ade614e..19cc8d90 100644 --- a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java +++ b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java @@ -16,11 +16,6 @@ */ package org.apache.bcel.generic; -import org.apache.bcel.AbstractTestCase; -import org.apache.bcel.Const; -import org.apache.bcel.Repository; -import org.junit.jupiter.api.Test; - import static org.apache.bcel.generic.InstructionFactory.createArrayLoad; import static org.apache.bcel.generic.InstructionFactory.createArrayStore; import static org.apache.bcel.generic.InstructionFactory.createBinaryOperation; @@ -29,7 +24,13 @@ import static org.apache.bcel.generic.InstructionFactory.createLoad; import static org.apache.bcel.generic.InstructionFactory.createNull; import static org.apache.bcel.generic.InstructionFactory.createReturn; import static org.apache.bcel.generic.InstructionFactory.createStore; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrowsExactly; + +import org.apache.bcel.AbstractTestCase; +import org.apache.bcel.Const; +import org.apache.bcel.Repository; +import org.junit.jupiter.api.Test; public class InstructionFactoryTestCase extends AbstractTestCase { diff --git a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java index a1ea219e..ce7f6eb8 100644 --- a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java +++ b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java @@ -17,6 +17,16 @@ package org.apache.bcel.verifier; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.BufferedInputStream; +import java.io.InputStream; +import java.io.PrintWriter; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + import org.apache.bcel.AbstractTestCase; import org.apache.bcel.classfile.ClassParser; import org.apache.bcel.classfile.JavaClass; @@ -29,16 +39,6 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.jdt.internal.compiler.batch.Main; import org.junit.jupiter.api.Test; -import java.io.BufferedInputStream; -import java.io.InputStream; -import java.io.PrintWriter; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertEquals; - public class VerifierMainTestCase extends AbstractTestCase { @Test