ACCUMULO-2635 Replace Constants.UTF8 in merged ZooKeeperInstanceTest
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c9c6897a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c9c6897a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c9c6897a Branch: refs/heads/master Commit: c9c6897ae43d316465fa600a283a4d6c38675ed6 Parents: 8990e59 Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon Jun 2 10:41:05 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon Jun 2 10:41:05 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/ZooKeeperInstanceTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c9c6897a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java index 8d86d5a..b215f4c 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/ZooKeeperInstanceTest.java @@ -16,6 +16,7 @@ */ package org.apache.accumulo.core.client; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.UUID; import org.apache.accumulo.core.Constants; @@ -81,7 +82,7 @@ public class ZooKeeperInstanceTest { @Test public void testGetInstanceID_FromCache() { - expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/instance")).andReturn(IID_STRING.getBytes(Constants.UTF8)); + expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/instance")).andReturn(IID_STRING.getBytes(StandardCharsets.UTF_8)); expect(zc.get(Constants.ZROOT + "/" + IID_STRING)).andReturn("yup".getBytes()); replay(zc); assertEquals(IID_STRING, zki.getInstanceID()); @@ -107,7 +108,7 @@ public class ZooKeeperInstanceTest { @Test(expected = RuntimeException.class) public void testGetInstanceID_IDMissingForName() { - expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/instance")).andReturn(IID_STRING.getBytes(Constants.UTF8)); + expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/instance")).andReturn(IID_STRING.getBytes(StandardCharsets.UTF_8)); expect(zc.get(Constants.ZROOT + "/" + IID_STRING)).andReturn(null); replay(zc); zki.getInstanceID(); @@ -135,8 +136,8 @@ public class ZooKeeperInstanceTest { children.add("child1"); children.add("child2"); expect(zc.getChildren(Constants.ZROOT + Constants.ZINSTANCES)).andReturn(children); - expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/child1")).andReturn(UUID.randomUUID().toString().getBytes(Constants.UTF8)); - expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/child2")).andReturn(IID_STRING.getBytes(Constants.UTF8)); + expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/child1")).andReturn(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8)); + expect(zc.get(Constants.ZROOT + Constants.ZINSTANCES + "/child2")).andReturn(IID_STRING.getBytes(StandardCharsets.UTF_8)); replay(zc); assertEquals("child2", zki.getInstanceName()); }
