1 files changed, 5 insertions, 3 deletions
diff --git a/baksmali/src/test/java/com/android/tools/smali/baksmali/BaksmaliTestUtils.java b/baksmali/src/test/java/com/android/tools/smali/baksmali/BaksmaliTestUtils.java
index 1796ea76..50b63606 100644
--- a/baksmali/src/test/java/com/android/tools/smali/baksmali/BaksmaliTestUtils.java
+++ b/baksmali/src/test/java/com/android/tools/smali/baksmali/BaksmaliTestUtils.java
@@ -31,18 +31,20 @@
 package com.android.tools.smali.baksmali;
 
 import com.google.common.io.ByteStreams;
-import junit.framework.Assert;
 import org.antlr.runtime.RecognitionException;
 import com.android.tools.smali.baksmali.Adaptors.ClassDefinition;
 import com.android.tools.smali.baksmali.formatter.BaksmaliWriter;
 import com.android.tools.smali.dexlib2.iface.ClassDef;
 import com.android.tools.smali.smali.SmaliTestUtils;
+import org.junit.Assert;
 import org.junit.Test;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -109,11 +111,11 @@ public class BaksmaliTestUtils {
 
     @Nonnull
     public static String readResourceFully(@Nonnull String fileName) throws IOException {
-        return readResourceFully(fileName, "UTF-8");
+        return readResourceFully(fileName, StandardCharsets.UTF_8);
     }
 
     @Nonnull
-    public static String readResourceFully(@Nonnull String fileName, @Nonnull String encoding)
+    public static String readResourceFully(@Nonnull String fileName, @Nonnull Charset encoding)
             throws IOException {
         return new String(readResourceBytesFully(fileName), encoding);
     }