Index: src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithSecureRpcEngine.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithSecureRpcEngine.java (revision 0)
+++ src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithSecureRpcEngine.java (revision 0)
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.client;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.LargeTests;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
+import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint;
+import org.apache.hadoop.hbase.ipc.SecureRpcEngine;
+import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Test all client operations with {@link SecureRpcEngine}
+ */
+@Category(LargeTests.class)
+public class TestFromClientSideWithSecureRpcEngine extends TestFromClientSide {
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ Configuration conf = TEST_UTIL.getConfiguration();
+ conf.set("hbase.rpc.engine", SecureRpcEngine.class.getName());
+ conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
+ MultiRowMutationEndpoint.class.getName());
+ // We need more than one region server in this test
+ TEST_UTIL.startMiniCluster(SLAVES);
+ }
+}
Index: src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (revision 1583474)
+++ src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (working copy)
@@ -47,7 +47,6 @@
import java.util.concurrent.Executors;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.lang.ArrayUtils;
@@ -85,6 +84,7 @@
import org.apache.hadoop.hbase.filter.WhileMatchFilter;
import org.apache.hadoop.hbase.io.hfile.BlockCache;
import org.apache.hadoop.hbase.io.hfile.CacheConfig;
+import org.apache.hadoop.hbase.ipc.SecureRpcEngine;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
@@ -123,6 +123,8 @@
@BeforeClass
public static void setUpBeforeClass() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();
+ // force the rpc engine to the non-secure one in order to get coverage
+ conf.set("hbase.rpc.engine", "org.apache.hadoop.hbase.ipc.WritableRpcEngine");
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
MultiRowMutationEndpoint.class.getName());
// We need more than one region server in this test
Index: pom.xml
===================================================================
--- pom.xml (revision 1583474)
+++ pom.xml (working copy)
@@ -943,6 +943,28 @@
1.5
+ add-source
+
+ add-source
+
+
+
+ ${project.basedir}/security/src/main/java
+
+
+
+
+ add-test-source
+
+ add-test-source
+
+
+
+ ${project.basedir}/security/src/test/java
+
+
+
+ jspcSource-packageInfo-Avro-sourcegenerate-sources
@@ -1665,9 +1687,9 @@
-
+
- security
+ security-test1.0.4
@@ -1679,28 +1701,6 @@
build-helper-maven-plugin
- add-source
-
- add-source
-
-
-
- ${project.basedir}/security/src/main/java
-
-
-
-
- add-test-source
-
- add-test-source
-
-
-
- ${project.basedir}/security/src/test/java
-
-
-
- add-test-resourceadd-test-resource