commit 2c73b5e82a30cb4e3c3b7285935761641f34d23f
author Jan Hentschel <jan.hentschel@ultratendency.com> Tue Dec 17 14:39:49 2019 +0100
committer Peter Somogyi <psomogyi@apache.org> Tue Dec 17 14:39:49 2019 +0100
tree f5713fffd39db207b10b745c57ee13c938488e91
parent 3827f3e28ece816a750edff5cac47e541a134339

HBASE-23586 Moved to StandardCharsets in TestQualifierMatching (#56)

Signed-off-by: Peter Somogyi <psomogyi@apache.org>

kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestQualifierMatching.java

diff --git a/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestQualifierMatching.java b/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestQualifierMatching.java
index 3e9ff36..dc9ec61 100644
--- a/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestQualifierMatching.java
+++ b/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestQualifierMatching.java
@@ -19,6 +19,8 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import java.nio.charset.StandardCharsets;
+
 /**
  * Make sure match rules work
  */
@@ -26,48 +28,47 @@
 public class TestQualifierMatching {
 
   @Test
-  public void testMatchQualfier() throws Exception {
+  public void testMatchQualfier() {
     DropRule rule = new DropRule();
-    rule.setQualifier("data".getBytes("UTF-8"));
-    Assert.assertTrue(rule.qualifierMatch("data".getBytes("UTF-8")));
+    rule.setQualifier("data".getBytes(StandardCharsets.UTF_8));
+    Assert.assertTrue(rule.qualifierMatch("data".getBytes(StandardCharsets.UTF_8)));
 
     rule = new DropRule();
-    rule.setQualifier("data1".getBytes("UTF-8"));
-    Assert.assertFalse(rule.qualifierMatch("data".getBytes("UTF-8")));
+    rule.setQualifier("data1".getBytes(StandardCharsets.UTF_8));
+    Assert.assertFalse(rule.qualifierMatch("data".getBytes(StandardCharsets.UTF_8)));
 
     // if not set, it is a wildcard
     rule = new DropRule();
-    Assert.assertTrue(rule.qualifierMatch("data".getBytes("UTF-8")));
+    Assert.assertTrue(rule.qualifierMatch("data".getBytes(StandardCharsets.UTF_8)));
   }
 
   @Test
-  public void testStartWithQualifier() throws  Exception{
+  public void testStartWithQualifier() {
     DropRule rule = new DropRule();
-    rule.setQualifier("data*".getBytes("UTF-8"));
+    rule.setQualifier("data*".getBytes(StandardCharsets.UTF_8));
     Assert.assertTrue(rule.isQualifierStartsWith());
     Assert.assertFalse(rule.isQualifierEndsWith());
 
-    Assert.assertTrue(rule.qualifierMatch("data".getBytes("UTF-8")));
-    Assert.assertTrue(rule.qualifierMatch("data1".getBytes("UTF-8")));
-    Assert.assertTrue(rule.qualifierMatch("datafoobar".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("datfoobar".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("d".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("".getBytes("UTF-8")));
+    Assert.assertTrue(rule.qualifierMatch("data".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertTrue(rule.qualifierMatch("data1".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertTrue(rule.qualifierMatch("datafoobar".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("datfoobar".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("d".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("".getBytes(StandardCharsets.UTF_8)));
   }
 
   @Test
-  public void testEndsWithQualifier() throws Exception {
+  public void testEndsWithQualifier() {
     DropRule rule = new DropRule();
-    rule.setQualifier("*data".getBytes("UTF-8"));
+    rule.setQualifier("*data".getBytes(StandardCharsets.UTF_8));
     Assert.assertFalse(rule.isQualifierStartsWith());
     Assert.assertTrue(rule.isQualifierEndsWith());
 
-    Assert.assertTrue(rule.qualifierMatch("data".getBytes("UTF-8")));
-    Assert.assertTrue(rule.qualifierMatch("1data".getBytes("UTF-8")));
-    Assert.assertTrue(rule.qualifierMatch("foobardata".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("foobardat".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("d".getBytes("UTF-8")));
-    Assert.assertFalse(rule.qualifierMatch("".getBytes("UTF-8")));
+    Assert.assertTrue(rule.qualifierMatch("data".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertTrue(rule.qualifierMatch("1data".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertTrue(rule.qualifierMatch("foobardata".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("foobardat".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("d".getBytes(StandardCharsets.UTF_8)));
+    Assert.assertFalse(rule.qualifierMatch("".getBytes(StandardCharsets.UTF_8)));
   }
-
 }