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/OptionsTest.java b/src/test/java/com/google/devtools/common/options/OptionsTest.java
index bb0a22e..8f9b99a 100644
--- a/src/test/java/com/google/devtools/common/options/OptionsTest.java
+++ b/src/test/java/com/google/devtools/common/options/OptionsTest.java
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.testing.EqualsTester;
+import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
@@ -38,32 +39,52 @@
public static class HttpOptions extends OptionsBase {
- @Option(name = "host",
- defaultValue = "www.google.com",
- help = "The URL at which the server will be running.")
+ @Option(
+ name = "host",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "www.google.com",
+ help = "The URL at which the server will be running."
+ )
public String host;
- @Option(name = "port",
- abbrev = 'p',
- defaultValue = "80",
- help = "The port at which the server will be running.")
+ @Option(
+ name = "port",
+ abbrev = 'p',
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "80",
+ help = "The port at which the server will be running."
+ )
public int port;
- @Option(name = "debug",
- abbrev = 'd',
- defaultValue = "false",
- help = "debug")
+ @Option(
+ name = "debug",
+ abbrev = 'd',
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "false",
+ help = "debug"
+ )
public boolean isDebugging;
- @Option(name = "tristate",
- abbrev = 't',
- defaultValue = "auto",
- help = "tri-state option returning auto by default")
+ @Option(
+ name = "tristate",
+ abbrev = 't',
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "auto",
+ help = "tri-state option returning auto by default"
+ )
public TriState triState;
- @Option(name = "special",
- defaultValue = "null",
- expansion = { "--host=special.google.com", "--port=8080"})
+ @Option(
+ name = "special",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {"--host=special.google.com", "--port=8080"}
+ )
public Void special;
// Interestingly, the class needs to be public, or else the default constructor ends up not
@@ -99,16 +120,37 @@
}
}
- @Option(name = "specialexp_foo", defaultValue = "false")
+ @Option(
+ name = "specialexp_foo",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "false"
+ )
public boolean specialExpFoo;
- @Option(name = "specialexp_bar", defaultValue = "false")
+ @Option(
+ name = "specialexp_bar",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "false"
+ )
public boolean specialExpBar;
- @Option(name = "specialexp", defaultValue = "null", expansionFunction = SpecialExpansion.class)
+ @Option(
+ name = "specialexp",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansionFunction = SpecialExpansion.class
+ )
public Void specialExp;
- @Option(name = "dynamicexp", defaultValue = "null", expansionFunction = VariableExpansion.class)
+
+ @Option(
+ name = "dynamicexp",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null", expansionFunction = VariableExpansion.class)
public Void variableExpansion;
}
@@ -385,15 +427,23 @@
}
public static class NullTestOptions extends OptionsBase {
- @Option(name = "host",
- defaultValue = "null",
- help = "The URL at which the server will be running.")
+ @Option(
+ name = "host",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ help = "The URL at which the server will be running."
+ )
public String host;
- @Option(name = "none",
- defaultValue = "null",
- expansion = {"--host=www.google.com"},
- help = "An expanded option.")
+ @Option(
+ name = "none",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null",
+ expansion = {"--host=www.google.com"},
+ help = "An expanded option."
+ )
public Void none;
}
@@ -430,11 +480,14 @@
public static class UsesCustomConverter extends OptionsBase {
- @Option(name = "url",
- defaultValue = "http://www.google.com/",
- converter = MyURLConverter.class)
+ @Option(
+ name = "url",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "http://www.google.com/",
+ converter = MyURLConverter.class
+ )
public URL url;
-
}
@Test
@@ -478,7 +531,12 @@
}
public static class J extends OptionsBase {
- @Option(name = "j", defaultValue = "null")
+ @Option(
+ name = "j",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null"
+ )
public String string;
}
@Test
@@ -488,7 +546,12 @@
}
public static class K extends OptionsBase {
- @Option(name = "1", defaultValue = "null")
+ @Option(
+ name = "1",
+ documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ effectTags = {OptionEffectTag.NO_OP},
+ defaultValue = "null"
+ )
public int int1;
}
@Test
