Repository: hbase Updated Branches: refs/heads/master e0019d99d -> daed00fc9
HBASE-13141 IntegrationTestAcidGuarantees returns incorrect values for getColumnFamilies Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/daed00fc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/daed00fc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/daed00fc Branch: refs/heads/master Commit: daed00fc98167870463e77b620e9adb6ce9b204d Parents: e0019d9 Author: Jonathan M Hsieh <jmhs...@apache.org> Authored: Mon Mar 2 21:26:01 2015 -0800 Committer: Jonathan M Hsieh <jmhs...@apache.org> Committed: Mon Mar 2 21:26:01 2015 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hbase/IntegrationTestAcidGuarantees.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/daed00fc/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java index acece95..7250eb3 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java @@ -21,6 +21,7 @@ import com.google.common.collect.Sets; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.testclassification.IntegrationTests; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.ToolRunner; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -83,9 +84,9 @@ public class IntegrationTestAcidGuarantees extends IntegrationTestBase { @Override protected Set<String> getColumnFamilies() { - return Sets.newHashSet(String.valueOf(TestAcidGuarantees.FAMILY_A), - String.valueOf(TestAcidGuarantees.FAMILY_B), - String.valueOf(TestAcidGuarantees.FAMILY_C)); + return Sets.newHashSet(Bytes.toString(TestAcidGuarantees.FAMILY_A), + Bytes.toString(TestAcidGuarantees.FAMILY_B), + Bytes.toString(TestAcidGuarantees.FAMILY_C)); } // ***** Actual integration tests
