Author: liyin Date: Sat Apr 5 18:18:16 2014 New Revision: 1585152 URL: http://svn.apache.org/r1585152 Log: [HBASE-9930] Fix Trunk failure
Author: manukranthk Summary: Fixing trunk failures. Test Plan: mvn -DskipTests package Reviewers: daviddeng, elliott Reviewed By: elliott CC: hbase-eng@, elliott, fan Differential Revision: https://phabricator.fb.com/D1259484 Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1585152&r1=1585151&r2=1585152&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Sat Apr 5 18:18:16 2014 @@ -1456,7 +1456,7 @@ public class HBaseTestingUtility { } }; - MetaScanner.metaScan(conf, visitor, null); + MetaScanner.metaScan(conf, visitor, (StringBytes)null); // Location info from region servers final Map<String, Map<String, HServerAddress>> fromRS = new HashMap<>(); Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java?rev=1585152&r1=1585151&r2=1585152&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestHFileHistogramE2E.java Sat Apr 5 18:18:16 2014 @@ -7,6 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import junit.framework.Assert; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -18,7 +20,6 @@ import org.apache.hadoop.hbase.regionser import org.apache.hadoop.hbase.regionserver.HRegionUtilities; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -220,9 +221,9 @@ public class TestHFileHistogramE2E { private void compareHistograms(List<List<Bucket>> buckets, List<List<Bucket>> batchBuckets) { - assertTrue(buckets.size() == batchBuckets.size()); + Assert.assertTrue(buckets.size() == batchBuckets.size()); for (int i = 0; i < buckets.size(); i++) { - assertTrue(compareBuckets(buckets.get(i), batchBuckets.get(i))); + Assert.assertTrue(compareBuckets(buckets.get(i), batchBuckets.get(i))); } } }
