From d534de7958fd81f5645cb580e72ed62c91c2fb16 Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Mon, 7 Aug 2023 14:22:13 -0400 Subject: [PATCH] ctf.tests: Don't use Java 17 APIs in o.e.tc.ctf.core.tests This allows to build with older target definitions e.g. e4.20 (2021-06) that still uses Java 11. Change-Id: Ib4ed44ad9bc306f2495d4d7847b4162cf320f3f7 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/203583 Tested-by: Trace Compass Bot Tested-by: Marco Miller Reviewed-by: Marco Miller --- .../tracecompass/ctf/core/tests/types/BlobDeclarationTest.java | 3 +-- .../tracecompass/ctf/core/tests/types/BlobDefinitionTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDeclarationTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDeclarationTest.java index b7a051853c..34fd164a50 100644 --- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDeclarationTest.java +++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDeclarationTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertNotNull; import java.nio.ByteBuffer; -import java.util.HexFormat; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.ctf.core.CTFException; @@ -38,7 +37,7 @@ public class BlobDeclarationTest { private BlobDeclaration fixture; private static final int LENGTH = 16; @NonNull private static final String MEDIA_TYPE = "\"application/octet-stream\""; - private static final byte[] UUID_ARRAY = HexFormat.of().parseHex("2a6422d06cee11e08c08cb07d7b3a564"); + private static final byte[] UUID_ARRAY = new byte[] { 0x2a, 0x64, 0x22, (byte) 0xd0, 0x6c, (byte) 0xee, 0x11, (byte) 0xe0, (byte) 0x8c, 0x08, (byte) 0xcb, 0x07, (byte) 0xd7, (byte) 0xb3, (byte) 0xa5, 0x64 }; /** * Perform pre-test initialization. diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDefinitionTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDefinitionTest.java index 86d5f0dca3..dbfb21109c 100644 --- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDefinitionTest.java +++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/types/BlobDefinitionTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertNotNull; import java.nio.ByteBuffer; -import java.util.HexFormat; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.tracecompass.ctf.core.CTFException; @@ -38,7 +37,7 @@ public class BlobDefinitionTest { private BlobDefinition fixture; private static final int LENGTH = 16; @NonNull private static final String MEDIA_TYPE = "\"application/octet-stream\""; - private static final byte[] UUID_ARRAY = HexFormat.of().parseHex("2a6422d06cee11e08c08cb07d7b3a564"); + private static final byte[] UUID_ARRAY = new byte[] { 0x2a, 0x64, 0x22, (byte) 0xd0, 0x6c, (byte) 0xee, 0x11, (byte) 0xe0, (byte) 0x8c, 0x08, (byte) 0xcb, 0x07, (byte) 0xd7, (byte) 0xb3, (byte) 0xa5, 0x64 }; /** * Perform pre-test initialization.