Remove shortname for result-type in SubPlanCreator
Test: make cts, run unit tests
Bug:32871337
Change-Id: I5185b6adfe5cafa23f28e1a31d886c58ad06f543
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
index 0a4d999..4aba37a 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
@@ -209,7 +209,7 @@
helpBuilder.append("Options:\n");
helpBuilder.append(" --session <session_id>: The session used to create a subplan.\n");
helpBuilder.append(" --name/-n <subplan_name>: The name of the new subplan.\n");
- helpBuilder.append(" --result-type/-r <status>: Which results to include in the");
+ helpBuilder.append(" --result-type <status>: Which results to include in the");
helpBuilder.append(" subplan. One of passed, failed, not_executed. Repeatable.\n");
return helpBuilder.toString();
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
index 7d6d77f..ff28263 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanCreator.java
@@ -73,7 +73,7 @@
importance=Importance.IF_UNSET)
private Integer mSessionId = null;
- @Option (name = "result-type", shortName = 'r',
+ @Option (name = "result-type",
description = "the result type to include. One of passed, failed, not_executed."
+ " Option may be repeated",
importance=Importance.IF_UNSET)
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanCreatorTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanCreatorTest.java
index 6d3a4fd..4663a27 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanCreatorTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanCreatorTest.java
@@ -99,8 +99,8 @@
optionParser.parse(Arrays.asList(
"-n", SP_NAME,
"--session", SP_SESSION,
- "-r", SP_RESULT_TYPE_FAILED,
- "-r", SP_RESULT_TYPE_NOT_EXECUTED));
+ "--result-type", SP_RESULT_TYPE_FAILED,
+ "--result-type", SP_RESULT_TYPE_NOT_EXECUTED));
}
@Override
