Simplify code using StandardCharsets.UTF_8.

zakkak · Sep 12, 2023 · f130444 · f130444
1 parent d6fdf55
commit f130444
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/wasm/src/org.graalvm.wasm.utils/src/org/graalvm/wasm/utils/cases/WasmCase.java b/wasm/src/org.graalvm.wasm.utils/src/org/graalvm/wasm/utils/cases/WasmCase.java
@@ -40,21 +40,12 @@
  */
 package org.graalvm.wasm.utils.cases;
 
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-import org.graalvm.polyglot.io.ByteSequence;
-import org.graalvm.wasm.WasmLanguage;
-import org.graalvm.wasm.utils.Assert;
-import org.graalvm.wasm.utils.SystemProperties;
-import org.graalvm.wasm.utils.WasmBinaryTools;
-import org.graalvm.wasm.utils.WasmResource;
-
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -63,6 +54,15 @@
 import java.util.Properties;
 import java.util.function.BiConsumer;
 
+import org.graalvm.polyglot.Source;
+import org.graalvm.polyglot.Value;
+import org.graalvm.polyglot.io.ByteSequence;
+import org.graalvm.wasm.WasmLanguage;
+import org.graalvm.wasm.utils.Assert;
+import org.graalvm.wasm.utils.SystemProperties;
+import org.graalvm.wasm.utils.WasmBinaryTools;
+import org.graalvm.wasm.utils.WasmResource;
+
 /**
  * Instances of this class are used for WebAssembly test/benchmark cases.
  */
@@ -278,11 +278,7 @@ public static WasmCase loadBenchmarkCase(String resource) throws IOException {
 
     public static void validateResult(BiConsumer<Value, String> validator, Value result, ByteArrayOutputStream capturedStdout) {
         if (validator != null) {
-            try {
-                validator.accept(result, capturedStdout.toString("UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                Assert.fail("Should not reach here: unsupported encoding");
-            }
+            validator.accept(result, capturedStdout.toString(StandardCharsets.UTF_8));
         } else {
             Assert.fail("Test was not expected to return a value.");
         }