diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java index c2ff36e..5bcbf1a 100644 --- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java +++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorServiceBackwardCompatibility.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.coprocessor.protobuf.generated.DummyRegionServerEndpointProtos.*; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; +import org.junit.After; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -69,11 +70,15 @@ public class TestCoprocessorServiceBackwardCompatibility { public static void setupBeforeClass() throws Exception { TEST_UTIL = new HBaseTestingUtility(); CONF = TEST_UTIL.getConfiguration(); + } + + @Before + public void setupBefore() throws Exception { DummyCoprocessorService.numCalls = 0; } - @AfterClass - public static void tearDownAfterClass() throws Exception { + @After + public void tearDownAfter() throws Exception { TEST_UTIL.shutdownMiniCluster(); } @@ -86,6 +91,7 @@ public class TestCoprocessorServiceBackwardCompatibility { TEST_UTIL.getAdmin().coprocessorService().callBlockingMethod( DummyCoprocessorService.getDescriptor().findMethodByName("dummyCall"), null, DummyRequest.getDefaultInstance(), DummyResponse.getDefaultInstance()); + CONF.unset(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY); assertEquals(1, DummyCoprocessorService.numCalls); } @@ -99,6 +105,7 @@ public class TestCoprocessorServiceBackwardCompatibility { TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName()).callBlockingMethod( DummyCoprocessorService.getDescriptor().findMethodByName("dummyCall"), null, DummyRequest.getDefaultInstance(), DummyResponse.getDefaultInstance()); + CONF.unset(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY); assertEquals(1, DummyCoprocessorService.numCalls); } @@ -111,6 +118,7 @@ public class TestCoprocessorServiceBackwardCompatibility { DummyCoprocessorService.getDescriptor().findMethodByName("dummyCall"), DummyRequest.getDefaultInstance(), Bytes.toBytes(""), Bytes.toBytes(""), DummyResponse.getDefaultInstance()); + CONF.unset(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY); assertEquals(1, DummyCoprocessorService.numCalls); } }