This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 6cc6a14bc55 HBASE-29558: Addendum to fix checkstyle warnings (#7277)
6cc6a14bc55 is described below
commit 6cc6a14bc55d34fbc328d41a7954d304bc6ed277
Author: Hari Krishna Dara <[email protected]>
AuthorDate: Sat Sep 6 03:11:54 2025 +0530
HBASE-29558: Addendum to fix checkstyle warnings (#7277)
Signed-off-by: Viraj Jasani <[email protected]>
---
.../hadoop/hbase/client/AbstractTestShell.java | 14 ++-----
.../apache/hadoop/hbase/client/BaseTestShell.java | 28 --------------
...{AbstractTestShell.java => TestAdminShell.java} | 44 +++++++++-------------
.../hadoop/hbase/client/TestQuotasShell.java | 2 +-
.../hadoop/hbase/client/TestRSGroupShell.java | 10 ++++-
.../hadoop/hbase/client/TestReplicationShell.java | 2 +-
.../org/apache/hadoop/hbase/client/TestShell.java | 2 +-
.../hadoop/hbase/client/TestShellNoCluster.java | 2 +
.../apache/hadoop/hbase/client/TestTableShell.java | 2 +-
.../hbase/{admin_test_cluster.rb => admin_test.rb} | 0
10 files changed, 37 insertions(+), 69 deletions(-)
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
index 806ce92d0d8..edb7526395d 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
@@ -18,9 +18,7 @@
package org.apache.hadoop.hbase.client;
import java.io.IOException;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.HBaseTestingUtil;
-import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.jruby.embed.ScriptingContainer;
import org.junit.After;
import org.junit.Before;
@@ -30,14 +28,17 @@ public abstract class AbstractTestShell implements
RubyShellTest {
protected final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected final ScriptingContainer jruby = new ScriptingContainer();
+ @Override
public HBaseTestingUtil getTEST_UTIL() {
return TEST_UTIL;
}
+ @Override
public ScriptingContainer getJRuby() {
return jruby;
}
+ @Override
public String getSuitePattern() {
return "**/*_test.rb";
}
@@ -47,20 +48,13 @@ public abstract class AbstractTestShell implements
RubyShellTest {
RubyShellTest.setUpConfig(this);
// Start mini cluster
- // 3 datanodes needed for erasure coding checks
- TEST_UTIL.startMiniCluster(3);
+ TEST_UTIL.startMiniCluster(1);
RubyShellTest.setUpJRubyRuntime(this);
RubyShellTest.doTestSetup(this);
}
- protected void setupDFS() throws IOException {
- DistributedFileSystem dfs =
- (DistributedFileSystem) FileSystem.get(TEST_UTIL.getConfiguration());
- dfs.enableErasureCodingPolicy("XOR-2-1-1024k");
- }
-
@After
public void tearDown() throws Exception {
TEST_UTIL.shutdownMiniCluster();
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/BaseTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/BaseTestShell.java
deleted file mode 100644
index 1cfb06b6bee..00000000000
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/BaseTestShell.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.junit.Before;
-
-public abstract class BaseTestShell extends AbstractTestShell {
- @Before
- public void setUp() throws Exception {
- super.setUp();
- super.setupDFS();
- }
-}
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
similarity index 66%
copy from
hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
copy to
hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
index 806ce92d0d8..7bc3e1fd2a2 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestAdminShell.java
@@ -19,27 +19,27 @@ package org.apache.hadoop.hbase.client;
import java.io.IOException;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hdfs.DistributedFileSystem;
-import org.jruby.embed.ScriptingContainer;
-import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
+import org.junit.ClassRule;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public abstract class AbstractTestShell implements RubyShellTest {
- protected final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
- protected final ScriptingContainer jruby = new ScriptingContainer();
+@Category({ ClientTests.class, LargeTests.class })
+public class TestAdminShell extends AbstractTestShell {
+ private static final Logger LOG =
LoggerFactory.getLogger(TestAdminShell.class);
- public HBaseTestingUtil getTEST_UTIL() {
- return TEST_UTIL;
- }
-
- public ScriptingContainer getJRuby() {
- return jruby;
- }
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestAdminShell.class);
- public String getSuitePattern() {
- return "**/*_test.rb";
+ @Override
+ public String getIncludeList() {
+ return "admin_test.rb";
}
@Before
@@ -50,6 +50,8 @@ public abstract class AbstractTestShell implements
RubyShellTest {
// 3 datanodes needed for erasure coding checks
TEST_UTIL.startMiniCluster(3);
+ setupDFS();
+
RubyShellTest.setUpJRubyRuntime(this);
RubyShellTest.doTestSetup(this);
@@ -60,14 +62,4 @@ public abstract class AbstractTestShell implements
RubyShellTest {
(DistributedFileSystem) FileSystem.get(TEST_UTIL.getConfiguration());
dfs.enableErasureCodingPolicy("XOR-2-1-1024k");
}
-
- @After
- public void tearDown() throws Exception {
- TEST_UTIL.shutdownMiniCluster();
- }
-
- @Test
- public void testRunShellTests() throws IOException {
- RubyShellTest.testRunShellTests(this);
- }
}
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
index b4e513daaff..1550478d0a7 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestQuotasShell.java
@@ -24,7 +24,7 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
@Category({ ClientTests.class, LargeTests.class })
-public class TestQuotasShell extends BaseTestShell {
+public class TestQuotasShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestQuotasShell.class);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
index e15892fd16c..0b2fb89cc06 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestRSGroupShell.java
@@ -32,11 +32,19 @@ public class TestRSGroupShell extends AbstractTestShell {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRSGroupShell.class);
+ @Override
@Before
public void setUp() throws Exception {
+ RubyShellTest.setUpConfig(this);
// enable rs group
RSGroupUtil.enableRSGroup(TEST_UTIL.getConfiguration());
- super.setUp();
+
+ // Start mini cluster, need 3 nodes
+ TEST_UTIL.startMiniCluster(3);
+
+ RubyShellTest.setUpJRubyRuntime(this);
+
+ RubyShellTest.doTestSetup(this);
}
@Override
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
index 9a9ea1d7e97..5bf0b3a6328 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestReplicationShell.java
@@ -24,7 +24,7 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
@Category({ ClientTests.class, LargeTests.class })
-public class TestReplicationShell extends BaseTestShell {
+public class TestReplicationShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestReplicationShell.class);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
index 999681a0ca2..28b1fb59ef0 100644
--- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
+++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
@@ -24,7 +24,7 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
@Category({ ClientTests.class, LargeTests.class })
-public class TestShell extends BaseTestShell {
+public class TestShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestShell.class);
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
index 5c312ec1dac..0071b24103b 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShellNoCluster.java
@@ -31,6 +31,7 @@ public class TestShellNoCluster extends AbstractTestShell {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestShellNoCluster.class);
+ @Override
@Before
public void setUp() throws Exception {
RubyShellTest.setUpConfig(this);
@@ -42,6 +43,7 @@ public class TestShellNoCluster extends AbstractTestShell {
RubyShellTest.doTestSetup(this);
}
+ @Override
@After
public void tearDown() throws Exception {
// no cluster
diff --git
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
index e4b27a97835..6158570cc05 100644
---
a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
+++
b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestTableShell.java
@@ -24,7 +24,7 @@ import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
@Category({ ClientTests.class, MediumTests.class })
-public class TestTableShell extends BaseTestShell {
+public class TestTableShell extends AbstractTestShell {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestTableShell.class);
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test_cluster.rb
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
similarity index 100%
rename from hbase-shell/src/test/ruby/hbase/admin_test_cluster.rb
rename to hbase-shell/src/test/ruby/hbase/admin_test.rb
