@@ -0,0 +1,1609 @@
+package com.basho.riak.client.core.query.UserMetadata;%0A%0Aimport com.basho.riak.client.core.util.BinaryValue;%0Aimport org.junit.Test;%0A%0Aimport java.nio.charset.Charset;%0A%0Aimport static junit.framework.TestCase.assertEquals;%0Aimport static org.junit.Assert.assertNotEquals;%0Aimport static org.junit.Assert.assertNull;%0Aimport static org.junit.Assert.assertTrue;%0A%0Apublic class RiakUserMetadataTest%0A%7B%0A    final Charset utf16 = Charset.forName(%22UTF-16%22);%0A    final String oddKey = %22%5CuD834%5CuDD1E%5CuD835%5CuDD65%22;%0A    final String oddValue = %22%5CuD835%5CuDFF6%5CuD840%5CuDC8A%22;%0A    final BinaryValue oddKeyBV = BinaryValue.create(oddKey, utf16);%0A    final BinaryValue oddValueBV = BinaryValue.create(oddValue, utf16);%0A%0A    @Test%0A    public void getSetMetadata_string_altCharset()%0A    %7B%0A        RiakUserMetadata md = new RiakUserMetadata();%0A        md.put(oddKey, oddValue, utf16);%0A        final String gotValue = md.get(oddKey, utf16);%0A%0A        assertEquals(oddValue, gotValue);%0A        assertNotEquals(gotValue, md.get(oddKey));%0A    %7D%0A%0A    @Test%0A    public void getSetMetadata_binaryValue_altCharset()%0A    %7B%0A        RiakUserMetadata md = new RiakUserMetadata();%0A        md.put(oddKeyBV, oddValueBV);%0A        final BinaryValue gotValue = md.get(oddKeyBV);%0A%0A        assertEquals(oddValueBV, gotValue);%0A        assertNotEquals(gotValue, md.get(oddKey));%0A    %7D%0A%0A    @Test%0A    public void getSetMetadata_mixedInterfaces_altCharset()%0A    %7B%0A        RiakUserMetadata md = new RiakUserMetadata();%0A        md.put(oddKeyBV, oddValueBV);%0A%0A        final String gotValue = md.get(oddKey, utf16);%0A%0A        assertEquals(oddValue, gotValue);%0A    %7D%0A%7D%0A

Add a few tests for charset options in RiakUserMetadata