Explicitly state the default options categories for options used in blaze testing.
Unlike in the production flags, these flags are only used for internal testing. Tagged them as NO_OP instead of the default UNKNOWN to make it clear that we do not need these to become properly tagged.
PiperOrigin-RevId: 160526472
diff --git a/src/test/java/com/google/devtools/common/options/TestOptions.java b/src/test/java/com/google/devtools/common/options/TestOptions.java
index c9d606c..9e79e85 100644
--- a/src/test/java/com/google/devtools/common/options/TestOptions.java
+++ b/src/test/java/com/google/devtools/common/options/TestOptions.java
@@ -15,6 +15,7 @@
import com.google.common.collect.ImmutableList;
import com.google.devtools.common.options.InvocationPolicyEnforcerTestBase.ToListConverter;
+import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag;
import java.util.List;
/** Options for testing. */
@@ -26,7 +27,12 @@
public static final String TEST_STRING_DEFAULT = "test string default";
- @Option(name = "test_string", defaultValue = TEST_STRING_DEFAULT)
+ @Option(
+ name = "test_string",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = TEST_STRING_DEFAULT
+ )
public String testString;
/*
@@ -34,9 +40,11 @@
*/
@Option(
- name = "test_multiple_string",
- defaultValue = "", // default value is ignored when allowMultiple=true.
- allowMultiple = true
+ name = "test_multiple_string",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "", // default value is ignored when allowMultiple=true.
+ allowMultiple = true
)
public List<String> testMultipleString;
@@ -45,10 +53,12 @@
*/
@Option(
- name = "test_list_converters",
- defaultValue = "",
- allowMultiple = true,
- converter = ToListConverter.class
+ name = "test_list_converters",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "",
+ allowMultiple = true,
+ converter = ToListConverter.class
)
public List<String> testListConverters;
@@ -62,16 +72,18 @@
public static final String EXPANDED_D_TEST_EXPANSION = "bar";
@Option(
- name = "test_expansion",
- defaultValue = "null",
- expansion = {
- "--noexpanded_a",
- "--expanded_b=false",
- "--expanded_c",
- "42",
- "--expanded_d",
- "bar"
- }
+ name = "test_expansion",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {
+ "--noexpanded_a",
+ "--expanded_b=false",
+ "--expanded_c",
+ "42",
+ "--expanded_d",
+ "bar"
+ }
)
public Void testExpansion;
@@ -81,53 +93,79 @@
public static final String EXPANDED_D_TEST_RECURSIVE_EXPANSION = "baz";
@Option(
- name = "test_recursive_expansion_top_level",
- defaultValue = "null",
- expansion = {
- "--test_recursive_expansion_middle1",
- "--test_recursive_expansion_middle2",
- }
+ name = "test_recursive_expansion_top_level",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {
+ "--test_recursive_expansion_middle1",
+ "--test_recursive_expansion_middle2",
+ }
)
public Void testRecursiveExpansionTopLevel;
@Option(
- name = "test_recursive_expansion_middle1",
- defaultValue = "null",
- expansion = {
- "--expanded_a=false",
- "--expanded_c=56",
- }
+ name = "test_recursive_expansion_middle1",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {
+ "--expanded_a=false",
+ "--expanded_c=56",
+ }
)
public Void testRecursiveExpansionMiddle1;
@Option(
- name = "test_recursive_expansion_middle2",
- defaultValue = "null",
- expansion = {
- "--expanded_b=false",
- "--expanded_d=baz",
- }
+ name = "test_recursive_expansion_middle2",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {
+ "--expanded_b=false",
+ "--expanded_d=baz",
+ }
)
public Void testRecursiveExpansionMiddle2;
public static final boolean EXPANDED_A_DEFAULT = true;
- @Option(name = "expanded_a", defaultValue = "true")
+ @Option(
+ name = "expanded_a",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "true"
+ )
public boolean expandedA;
public static final boolean EXPANDED_B_DEFAULT = true;
- @Option(name = "expanded_b", defaultValue = "true")
+ @Option(
+ name = "expanded_b",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "true"
+ )
public boolean expandedB;
public static final int EXPANDED_C_DEFAULT = 12;
- @Option(name = "expanded_c", defaultValue = "12")
+ @Option(
+ name = "expanded_c",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "12"
+ )
public int expandedC;
public static final String EXPANDED_D_DEFAULT = "foo";
- @Option(name = "expanded_d", defaultValue = "foo")
+ @Option(
+ name = "expanded_d",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "foo"
+ )
public String expandedD;
/*
@@ -137,16 +175,18 @@
public static final String EXPANDED_MULTIPLE_1 = "expandedFirstValue";
public static final String EXPANDED_MULTIPLE_2 = "expandedSecondValue";
- @Option(name = "test_expansion_to_repeatable",
- defaultValue = "null",
- expansion = {
- "--test_multiple_string=expandedFirstValue",
- "--test_multiple_string=expandedSecondValue"
- }
+ @Option(
+ name = "test_expansion_to_repeatable",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {
+ "--test_multiple_string=expandedFirstValue",
+ "--test_multiple_string=expandedSecondValue"
+ }
)
public Void testExpansionToRepeatable;
-
/*
* Implicit requirement flags
*/
@@ -155,24 +195,33 @@
public static final String IMPLICIT_REQUIREMENT_A_REQUIRED = "implicit requirement, required";
@Option(
- name = "test_implicit_requirement",
- defaultValue = TEST_IMPLICIT_REQUIREMENT_DEFAULT,
- implicitRequirements = {"--implicit_requirement_a=" + IMPLICIT_REQUIREMENT_A_REQUIRED}
+ name = "test_implicit_requirement",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = TEST_IMPLICIT_REQUIREMENT_DEFAULT,
+ implicitRequirements = {"--implicit_requirement_a=" + IMPLICIT_REQUIREMENT_A_REQUIRED}
)
public String testImplicitRequirement;
public static final String IMPLICIT_REQUIREMENT_A_DEFAULT = "implicit requirement, unrequired";
- @Option(name = "implicit_requirement_a", defaultValue = IMPLICIT_REQUIREMENT_A_DEFAULT)
+ @Option(
+ name = "implicit_requirement_a",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = IMPLICIT_REQUIREMENT_A_DEFAULT
+ )
public String implicitRequirementA;
public static final String TEST_RECURSIVE_IMPLICIT_REQUIREMENT_DEFAULT = "recursive implicit";
public static final String TEST_IMPLICIT_REQUIREMENT_REQUIRED = "intermediate, required";
@Option(
- name = "test_recursive_implicit_requirement",
- defaultValue = TEST_RECURSIVE_IMPLICIT_REQUIREMENT_DEFAULT,
- implicitRequirements = {"--test_implicit_requirement=" + TEST_IMPLICIT_REQUIREMENT_REQUIRED}
+ name = "test_recursive_implicit_requirement",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = TEST_RECURSIVE_IMPLICIT_REQUIREMENT_DEFAULT,
+ implicitRequirements = {"--test_implicit_requirement=" + TEST_IMPLICIT_REQUIREMENT_REQUIRED}
)
public String testRecursiveImplicitRequirement;