summaryrefslogtreecommitdiffstats
path: root/luni/src/test/java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-28 15:57:53 -0700
committerElliott Hughes <enh@google.com>2013-06-28 16:16:41 -0700
commit2a6f23ff8690ac2f025588a360547ce96cde0943 (patch)
tree7f16e717fa0aa11fd704d683525b969bd6055f23 /luni/src/test/java
parent52ac40530506afe4c5a85d370e04ee77e523b1fa (diff)
downloadlibcore-2a6f23ff8690ac2f025588a360547ce96cde0943.zip
libcore-2a6f23ff8690ac2f025588a360547ce96cde0943.tar.gz
libcore-2a6f23ff8690ac2f025588a360547ce96cde0943.tar.bz2
Add java.nio.charsets.StandardCharsets.
Bug: 3484927 Change-Id: I5820267491b850b8fcc696fa48962710de123009
Diffstat (limited to 'luni/src/test/java')
-rw-r--r--luni/src/test/java/libcore/io/StrictLineReaderTest.java5
-rw-r--r--luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java4
2 files changed, 4 insertions, 5 deletions
diff --git a/luni/src/test/java/libcore/io/StrictLineReaderTest.java b/luni/src/test/java/libcore/io/StrictLineReaderTest.java
index d5d3381..db88a6b 100644
--- a/luni/src/test/java/libcore/io/StrictLineReaderTest.java
+++ b/luni/src/test/java/libcore/io/StrictLineReaderTest.java
@@ -23,7 +23,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStream;
-import java.nio.charset.Charsets;
+import java.nio.charset.StandardCharsets;
public class StrictLineReaderTest extends TestCase {
@@ -31,7 +31,7 @@ public class StrictLineReaderTest extends TestCase {
try {
// Testing with LineReader buffer capacity 32 to check some corner cases.
StrictLineReader lineReader = new StrictLineReader(createTestInputStream(), 32,
- Charsets.US_ASCII);
+ StandardCharsets.US_ASCII);
InputStream refStream = createTestInputStream();
while (true) {
try {
@@ -81,4 +81,3 @@ public class StrictLineReaderTest extends TestCase {
).getBytes());
}
}
-
diff --git a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
index 69ae1c1..e1c9fe3 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/DefaultHostnameVerifierTest.java
@@ -19,7 +19,7 @@ package libcore.javax.net.ssl;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.math.BigInteger;
-import java.nio.charset.Charsets;
+import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.security.PublicKey;
import java.security.cert.CertificateFactory;
@@ -301,7 +301,7 @@ public final class DefaultHostnameVerifierTest extends TestCase {
}
X509Certificate parseCertificate(String encoded) throws Exception {
- InputStream in = new ByteArrayInputStream(encoded.getBytes(Charsets.US_ASCII));
+ InputStream in = new ByteArrayInputStream(encoded.getBytes(StandardCharsets.US_ASCII));
return (X509Certificate) CertificateFactory.getInstance("X509").generateCertificate(in);
}