You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ja...@apache.org on 2019/12/16 22:18:02 UTC
[hbase-connectors] branch master updated: HBASE-23580 Refactoring
of TestRouteRules
This is an automated email from the ASF dual-hosted git repository.
janh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 3827f3e HBASE-23580 Refactoring of TestRouteRules
3827f3e is described below
commit 3827f3e28ece816a750edff5cac47e541a134339
Author: Jan Hentschel <ja...@apache.org>
AuthorDate: Mon Dec 16 23:17:53 2019 +0100
HBASE-23580 Refactoring of TestRouteRules
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../apache/hadoop/hbase/kafka/TestRouteRules.java | 145 ++++++++++-----------
1 file changed, 70 insertions(+), 75 deletions(-)
diff --git a/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestRouteRules.java b/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestRouteRules.java
index 5d387c1..6ea51d5 100644
--- a/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestRouteRules.java
+++ b/kafka/hbase-kafka-proxy/src/test/java/org/apache/hadoop/hbase/kafka/TestRouteRules.java
@@ -15,6 +15,7 @@
package org.apache.hadoop.hbase.kafka;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -29,6 +30,8 @@ import org.junit.experimental.categories.Category;
*/
@Category(SmallTests.class)
public class TestRouteRules {
+ private static final String TEST_TABLE = "default:MyTable";
+
private static final String ROUTE_RULE1 =
"<rules><rule action=\"route\" table=\"default:MyTable\" "
+ "topic=\"foo\"/></rules>";
@@ -54,15 +57,14 @@ public class TestRouteRules {
public void testTopic1() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE1.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE1.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
- Assert.assertEquals(null, rules.getRouteRules().get(0).getColumnFamily());
- Assert.assertEquals(null, rules.getRouteRules().get(0).getQualifier());
+ Assert.assertNull(rules.getRouteRules().get(0).getColumnFamily());
+ Assert.assertNull(rules.getRouteRules().get(0).getQualifier());
Assert.assertEquals(0, rules.getDropRules().size());
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
@@ -71,16 +73,16 @@ public class TestRouteRules {
public void testTopic2() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE2.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE2.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
Assert.assertTrue(
- Bytes.equals("data".getBytes("UTF-8"), rules.getRouteRules().get(0).getColumnFamily()));
- Assert.assertEquals(null, rules.getRouteRules().get(0).getQualifier());
+ Bytes.equals("data".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getColumnFamily()));
+ Assert.assertNull(rules.getRouteRules().get(0).getQualifier());
Assert.assertEquals(0, rules.getDropRules().size());
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
@@ -89,20 +91,19 @@ public class TestRouteRules {
public void testTopic3() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE3.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE3.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
- Assert.assertTrue(
- Bytes.equals("data".getBytes("UTF-8"), rules.getRouteRules().get(0).getColumnFamily()));
- Assert.assertTrue(
- Bytes.equals("dhold".getBytes("UTF-8"), rules.getRouteRules().get(0).getQualifier()));
+ Assert.assertTrue(Bytes.equals("data".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getColumnFamily()));
+ Assert.assertTrue(Bytes.equals("dhold".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getQualifier()));
Assert.assertTrue(rules.getRouteRules().get(0).getTopics().contains("foo"));
Assert.assertEquals(rules.getRouteRules().get(0).getTopics().size(), 1);
Assert.assertEquals(0, rules.getDropRules().size());
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
@@ -111,31 +112,30 @@ public class TestRouteRules {
public void testTopic4() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE4.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE4.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
- Assert.assertTrue(
- Bytes.equals("data".getBytes("UTF-8"), rules.getRouteRules().get(0).getColumnFamily()));
- Assert.assertTrue(
- Bytes.equals("dhold:".getBytes("UTF-8"), rules.getRouteRules().get(0).getQualifier()));
+ Assert.assertTrue(Bytes.equals("data".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getColumnFamily()));
+ Assert.assertTrue(Bytes.equals("dhold:".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getQualifier()));
Assert.assertEquals(0, rules.getDropRules().size());
TopicRule route = rules.getRouteRules().get(0);
Assert.assertFalse(
- route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "blah".getBytes("UTF-8")));
+ route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "blah".getBytes(StandardCharsets.UTF_8)));
Assert.assertFalse(
- route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "dholdme".getBytes("UTF-8")));
- Assert.assertTrue(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "dhold:me".getBytes("UTF-8")));
+ route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "dholdme".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertTrue(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "dhold:me".getBytes(StandardCharsets.UTF_8)));
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
@@ -144,30 +144,29 @@ public class TestRouteRules {
public void testTopic5() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE5.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE5.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
- Assert.assertTrue(
- Bytes.equals("data".getBytes("UTF-8"), rules.getRouteRules().get(0).getColumnFamily()));
- Assert.assertTrue(
- Bytes.equals("pickme".getBytes("UTF-8"), rules.getRouteRules().get(0).getQualifier()));
+ Assert.assertTrue(Bytes.equals("data".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getColumnFamily()));
+ Assert.assertTrue(Bytes.equals("pickme".getBytes(StandardCharsets.UTF_8),
+ rules.getRouteRules().get(0).getQualifier()));
Assert.assertEquals(0, rules.getDropRules().size());
TopicRule route = rules.getRouteRules().get(0);
Assert.assertFalse(
- route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "blah".getBytes("UTF-8")));
- Assert.assertFalse(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "blacickme".getBytes("UTF-8")));
- Assert.assertTrue(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "hithere.pickme".getBytes("UTF-8")));
+ route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "blah".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertFalse(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "blacickme".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertTrue(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "hithere.pickme".getBytes(StandardCharsets.UTF_8)));
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
@@ -176,43 +175,39 @@ public class TestRouteRules {
public void testTopic6() {
TopicRoutingRules rules = new TopicRoutingRules();
try {
- rules.parseRules(new ByteArrayInputStream(ROUTE_RULE6.getBytes("UTF-8")));
+ rules.parseRules(new ByteArrayInputStream(ROUTE_RULE6.getBytes(StandardCharsets.UTF_8)));
Assert.assertEquals(1, rules.getRouteRules().size());
- Assert.assertEquals(TableName.valueOf("default:MyTable"),
+ Assert.assertEquals(TableName.valueOf(TEST_TABLE),
rules.getRouteRules().get(0).getTableName());
- Assert.assertTrue(
- Bytes.equals("data".getBytes("UTF-8"),
+ Assert.assertTrue(Bytes.equals("data".getBytes(StandardCharsets.UTF_8),
rules.getRouteRules().get(0).getColumnFamily()));
- Assert.assertTrue(
- Bytes.equals("pickme".getBytes("UTF-8"),
+ Assert.assertTrue(Bytes.equals("pickme".getBytes(StandardCharsets.UTF_8),
rules.getRouteRules().get(0).getQualifier()));
Assert.assertEquals(0, rules.getDropRules().size());
TopicRule route = rules.getRouteRules().get(0);
Assert.assertFalse(
- route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "blah".getBytes("UTF-8")));
- Assert.assertFalse(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "blacickme".getBytes("UTF-8")));
- Assert.assertTrue(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "hithere.pickme".getBytes("UTF-8")));
- Assert.assertTrue(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "pickme.pleaze.do.it".getBytes("UTF-8")));
- Assert.assertFalse(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "please.pickme.pleaze".getBytes("UTF-8")));
- Assert.assertTrue(route.match(TableName.valueOf("default:MyTable"),
- "data".getBytes("UTF-8"),
- "pickme.pleaze.pickme".getBytes("UTF-8")));
+ route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "blah".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertFalse(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "blacickme".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertTrue(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "hithere.pickme".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertTrue(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "pickme.pleaze.do.it".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertFalse(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "please.pickme.pleaze".getBytes(StandardCharsets.UTF_8)));
+ Assert.assertTrue(route.match(TableName.valueOf(TEST_TABLE),
+ "data".getBytes(StandardCharsets.UTF_8),
+ "pickme.pleaze.pickme".getBytes(StandardCharsets.UTF_8)));
} catch (Exception e) {
- e.printStackTrace();
Assert.fail(e.getMessage());
}
}
-
}