Rename test package for unpack200

apache · Feb 17, 2024 · d497645 · d497645
1 parent 4833326
commit d497645
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 72 deletions.
diff --git a/...ny/unpack200/tests/AbstractBandsTest.java → .../harmony/unpack200/AbstractBandsTest.java b/...ny/unpack200/tests/AbstractBandsTest.java → .../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/.../harmony/unpack200/tests/ArchiveTest.java → ...mpress/harmony/unpack200/ArchiveTest.java b/.../harmony/unpack200/tests/ArchiveTest.java → ...mpress/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.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/...pack200/tests/AttributeLayoutMapTest.java → ...ony/unpack200/AttributeLayoutMapTest.java b/...pack200/tests/AttributeLayoutMapTest.java → ...ony/unpack200/AttributeLayoutMapTest.java
@@ -14,16 +14,14 @@
  *  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.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/.../unpack200/tests/AttributeLayoutTest.java → ...armony/unpack200/AttributeLayoutTest.java b/.../unpack200/tests/AttributeLayoutTest.java → ...armony/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 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/.../harmony/unpack200/tests/BandSetTest.java → ...mpress/harmony/unpack200/BandSetTest.java b/.../harmony/unpack200/tests/BandSetTest.java → ...mpress/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 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/.../harmony/unpack200/tests/BcBandsTest.java → ...mpress/harmony/unpack200/BcBandsTest.java b/.../harmony/unpack200/tests/BcBandsTest.java → ...mpress/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.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/...s/harmony/unpack200/tests/CPUTF8Test.java → ...ompress/harmony/unpack200/CPUTF8Test.java b/...s/harmony/unpack200/tests/CPUTF8Test.java → ...ompress/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/...rmony/unpack200/tests/ClassBandsTest.java → ...ess/harmony/unpack200/ClassBandsTest.java b/...rmony/unpack200/tests/ClassBandsTest.java → ...ess/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 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/...ny/unpack200/tests/CodeAttributeTest.java → .../harmony/unpack200/CodeAttributeTest.java b/...ny/unpack200/tests/CodeAttributeTest.java → .../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/...odec_decodeInts_OutOfMemoryErrorTest.java → ...odec_decodeInts_OutOfMemoryErrorTest.java b/...odec_decodeInts_OutOfMemoryErrorTest.java → ...odec_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/.../harmony/unpack200/tests/ICTupleTest.java → ...mpress/harmony/unpack200/ICTupleTest.java b/.../harmony/unpack200/tests/ICTupleTest.java → ...mpress/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/...npack200/tests/NewAttributeBandsTest.java → ...mony/unpack200/NewAttributeBandsTest.java b/...npack200/tests/NewAttributeBandsTest.java → ...mony/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,16 +24,13 @@
 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;
 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/...ts/SegmentConstantPoolArrayCacheTest.java → ...00/SegmentConstantPoolArrayCacheTest.java b/...ts/SegmentConstantPoolArrayCacheTest.java → ...00/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/...ack200/tests/SegmentConstantPoolTest.java → ...ny/unpack200/SegmentConstantPoolTest.java b/...ack200/tests/SegmentConstantPoolTest.java → ...ny/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/...y/unpack200/tests/SegmentOptionsTest.java → ...harmony/unpack200/SegmentOptionsTest.java b/...y/unpack200/tests/SegmentOptionsTest.java → ...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/.../harmony/unpack200/tests/SegmentTest.java → ...mpress/harmony/unpack200/SegmentTest.java b/.../harmony/unpack200/tests/SegmentTest.java → ...mpress/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.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/...ony/unpack200/tests/SegmentUtilsTest.java → ...s/harmony/unpack200/SegmentUtilsTest.java b/...ony/unpack200/tests/SegmentUtilsTest.java → ...s/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/...npack200/tests/bytecode/ByteCodeTest.java → ...mony/unpack200/bytecode/ByteCodeTest.java b/...npack200/tests/bytecode/ByteCodeTest.java → ...mony/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/...00/tests/bytecode/ClassFileEntryTest.java → ...npack200/bytecode/ClassFileEntryTest.java b/...00/tests/bytecode/ClassFileEntryTest.java → ...npack200/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/...k200/tests/bytecode/ConstantPoolTest.java → .../unpack200/bytecode/ConstantPoolTest.java b/...k200/tests/bytecode/ConstantPoolTest.java → .../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;