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-compress.git
commit d4976452847ce4448d89176fedb0e32ace6887c4
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Feb 17 14:52:18 2024 -0500
Rename test package for unpack200
---
.../harmony/unpack200/{tests => }/AbstractBandsTest.java | 7 +------
.../compress/harmony/unpack200/{tests => }/ArchiveTest.java | 4 +---
.../harmony/unpack200/{tests => }/AttributeLayoutMapTest.java | 4 +---
.../harmony/unpack200/{tests => }/AttributeLayoutTest.java | 5 +----
.../compress/harmony/unpack200/{tests => }/BandSetTest.java | 5 +----
.../compress/harmony/unpack200/{tests => }/BcBandsTest.java | 8 +-------
.../compress/harmony/unpack200/{tests => }/CPUTF8Test.java | 2 +-
.../compress/harmony/unpack200/{tests => }/ClassBandsTest.java | 5 +----
.../harmony/unpack200/{tests => }/CodeAttributeTest.java | 5 +----
.../{tests => }/Codec_decodeInts_OutOfMemoryErrorTest.java | 2 +-
.../compress/harmony/unpack200/{tests => }/ICTupleTest.java | 3 +--
.../harmony/unpack200/{tests => }/NewAttributeBandsTest.java | 5 +----
.../{tests => }/SegmentConstantPoolArrayCacheTest.java | 3 +--
.../harmony/unpack200/{tests => }/SegmentConstantPoolTest.java | 5 +----
.../harmony/unpack200/{tests => }/SegmentOptionsTest.java | 3 +--
.../compress/harmony/unpack200/{tests => }/SegmentTest.java | 3 +--
.../harmony/unpack200/{tests => }/SegmentUtilsTest.java | 4 +---
.../harmony/unpack200/{tests => }/bytecode/ByteCodeTest.java | 3 +--
.../unpack200/{tests => }/bytecode/ClassFileEntryTest.java | 10 +---------
.../unpack200/{tests => }/bytecode/ConstantPoolTest.java | 6 +-----
20 files changed, 20 insertions(+), 72 deletions(-)
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AbstractBandsTest.java
similarity index 85%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/AbstractBandsTest.java
index f39f07cf5..e5b8e1d7c 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AbstractBandsTest.java
@@ -14,16 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.fail;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.AttrDefinitionBands;
-import org.apache.commons.compress.harmony.unpack200.AttributeLayoutMap;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentHeader;
-import org.apache.commons.compress.harmony.unpack200.SegmentOptions;
/**
*/
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ArchiveTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/ArchiveTest.java
index 98e1b1cd4..9b0d0cc10 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ArchiveTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ArchiveTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -43,8 +43,6 @@ import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
import org.apache.commons.compress.AbstractTempDirTest;
-import org.apache.commons.compress.harmony.unpack200.Archive;
-import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.io.input.BoundedInputStream;
import org.apache.commons.io.output.NullOutputStream;
import org.junit.jupiter.api.AfterEach;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMapTest.java
similarity index 92%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMapTest.java
index 7b634e87a..9e0af687f 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutMapTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutMapTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -22,8 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.AttributeLayout;
-import org.apache.commons.compress.harmony.unpack200.AttributeLayoutMap;
import org.junit.jupiter.api.Test;
public class AttributeLayoutMapTest {
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutTest.java
index edac493b8..cda8b66e8 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AttributeLayoutTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/AttributeLayoutTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,9 +25,6 @@ import java.util.stream.Stream;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.AttributeLayout;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
import org.apache.commons.compress.harmony.unpack200.bytecode.ClassFileEntry;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/BandSetTest.java
similarity index 91%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/BandSetTest.java
index 7f6e988b2..6cef5988f 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BandSetTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/BandSetTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,9 +25,6 @@ import java.io.InputStream;
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.BandSet;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentHeader;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/BcBandsTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/BcBandsTest.java
index 0c017be17..9b3fff94d 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/BcBandsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -24,12 +24,6 @@ import java.io.InputStream;
import java.util.ArrayList;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.AttrDefinitionBands;
-import org.apache.commons.compress.harmony.unpack200.BcBands;
-import org.apache.commons.compress.harmony.unpack200.ClassBands;
-import org.apache.commons.compress.harmony.unpack200.CpBands;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPFieldRef;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/CPUTF8Test.java
similarity index 95%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/CPUTF8Test.java
index 228a2c65a..1ba328bdc 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CPUTF8Test.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/CPUTF8Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ClassBandsTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/ClassBandsTest.java
index 971aa5f09..1957aff41 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ClassBandsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,9 +25,6 @@ import java.io.IOException;
import org.apache.commons.compress.harmony.pack200.BHSDCodec;
import org.apache.commons.compress.harmony.pack200.Codec;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.ClassBands;
-import org.apache.commons.compress.harmony.unpack200.CpBands;
-import org.apache.commons.compress.harmony.unpack200.Segment;
import org.junit.jupiter.api.Test;
/**
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/CodeAttributeTest.java
similarity index 96%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/CodeAttributeTest.java
index 5e2bf3a87..de5f86544 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/CodeAttributeTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/CodeAttributeTest.java
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.compress.harmony.unpack200.CpBands;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPFieldRef;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPMethodRef;
import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/Codec_decodeInts_OutOfMemoryErrorTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/Codec_decodeInts_OutOfMemoryErrorTest.java
similarity index 98%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/Codec_decodeInts_OutOfMemoryErrorTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/Codec_decodeInts_OutOfMemoryErrorTest.java
index b6ad1058e..9f1edc732 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/Codec_decodeInts_OutOfMemoryErrorTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/Codec_decodeInts_OutOfMemoryErrorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ICTupleTest.java
similarity index 95%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/ICTupleTest.java
index b0e5e60bd..add432b68 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ICTupleTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/ICTupleTest.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.stream.Stream;
-import org.apache.commons.compress.harmony.unpack200.IcTuple;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBandsTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBandsTest.java
index 7ef15400a..4b72d9df1 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBandsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -24,8 +24,6 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.AttributeLayout;
-import org.apache.commons.compress.harmony.unpack200.NewAttributeBands;
import org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Call;
import
org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Callable;
import
org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Integral;
@@ -33,7 +31,6 @@ import
org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Reference
import
org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Replication;
import org.apache.commons.compress.harmony.unpack200.NewAttributeBands.Union;
import
org.apache.commons.compress.harmony.unpack200.NewAttributeBands.UnionCase;
-import org.apache.commons.compress.harmony.unpack200.Segment;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCacheTest.java
similarity index 95%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCacheTest.java
index cda9ee16d..5bc5415c6 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolArrayCacheTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolArrayCacheTest.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.List;
-import
org.apache.commons.compress.harmony.unpack200.SegmentConstantPoolArrayCache;
import org.junit.jupiter.api.Test;
public class SegmentConstantPoolArrayCacheTest {
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolTest.java
similarity index 95%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolTest.java
index 82829febe..002238097 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentConstantPoolTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentConstantPoolTest.java
@@ -14,15 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
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.apache.commons.compress.harmony.unpack200.CpBands;
-import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.junit.jupiter.api.Test;
/**
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentOptionsTest.java
similarity index 91%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentOptionsTest.java
index f3324b73b..7fd47e257 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentOptionsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentOptionsTest.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.unpack200.SegmentOptions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentTest.java
similarity index 97%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentTest.java
index 76c2dc81b..5a3b8937a 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,7 +36,6 @@ import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
import org.apache.commons.compress.AbstractTempDirTest;
-import org.apache.commons.compress.harmony.unpack200.Segment;
import org.apache.commons.io.input.BoundedInputStream;
import org.apache.commons.io.output.NullOutputStream;
import org.junit.jupiter.api.Test;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentUtilsTest.java
similarity index 94%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentUtilsTest.java
index 166a8c390..38bdf5423 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/SegmentUtilsTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/SegmentUtilsTest.java
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests;
+package org.apache.commons.compress.harmony.unpack200;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.stream.Stream;
-import org.apache.commons.compress.harmony.unpack200.IMatcher;
-import org.apache.commons.compress.harmony.unpack200.SegmentUtils;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCodeTest.java
similarity index 91%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCodeTest.java
index 3d4f023e6..b1372cfac 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ByteCodeTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ByteCodeTest.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.stream.Stream;
-import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
similarity index 86%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
index 591f831ba..dcc2db6ec 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ClassFileEntryTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
@@ -14,20 +14,12 @@
* License for the specific language governing permissions and limitations
under
* the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPDouble;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPFloat;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPInteger;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPLong;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPMember;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPString;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
-import
org.apache.commons.compress.harmony.unpack200.bytecode.SourceFileAttribute;
import org.junit.jupiter.api.Test;
public class ClassFileEntryTest {
diff --git
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolTest.java
similarity index 86%
rename from
src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
rename to
src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolTest.java
index ea3985149..be1bb9a6a 100644
---
a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/bytecode/ConstantPoolTest.java
+++
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantPoolTest.java
@@ -14,16 +14,12 @@
* License for the specific language governing permissions and limitations
under
* the License.
*/
-package org.apache.commons.compress.harmony.unpack200.tests.bytecode;
+package org.apache.commons.compress.harmony.unpack200.bytecode;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.commons.compress.harmony.unpack200.Segment;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPClass;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPMember;
-import org.apache.commons.compress.harmony.unpack200.bytecode.CPUTF8;
-import
org.apache.commons.compress.harmony.unpack200.bytecode.ClassConstantPool;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
