From fef6032a059412c3251fe613cd712d1ef751aae1 Mon Sep 17 00:00:00 2001
From: Daniel Widdis <widdis@gmail.com>
Date: Fri, 8 Dec 2023 12:35:44 -0800
Subject: [PATCH] Handle UTF-16 / UTF-32 with leading null byte

Signed-off-by: Daniel Widdis <widdis@gmail.com>
---
 src/it/charset/src/test/java/CharsetTests.java | 2 ++
 src/it/charset/verify.bsh                      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/it/charset/src/test/java/CharsetTests.java b/src/it/charset/src/test/java/CharsetTests.java
index 6db5b13..548f1ef 100644
--- a/src/it/charset/src/test/java/CharsetTests.java
+++ b/src/it/charset/src/test/java/CharsetTests.java
@@ -4,6 +4,8 @@ class CharsetTests {
 
   @Test
   void outputSomething() throws Exception {
+    // The degree sign (hex b0) will be prepended by 2c in UTF-8
+    // For ISO output check for optional  (hex 2c) character
     System.out.println("UTF-8 degree sign is °");
   }
 }
diff --git a/src/it/charset/verify.bsh b/src/it/charset/verify.bsh
index 7046ab8..fa5b8b4 100644
--- a/src/it/charset/verify.bsh
+++ b/src/it/charset/verify.bsh
@@ -19,7 +19,7 @@ verifier.verifyLogMatches(new String[] {
   ">> BEGIN >>",
   "[INFO] Launching JUnit Platform " + junitPlatformVersion + "...",
   ">> Platform executes tests...>>",
-  "\\Q[INFO]\\E UTF-8 degree sign is °",
+  "\\Q[INFO]\\E UTF-8 degree sign is Â?°",
   ">> Platform executes tests...>>",
   "[INFO] BUILD SUCCESS",
   ">> END. >>"