accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/4] git commit: ACCUMULO-3045 Fix what should have been a merge conflict.
Date Tue, 05 Aug 2014 02:32:05 GMT
ACCUMULO-3045 Fix what should have been a merge conflict.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/85c1a496
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/85c1a496
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/85c1a496

Branch: refs/heads/master
Commit: 85c1a496b20b30c2b27a8a507a69dd9da592d317
Parents: 1a09e25
Author: Josh Elser <elserj@apache.org>
Authored: Mon Aug 4 22:30:30 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Aug 4 22:30:30 2014 -0400

----------------------------------------------------------------------
 .../client/security/tokens/CredentialProviderTokenTest.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/85c1a496/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java
b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java
index 17d2297..46607ea 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderTokenTest.java
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.client.security.tokens;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.Properties;
 import org.apache.accumulo.core.conf.CredentialProviderFactoryShim;
 import org.junit.Assert;
@@ -55,10 +55,10 @@ public class CredentialProviderTokenTest {
     }
 
     CredentialProviderToken token = new CredentialProviderToken("root.password", keystorePath);
-    Assert.assertArrayEquals("password".getBytes(Constants.UTF8), token.getPassword());
+    Assert.assertArrayEquals("password".getBytes(StandardCharsets.UTF_8), token.getPassword());
 
     token = new CredentialProviderToken("bob.password", keystorePath);
-    Assert.assertArrayEquals("bob".getBytes(Constants.UTF8), token.getPassword());
+    Assert.assertArrayEquals("bob".getBytes(StandardCharsets.UTF_8), token.getPassword());
   }
 
   @Test


Mime
View raw message