You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/17 22:16:34 UTC

(commons-compress) 12/14: Rename test package for pack200

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 48333267c7ec2f4e9023ca204939d3e2529909d9
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 17 14:39:10 2024 -0500

    Rename test package for pack200
---
 .../compress/harmony/pack200/{tests => }/ArchiveTest.java      |  5 +----
 .../compress/harmony/pack200/{tests => }/BHSDCodecTest.java    |  6 +-----
 .../harmony/pack200/{tests => }/CodecEncodingTest.java         |  8 +-------
 .../compress/harmony/pack200/{tests => }/CodecTest.java        |  6 +-----
 .../compress/harmony/pack200/{tests => }/Compress626Test.java  |  5 +----
 .../compress/harmony/pack200/{tests => }/Compress628Test.java  |  5 +----
 .../compress/harmony/pack200/{tests => }/HelloWorld.java       |  2 +-
 .../harmony/pack200/{tests => }/NewAttributeBandsTest.java     | 10 +---------
 .../harmony/pack200/{tests => }/PackingOptionsTest.java        |  6 +-----
 .../harmony/pack200/{tests => }/PopulationCodecTest.java       |  5 +----
 .../compress/harmony/pack200/{tests => }/RunCodecTest.java     |  6 +-----
 11 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/ArchiveTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/ArchiveTest.java
index 9a615fab1..0589db47e 100755
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/ArchiveTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -38,9 +38,6 @@ import java.util.jar.JarOutputStream;
 import java.util.stream.Stream;
 
 import org.apache.commons.compress.AbstractTempDirTest;
-import org.apache.commons.compress.harmony.pack200.Archive;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.pack200.PackingOptions;
 import org.apache.commons.compress.harmony.unpack200.Segment;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/BHSDCodecTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/BHSDCodecTest.java
index 2b650d0cd..15f9e29f5 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/BHSDCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/BHSDCodecTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -25,10 +25,6 @@ import java.io.IOException;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.compress.harmony.pack200.BHSDCodec;
-import org.apache.commons.compress.harmony.pack200.Codec;
-import org.apache.commons.compress.harmony.pack200.CodecEncoding;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
 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/pack200/tests/CodecEncodingTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/CodecEncodingTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/CodecEncodingTest.java
index 6be6b7f77..e9e6c9f09 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecEncodingTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/CodecEncodingTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -25,12 +25,6 @@ import java.io.InputStream;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.compress.harmony.pack200.BHSDCodec;
-import org.apache.commons.compress.harmony.pack200.Codec;
-import org.apache.commons.compress.harmony.pack200.CodecEncoding;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.pack200.PopulationCodec;
-import org.apache.commons.compress.harmony.pack200.RunCodec;
 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/pack200/tests/CodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/CodecTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/CodecTest.java
index 6ca70a616..433516113 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/CodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/CodecTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,10 +29,6 @@ import java.io.IOException;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.apache.commons.compress.harmony.pack200.BHSDCodec;
-import org.apache.commons.compress.harmony.pack200.CanonicalCodecFamilies;
-import org.apache.commons.compress.harmony.pack200.Codec;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
 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/pack200/tests/Compress626Test.java b/src/test/java/org/apache/commons/compress/harmony/pack200/Compress626Test.java
similarity index 88%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/Compress626Test.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/Compress626Test.java
index 2ca9db5e8..096d53aa5 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/Compress626Test.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/Compress626Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.compress.harmony.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
@@ -25,9 +25,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.jar.JarOutputStream;
 
-import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands;
-import org.apache.commons.compress.harmony.pack200.CPUTF8;
-import org.apache.commons.compress.harmony.pack200.NewAttributeBands;
 import org.apache.commons.compress.java.util.jar.Pack200;
 import org.apache.commons.io.output.NullOutputStream;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/Compress628Test.java b/src/test/java/org/apache/commons/compress/harmony/pack200/Compress628Test.java
similarity index 83%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/Compress628Test.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/Compress628Test.java
index 3f8b5aa20..d19d15df8 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/Compress628Test.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/Compress628Test.java
@@ -15,13 +15,10 @@
  *  limitations under the License.
  */
 
-package org.apache.commons.compress.harmony.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands;
-import org.apache.commons.compress.harmony.pack200.CPUTF8;
-import org.apache.commons.compress.harmony.pack200.NewAttributeBands;
 import org.junit.jupiter.api.Test;
 
 public class Compress628Test {
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/HelloWorld.java b/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
similarity index 95%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/HelloWorld.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.java
index 2d9f36216..a1f61ae49 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/HelloWorld.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/HelloWorld.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 /**
  * This is intended to be used as a test class for unpacking a packed Jar file.
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/NewAttributeBandsTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/NewAttributeBandsTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/NewAttributeBandsTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/NewAttributeBandsTest.java
index e995610a8..ffb5068e4 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/NewAttributeBandsTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -25,13 +25,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 
-import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands;
 import org.apache.commons.compress.harmony.pack200.AttributeDefinitionBands.AttributeDefinition;
-import org.apache.commons.compress.harmony.pack200.CPUTF8;
-import org.apache.commons.compress.harmony.pack200.Codec;
-import org.apache.commons.compress.harmony.pack200.CpBands;
-import org.apache.commons.compress.harmony.pack200.NewAttribute;
-import org.apache.commons.compress.harmony.pack200.NewAttributeBands;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.AttributeLayoutElement;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.Call;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.Callable;
@@ -41,8 +35,6 @@ import org.apache.commons.compress.harmony.pack200.NewAttributeBands.Reference;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.Replication;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.Union;
 import org.apache.commons.compress.harmony.pack200.NewAttributeBands.UnionCase;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.pack200.SegmentHeader;
 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/pack200/tests/PackingOptionsTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java
index 3cb5c4e42..f6d3b7ff7 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PackingOptionsTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -39,10 +39,6 @@ import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 import org.apache.commons.compress.AbstractTempDirTest;
-import org.apache.commons.compress.harmony.pack200.Archive;
-import org.apache.commons.compress.harmony.pack200.Pack200Exception;
-import org.apache.commons.compress.harmony.pack200.PackingOptions;
-import org.apache.commons.compress.harmony.pack200.PackingUtils;
 import org.junit.jupiter.api.Test;
 
 /**
diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/PopulationCodecTest.java
similarity index 93%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/PopulationCodecTest.java
index 82e28ad7c..70671cb3c 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/PopulationCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/PopulationCodecTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -24,9 +24,6 @@ import java.io.IOException;
 import java.io.InputStream;
 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.pack200.PopulationCodec;
 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/pack200/tests/RunCodecTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/RunCodecTest.java
similarity index 96%
rename from src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java
rename to src/test/java/org/apache/commons/compress/harmony/pack200/RunCodecTest.java
index cc86a288d..3f217c571 100644
--- a/src/test/java/org/apache/commons/compress/harmony/pack200/tests/RunCodecTest.java
+++ b/src/test/java/org/apache/commons/compress/harmony/pack200/RunCodecTest.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.pack200.tests;
+package org.apache.commons.compress.harmony.pack200;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -23,10 +23,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 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.pack200.PopulationCodec;
-import org.apache.commons.compress.harmony.pack200.RunCodec;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;