lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用 java.util.HexFormat 替代 Hex (#4457)

Browse Source
This commit is contained in:
Glavo
2025-09-12 19:07:43 +08:00
committed by GitHub
parent cf5957ffd1
commit 962ee0d108
8 changed files with 14 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
HMCLCore/src/test/java/org/jackhuang/hmcl/util/ByteArrayTest.java
View File

@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.util;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.HexFormat;
import java.util.function.Consumer;
import static org.jackhuang.hmcl.util.ByteArray.*;
@@ -123,8 +123,8 @@ public final class ByteArrayTest {
private static byte[] byteArray(String string) {
try {
return Hex.decodeHex(string);
} catch (IOException e) {
return HexFormat.of().parseHex(string);
} catch (IllegalArgumentException e) {
throw new AssertionError(e);
}
}

51
HMCLCore/src/test/java/org/jackhuang/hmcl/util/HexTest.java
View File

@@ -1,51 +0,0 @@
/*
* Hello Minecraft! Launcher
* Copyright (C) 2023 huangyuhui <huanghongxun2008@126.com> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.jackhuang.hmcl.util;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import static org.junit.jupiter.api.Assertions.*;
public class HexTest {
@Test
public void testDecodeHex() throws IOException {
assertArrayEquals(new byte[0], Hex.decodeHex(""));
assertArrayEquals(new byte[1], Hex.decodeHex("00"));
assertArrayEquals(new byte[4], Hex.decodeHex("00000000"));
assertArrayEquals(
new byte[]{0x10, (byte) 0xa3, (byte) 0xd1, (byte) 0xff},
Hex.decodeHex("10a3D1Ff")
);
assertThrows(IOException.class, () -> Hex.decodeHex("1"));
assertThrows(IOException.class, () -> Hex.decodeHex("1a1"));
assertThrows(IOException.class, () -> Hex.decodeHex("1g"));
}
@Test
public void testEncodeHex() {
assertEquals("", Hex.encodeHex(new byte[0]));
assertEquals("00", Hex.encodeHex(new byte[1]));
assertEquals("00000000", Hex.encodeHex(new byte[4]));
assertEquals("10a3d1ff", Hex.encodeHex(new byte[]{0x10, (byte) 0xa3, (byte) 0xd1, (byte) 0xff}));
}
}