diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java index 64760cd..f5ecae2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java @@ -129,7 +129,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMedianWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -150,7 +150,7 @@ public class TestAggregateProtocol { * be the most common use case. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testRowCountWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -168,7 +168,7 @@ public class TestAggregateProtocol { * be null. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testRowCountAllTable() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -185,7 +185,7 @@ public class TestAggregateProtocol { * -1. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testRowCountWithInvalidRange1() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -210,7 +210,7 @@ public class TestAggregateProtocol { * non-null. The result should be 0, as it assumes a non-get query. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testRowCountWithInvalidRange2() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -232,7 +232,7 @@ public class TestAggregateProtocol { /** * This should return a 0 */ - @Test + @Test (timeout=300000) public void testRowCountWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -249,7 +249,7 @@ public class TestAggregateProtocol { assertEquals(0, rowCount); } - @Test + @Test (timeout=300000) public void testRowCountWithNullCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -261,7 +261,7 @@ public class TestAggregateProtocol { assertEquals(20, rowCount); } - @Test + @Test (timeout=300000) public void testRowCountWithPrefixFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -283,7 +283,7 @@ public class TestAggregateProtocol { * give max for the entire table. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMaxWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -297,7 +297,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMaxWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -310,7 +310,7 @@ public class TestAggregateProtocol { assertEquals(14, max); } - @Test + @Test (timeout=300000) public void testMaxWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -321,7 +321,7 @@ public class TestAggregateProtocol { assertEquals(190, maximum); } - @Test + @Test (timeout=300000) public void testMaxWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -334,7 +334,7 @@ public class TestAggregateProtocol { assertEquals(60, max); } - @Test + @Test (timeout=300000) public void testMaxWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); final ColumnInterpreter ci = @@ -350,7 +350,7 @@ public class TestAggregateProtocol { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testMaxWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); final ColumnInterpreter ci = @@ -368,7 +368,7 @@ public class TestAggregateProtocol { assertEquals(0, max);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMaxWithInvalidRange2() throws Throwable { long max = Long.MIN_VALUE; Scan scan = new Scan(); @@ -386,7 +386,7 @@ public class TestAggregateProtocol { assertEquals(0, max);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMaxWithFilter() throws Throwable { Long max = 0l; AggregationClient aClient = new AggregationClient(conf); @@ -407,7 +407,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMinWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -424,7 +424,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMinWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -437,7 +437,7 @@ public class TestAggregateProtocol { assertEquals(5, min); } - @Test + @Test (timeout=300000) public void testMinWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -451,7 +451,7 @@ public class TestAggregateProtocol { assertEquals(0, min); } - @Test + @Test (timeout=300000) public void testMinWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -464,7 +464,7 @@ public class TestAggregateProtocol { assertEquals(6, min); } - @Test + @Test (timeout=300000) public void testMinWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -481,7 +481,7 @@ public class TestAggregateProtocol { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testMinWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Long min = null; @@ -498,7 +498,7 @@ public class TestAggregateProtocol { assertEquals(null, min);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMinWithInvalidRange2() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -515,7 +515,7 @@ public class TestAggregateProtocol { assertEquals(null, min);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMinWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -535,7 +535,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testSumWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -550,7 +550,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testSumWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -563,7 +563,7 @@ public class TestAggregateProtocol { assertEquals(95, sum); } - @Test + @Test (timeout=300000) public void testSumWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -575,7 +575,7 @@ public class TestAggregateProtocol { assertEquals(190 + 1900, sum); } - @Test + @Test (timeout=300000) public void testSumWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -588,7 +588,7 @@ public class TestAggregateProtocol { assertEquals(6 + 60, sum); } - @Test + @Test (timeout=300000) public void testSumWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -605,7 +605,7 @@ public class TestAggregateProtocol { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testSumWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -622,7 +622,7 @@ public class TestAggregateProtocol { assertEquals(null, sum);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testSumWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Filter f = new PrefixFilter(Bytes.toBytes("foo:bar")); @@ -642,7 +642,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testAvgWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -657,7 +657,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testAvgWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -670,7 +670,7 @@ public class TestAggregateProtocol { assertEquals(9.5, avg, 0); } - @Test + @Test (timeout=300000) public void testAvgWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -682,7 +682,7 @@ public class TestAggregateProtocol { assertEquals(104.5, avg, 0); } - @Test + @Test (timeout=300000) public void testAvgWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -695,7 +695,7 @@ public class TestAggregateProtocol { assertEquals(6 + 60, avg, 0); } - @Test + @Test (timeout=300000) public void testAvgWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -710,7 +710,7 @@ public class TestAggregateProtocol { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testAvgWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -727,7 +727,7 @@ public class TestAggregateProtocol { assertEquals(null, avg);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testAvgWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -747,7 +747,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testStdWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -762,7 +762,7 @@ public class TestAggregateProtocol { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testStdWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -775,7 +775,7 @@ public class TestAggregateProtocol { assertEquals(2.87, std, 0.05d); } - @Test + @Test (timeout=300000) public void testStdWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -787,7 +787,7 @@ public class TestAggregateProtocol { assertEquals(63.42, std, 0.05d); } - @Test + @Test (timeout=300000) public void testStdWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -800,7 +800,7 @@ public class TestAggregateProtocol { assertEquals(0, std, 0); } - @Test + @Test (timeout=300000) public void testStdWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -817,7 +817,7 @@ public class TestAggregateProtocol { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testStdWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -834,7 +834,7 @@ public class TestAggregateProtocol { assertEquals(null, std);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testStdWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Filter f = new PrefixFilter(Bytes.toBytes("foo:bar")); @@ -847,6 +847,4 @@ public class TestAggregateProtocol { std = aClient.std(TEST_TABLE, ci, scan); assertEquals(Double.NaN, std, 0); } - -} - +} \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java index f7056c5..391d4ba 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java @@ -126,7 +126,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMedianWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -145,7 +145,7 @@ public class TestBigDecimalColumnInterpreter { * give max for the entire table. * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMaxWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -159,7 +159,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMaxWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -172,7 +172,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("14.00"), max); } - @Test + @Test (timeout=300000) public void testMaxWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -183,7 +183,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("19.00"), maximum); } - @Test + @Test (timeout=300000) public void testMaxWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -196,7 +196,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("6.00"), max); } - @Test + @Test (timeout=300000) public void testMaxWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); final ColumnInterpreter ci = @@ -212,7 +212,7 @@ public class TestBigDecimalColumnInterpreter { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testMaxWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); final ColumnInterpreter ci = @@ -231,7 +231,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(BigDecimal.ZERO, max);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMaxWithInvalidRange2() throws Throwable { BigDecimal max = new BigDecimal(Long.MIN_VALUE); Scan scan = new Scan(); @@ -249,7 +249,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(BigDecimal.ZERO, max);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMaxWithFilter() throws Throwable { BigDecimal max = BigDecimal.ZERO; AggregationClient aClient = new AggregationClient(conf); @@ -270,7 +270,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMinWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -286,7 +286,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testMinWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -299,7 +299,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("5.00"), min); } - @Test + @Test (timeout=300000) public void testMinWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -312,7 +312,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("0.00"), min); } - @Test + @Test (timeout=300000) public void testMinWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -325,7 +325,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("0.60"), min); } - @Test + @Test (timeout=300000) public void testMinWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -342,7 +342,7 @@ public class TestBigDecimalColumnInterpreter { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testMinWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); BigDecimal min = null; @@ -359,7 +359,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(null, min);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMinWithInvalidRange2() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -376,7 +376,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(null, min);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testMinWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -396,7 +396,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testSumWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -410,7 +410,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testSumWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -423,7 +423,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("95.00"), sum); } - @Test + @Test (timeout=300000) public void testSumWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -434,7 +434,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("209.00"), sum); // 190 + 19 } - @Test + @Test (timeout=300000) public void testSumWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -447,7 +447,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(new BigDecimal("6.60"), sum); // 6 + 60 } - @Test + @Test (timeout=300000) public void testSumWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -464,7 +464,7 @@ public class TestBigDecimalColumnInterpreter { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testSumWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -481,7 +481,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(null, sum);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testSumWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Filter f = new PrefixFilter(Bytes.toBytes("foo:bar")); @@ -501,7 +501,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testAvgWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -515,7 +515,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testAvgWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -528,7 +528,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(9.5, avg, 0); } - @Test + @Test (timeout=300000) public void testAvgWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -539,7 +539,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(10.45, avg, 0.01); } - @Test + @Test (timeout=300000) public void testAvgWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -552,7 +552,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(6 + 0.60, avg, 0); } - @Test + @Test (timeout=300000) public void testAvgWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -567,7 +567,7 @@ public class TestBigDecimalColumnInterpreter { // null column family, and max will be set to 0 } - @Test + @Test (timeout=300000) public void testAvgWithInvalidRange() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -584,7 +584,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(null, avg);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testAvgWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -604,7 +604,7 @@ public class TestBigDecimalColumnInterpreter { /** * @throws Throwable */ - @Test + @Test (timeout=300000) public void testStdWithValidRange() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -619,7 +619,7 @@ public class TestBigDecimalColumnInterpreter { * need to change this * @throws Throwable */ - @Test + @Test (timeout=300000) public void testStdWithValidRange2() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -636,7 +636,7 @@ public class TestBigDecimalColumnInterpreter { * need to change this * @throws Throwable */ - @Test + @Test (timeout=300000) public void testStdWithValidRangeWithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -647,7 +647,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(6.342, std, 0.05d); } - @Test + @Test (timeout=300000) public void testStdWithValidRange2WithNoCQ() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -661,7 +661,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(0, std, 0.05d); } - @Test + @Test (timeout=300000) public void testStdWithValidRangeWithNullCF() { AggregationClient aClient = new AggregationClient(conf); Scan scan = new Scan(); @@ -695,7 +695,7 @@ public class TestBigDecimalColumnInterpreter { assertEquals(null, std);// control should go to the catch block } - @Test + @Test (timeout=300000) public void testStdWithFilter() throws Throwable { AggregationClient aClient = new AggregationClient(conf); Filter f = new PrefixFilter(Bytes.toBytes("foo:bar")); @@ -708,5 +708,4 @@ public class TestBigDecimalColumnInterpreter { std = aClient.std(TEST_TABLE, ci, scan); assertEquals(Double.NaN, std, 0); } - } \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java index 34c4b0d..1ccc57d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java @@ -76,7 +76,7 @@ public class TestCellCounter { * Test CellCounter all data should print to output * */ - @Test + @Test (timeout=300000) public void testCellCounter() throws Exception { String sourceTable = "sourceTable"; byte[][] families = { FAMILY_A, FAMILY_B }; @@ -127,7 +127,7 @@ public class TestCellCounter { /** * Test main method of CellCounter */ - @Test + @Test (timeout=300000) public void testCellCounterMain() throws Exception { PrintStream oldPrintStream = System.err; @@ -154,6 +154,5 @@ public class TestCellCounter { System.setErr(oldPrintStream); System.setSecurityManager(SECURITY_MANAGER); } - } -} +} \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java index 297ab6a..d02b378 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java @@ -46,7 +46,7 @@ public class TestHRegionPartitioner { /** * Test HRegionPartitioner */ - @Test + @Test (timeout=300000) public void testHRegionPartitioner() throws Exception { byte[][] families = { Bytes.toBytes("familyA"), Bytes.toBytes("familyB") }; @@ -63,4 +63,4 @@ public class TestHRegionPartitioner { assertEquals(1, partitioner.getPartition(writable, 10L, 3)); assertEquals(0, partitioner.getPartition(writable, 10L, 1)); } -} +} \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java index bc4f8a3..6bafacd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java @@ -32,11 +32,10 @@ import static org.junit.Assert.*; @Category(LargeTests.class) public class TestTableMapReduceUtil { - /** * Test different variants ofinitTableMapperJob method */ - @Test + @Test (timeout=600000) public void testInitTableMapperJob() throws Exception { Configuration configuration = new Configuration(); Job job = new Job(configuration, "tableName"); @@ -83,4 +82,4 @@ public class TestTableMapReduceUtil { assertNull(job.getCombinerClass()); assertEquals("Table", job.getConfiguration().get(TableInputFormat.INPUT_TABLE)); } -} +} \ No newline at end of file diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java index ca0fd31..001d705 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.replication; import org.apache.hadoop.hbase.LargeTests; import org.junit.Test; +import org.junit.Ignore; import org.junit.experimental.categories.Category; /** @@ -28,9 +29,8 @@ import org.junit.experimental.categories.Category; @Category(LargeTests.class) public class TestReplicationKillMasterRS extends TestReplicationKillRS { - @Test(timeout=300000) + @Ignore ("Flakey. See HBASE-9008 and HBASE-9007") @Test(timeout=300000) public void killOneMasterRS() throws Exception { loadTableAndKillRS(utility1); } - -} +} \ No newline at end of file