Sort members

apache · Nov 26, 2024 · 3324123 · 3324123
1 parent d979860
commit 3324123
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipEightByteInteger.java
@@ -35,17 +35,6 @@ public final class ZipEightByteInteger implements Serializable {
 
     private static final BigInteger HIGHEST_BIT = BigInteger.ONE.shiftLeft(63);
 
-    /**
-     * package private for tests only.
-     */
-    static BigInteger toUnsignedBigInteger(final long value) {
-        if (value >= 0L) {
-            return BigInteger.valueOf(value);
-        } else {
-            return BigInteger.valueOf(value & Long.MAX_VALUE).add(HIGHEST_BIT);
-        }
-    }
-
     /**
      * Gets value as eight bytes in big-endian byte order.
      *
@@ -110,6 +99,17 @@ public static BigInteger getValue(final byte[] bytes, final int offset) {
         return toUnsignedBigInteger(getLongValue(bytes, offset));
     }
 
+    /**
+     * package private for tests only.
+     */
+    static BigInteger toUnsignedBigInteger(final long value) {
+        if (value >= 0L) {
+            return BigInteger.valueOf(value);
+        } else {
+            return BigInteger.valueOf(value & Long.MAX_VALUE).add(HIGHEST_BIT);
+        }
+    }
+
     private final long value;
 
     /**

diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java
@@ -29,15 +29,6 @@
  */
 public class ZipEightByteIntegerTest {
 
-    /**
-     * Test {@link ZipEightByteInteger#toUnsignedBigInteger(long)}.
-     */
-    @Test
-    public void testToUnsignedBigInteger() {
-        assertEquals(BigInteger.valueOf(Long.MAX_VALUE), ZipEightByteInteger.toUnsignedBigInteger(Long.MAX_VALUE));
-        assertEquals(BigInteger.valueOf(Long.MAX_VALUE).shiftLeft(1), ZipEightByteInteger.toUnsignedBigInteger(0XFFFFFFFFFFFFFFFEL));
-    }
-
     /**
      * Test conversion from bytes.
      */
@@ -60,6 +51,16 @@ public void testBIFromMaxValue() {
         assertEquals("18446744073709551615", zipEightByteInteger.getValue().toString());
     }
 
+    /**
+     * Test conversion from bytes.
+     */
+    @Test
+    public void testBILongFromBytes() {
+        final byte[] val = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
+        final ZipEightByteInteger zl = new ZipEightByteInteger(val);
+        assertEquals(0XFFFFFFFFFFFFFFFFL, zl.getLongValue(), "longValue from bytes");
+    }
+
     /**
      * Test conversion to bytes.
      */
@@ -108,16 +109,6 @@ public void testLongFromBytes() {
         assertEquals(0xAB12345678L, zl.getLongValue(), "longValue from bytes");
     }
 
-    /**
-     * Test conversion from bytes.
-     */
-    @Test
-    public void testBILongFromBytes() {
-        final byte[] val = { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF };
-        final ZipEightByteInteger zl = new ZipEightByteInteger(val);
-        assertEquals(0XFFFFFFFFFFFFFFFFL, zl.getLongValue(), "longValue from bytes");
-    }
-
     /**
      * Test conversion to bytes.
      */
@@ -155,4 +146,13 @@ public void testToString() {
                 new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF });
         assertEquals("ZipEightByteInteger value: 18446744073709551615", zipEightByteInteger.toString());
     }
+
+    /**
+     * Test {@link ZipEightByteInteger#toUnsignedBigInteger(long)}.
+     */
+    @Test
+    public void testToUnsignedBigInteger() {
+        assertEquals(BigInteger.valueOf(Long.MAX_VALUE), ZipEightByteInteger.toUnsignedBigInteger(Long.MAX_VALUE));
+        assertEquals(BigInteger.valueOf(Long.MAX_VALUE).shiftLeft(1), ZipEightByteInteger.toUnsignedBigInteger(0XFFFFFFFFFFFFFFFEL));
+    }
 }
diff --git a/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java b/src/test/java/org/apache/commons/compress/utils/IOUtilsTest.java
@@ -80,6 +80,11 @@ public void testCopy_inputStreamToOutputStream_nullOut() {
         assertThrows(NullPointerException.class, () -> IOUtils.copy(in, (OutputStream) null));
     }
 
+    @Test
+    public void testCopyOnZeroBufferSize() throws IOException {
+        assertEquals(0, IOUtils.copy(new ByteArrayInputStream(ByteUtils.EMPTY_BYTE_ARRAY), new ByteArrayOutputStream(), 0));
+    }
+
     @Test
     public void testCopyRangeDoesntCopyMoreThanAskedFor() throws IOException {
         try (ByteArrayInputStream in = new ByteArrayInputStream(new byte[] { 1, 2, 3, 4, 5 });
@@ -106,11 +111,6 @@ public void testCopyRangeThrowsOnZeroBufferSize() {
                 () -> IOUtils.copyRange(new ByteArrayInputStream(ByteUtils.EMPTY_BYTE_ARRAY), 5, new ByteArrayOutputStream(), 0));
     }
 
-    @Test
-    public void testCopyOnZeroBufferSize() throws IOException {
-        assertEquals(0, IOUtils.copy(new ByteArrayInputStream(ByteUtils.EMPTY_BYTE_ARRAY), new ByteArrayOutputStream(), 0));
-    }
-
     @Test
     public void testReadFullyOnChannelReadsFully() throws IOException {
         final ByteBuffer b = ByteBuffer.allocate(20);