Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-14345 Consolidate printUsage in IntegrationTestLoadAndVerify (Reid Chan)

This commit is contained in:
Reid 2016-08-07 14:12:30 +08:00 committed by Apekshit Sharma
parent 091a17e3c9
commit 3c3457c6c0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
View File

@ -549,9 +549,11 @@ public void cleanUpCluster() throws Exception {
getTestingUtil(getConf()).deleteTable(htd.getTableName()); getTestingUtil(getConf()).deleteTable(htd.getTableName());
} }
public void usage() { @Override
System.err.println(this.getClass().getSimpleName() public void printUsage() {
+ " [-Doptions] <load|verify|loadAndVerify|search>"); printUsage(this.getClass().getSimpleName() + " <options>"
+ " [-Doptions] <load|verify|loadAndVerify|search>", "Options", "");
System.err.println("");
System.err.println(" Loads a table with row dependencies and verifies the dependency chains"); System.err.println(" Loads a table with row dependencies and verifies the dependency chains");
System.err.println("Options"); System.err.println("Options");
System.err.println(" -Dloadmapper.table=<name> Table to write/verify (default autogen)"); System.err.println(" -Dloadmapper.table=<name> Table to write/verify (default autogen)");
@ -571,7 +573,7 @@ public void cleanUpCluster() throws Exception {
String[] args = cmd.getArgs(); String[] args = cmd.getArgs();
if (args == null || args.length < 1) { if (args == null || args.length < 1) {
usage(); printUsage();
throw new RuntimeException("Incorrect Number of args."); throw new RuntimeException("Incorrect Number of args.");
} }
toRun = args[0]; toRun = args[0];
@ -608,7 +610,7 @@ public void cleanUpCluster() throws Exception {
} }
} else { } else {
System.err.println("Invalid argument " + toRun); System.err.println("Invalid argument " + toRun);
usage(); printUsage();
return 1; return 1;
} }

4
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java
View File

@ -347,7 +347,7 @@ public class IntegrationTestWithCellVisibilityLoadAndVerify extends IntegrationT
} }
@Override @Override
public void usage() { public void printUsage() {
System.err.println(this.getClass().getSimpleName() + " -u usera,userb [-Doptions]"); System.err.println(this.getClass().getSimpleName() + " -u usera,userb [-Doptions]");
System.err.println(" Loads a table with cell visibilities and verifies with Authorizations"); System.err.println(" Loads a table with cell visibilities and verifies with Authorizations");
System.err.println("Options"); System.err.println("Options");
@ -386,7 +386,7 @@ public class IntegrationTestWithCellVisibilityLoadAndVerify extends IntegrationT
protected void processOptions(CommandLine cmd) { protected void processOptions(CommandLine cmd) {
List args = cmd.getArgList(); List args = cmd.getArgList();
if (args.size() > 0) { if (args.size() > 0) {
usage(); printUsage();
throw new RuntimeException("No args expected."); throw new RuntimeException("No args expected.");
} }
// We always want loadAndVerify action // We always want loadAndVerify action